Commit graph

149 commits

Author SHA1 Message Date
b37359a725 $(MODDIR)/make/defs.mk: Replace variable OS with OS_NAME_VERSION
OS_NAME_VERSION is less ambiguous.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-27 10:22:27 +00:00
73f97ba3b4 rpmdist.mk: Add target pkg-build-install
The target comes in handy for installing all packages in a dependency list not
already installed.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-05 15:02:35 +00:00
c713793e16 srcdist.mk: Make wd-upload work with upload-defs.mk
wd-upload doesn\'t work at all, because it clashed with rpmdist.mk defining
stuff used by the upload-*.mk files. The RPM-side of things is left untested.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 10:53:32 +00:00
f28afc777c make, scripts: Add support for [pkg.provides.xxx]
Add Support for manually specifying arbitrary package capabilities in
project.conf.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 14:34:58 +00:00
98e7606029 defs.mk, rpmdist.mk, pkg.sh: Fix detection of rpmbuild path
$HOME/rpmbuild was not correctly assumed as build directory if it doesn't exist.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 20:00:01 +00:00
d436ed880e rpmdist.mk: Minimal code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 22:33:17 +00:00
eb97f44ddb rpmdist.mk: Make pkg-build.dist depend on $(VERSION_FILE)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 16:59:28 +00:00
f4efde3377 $(TOPDIR), make, scripts: Ftp.jannet.de / ftp.janware.com -> pkg.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 16:11:11 +00:00
74a62bfda9 $(TOPDIR), make, scripts: Rename LAST_RPM_VERSION to RELEASES
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 11:07:20 +00:00
e827efadd5 make, scripts: Replace list-vcs-files.sh by scm.sh ls-files
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 10:30:49 +00:00
9b532fd601 make, scripts: Rename list-cvs-files.sh to list-vcs-files.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 18:15:12 +00:00
536d128f91 make, scripts: Remove /inst-source from RPM installation sources
Remove /inst-source from RPM installation sources, following
that same action within all repositories and mirrors

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 10:04:58 +00:00
d78768b8b8 rpmdist.mk, pkg.sh: Fix whitespace handling in HASH file generation
Generating the $(TOPDIR)/HASH file produced a warning for every
package file containing a whitespace character. Hopefully, this
build fixes the problem, by working on zero-delimited lists
of file names

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-21 13:47:38 +00:00
709eab9a03 rpmdist.mk: Fix pgk-remote-install-run
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-27 22:57:48 +00:00
f5c43f706a make: Replace some executables by absolute paths to improve performance
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-09-02 19:26:52 +00:00
e70f7a1c5c rpmdist.mk: Add target ssh-remote
This target runs ssh -l root $(TARGET_HOST), with TARGET_HOST typically defined in
$(MODDIR)/make/local.mk. Seems a bit out-of-place, everything, but anyway.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-06-26 12:56:50 +00:00
c42e386c76 doc, make, scripts: Add support for [pkg.conflicts.xxx]
Since the packaging machinery is pretty complicated, the information about
conflicting packages had to be passed through many APIs. The last commit
contained a patch which is left in the tree to have it in one file, it actually
is identical to this commit's diff, though. Git would save me that quirk.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-06-26 10:34:22 +00:00
e4ea74dadc make, scripts: Add more scripts from ytools/devutil/scripts
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-08 13:40:04 +00:00
06b2c64c0e rpmdist.mk: Fix RPM_UPLOAD_GROUP
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-02-24 14:15:53 +00:00
69de7c53c8 rpmdist.mk: Fix off-by-one bug in rpm-release-reinstall
Introduce --dont-expand-version-macros into projects.py, and use it
to postpone version expansion into pkg.sh.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-02-24 13:31:33 +00:00
b79d89f37d projects.py pkg-requires: Add --dont-strip-revision
Add --dont-strip-revision option to projects.py pkg-requires

Sadly, Debian dpkg doesn't install a package with dependency
somepkg = 1.2.3, if somepkg-1.2.3-10 is installed. To work
around this, VERSION in project.conf files is now always
interpreted as VERSION-REVISION

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-02-10 16:19:26 +00:00
f3caef9690 upload-defs-rpm.mk: Weed out outdated stuff
Move the necessary definitions into rpmdist.mk and disable the rest
in upload-defs-rpm.mk. Can be removed as soon as the stuff is tested
to work well.

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-12-03 12:51:03 +00:00
9d7059b64d fix: Tried to call pkg.sh without /bin/bash led to permission denied
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-11-21 12:22:28 +00:00
751cedd3f3 rpmdist.mk: Add debug target echo-requires
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-10-01 22:02:56 +00:00
743beef7c4 rpmdist.mk: Fix RPMS_DIR and SRPMS_DIR
Fix RPMS_DIR and SRPMS_DIR, unsure why this has ever worked.

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-09-18 11:51:07 +00:00
08e60376c7 rpmdist.mk fix: RPM_PROJECT was empty if BUILD_PROJECT_PACKAGE == false
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-09-11 14:42:35 +00:00
4e96b9374d rpmbuild.mk: Add support for setting BUILD_PROJECT_PACKAGE to false
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-08-18 20:49:13 +00:00
651cbaf511 defs.mk, make.mk, rpmdist.mk: Fix various package build errors
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-02-01 22:59:23 +00:00
c7400a0bd8 make, scripts: Project description default location is now $(TOPDIR)/make
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-01-29 14:03:03 +00:00
9c95953c29 rpmdist.mk: Pkg-reinstall does pkg-clean
- Target pkg-reinstall does pkg-clean, too, fix that
  - Remove superfluous RPM_PROJECT

Signed-off-by: Jan Lindemann <jan@janware.com>
2015-06-25 18:12:16 +00:00
fae30838b7 rpmdist.mk: Add target pkg-rebuild-reinstall
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-06-25 17:06:26 +00:00
5116f9e2d5 defs.mk.in: Define RPM, RPM_ARCH and RPM_SUFFIX
Move RPM, RPM_ARCH and RPM_SUFFIX definitions from rpmdist.mk to
defs.mk.in.

Signed-off-by: Jan Lindemann <jan@janware.com>
2015-06-11 08:28:47 +00:00
a351f07bc5 rpmdist.mk, pkg.sh: Integrated platform-map-file.sh into pkg.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-31 14:40:55 +00:00
25e4c197d3 build-package.sh: Rename to pkg.sh
Rename build-package.sh to pkg.sh, prepare it for handling more
generic tasks.

Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-31 11:52:08 +00:00
588f6de9b1 rpmdist.mk: Renamed "rpm-Ãxxx" targets to "pkg-xxx"
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-28 11:52:21 +00:00
11e36e834b rpmdist.mk: Make rpm-[un]install work on Debian
Make rpm-install and rpm-uninstall work on Debian, sort of.

Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-28 11:37:00 +00:00
3e00419ed6 rpmdist.mk: Disable some now unused stuff
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-28 07:59:01 +00:00
2572c931e1 rpmdist.mk: Disable clean.mkspec, because mkspec.sh might still be handcoded and in the SCM
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-25 15:51:03 +00:00
8c3b0cfad1 rpmdist.mk: Add hooks for building .deb packages
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-05-25 14:39:07 +00:00
411fdd95b2 fix: Git commit doesn\'t work
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-07-09 16:09:54 +00:00
72f77f99ef rpmdist.mk: Disable cpfiles.dist, obsoleted by build-package.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-29 14:09:53 +00:00
298f35647f make: Shifted site installation makefile definitions into $(SITE_DIR)/make/site.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-28 02:00:24 +00:00
85c988b4da rpmdist.mk: Add targets rpm-remote-install and rpm-remote-install-run
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-27 12:12:15 +00:00
84c98151ef rpmdist.mk: Make rpm-install adds old version
Fix: Make rpm-install added old version to RPM_REQUIRES_DEVEL

Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-25 09:02:23 +00:00
8cdf31a27a rpmdist.mk: Add support for git to rpm-release mechanics
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-18 10:34:09 +00:00
17786cc452 rpmdist.mk: Fix missing closing bracket in rpmdist.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-14 11:48:06 +00:00
1a1dac7a6f rpmdist.mk: Make target rpm-release-reinstall depend on update
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-13 17:55:42 +00:00
3c3b6a4781 rpmdist.mk: Incorporate distribution into rpm release platform-map file
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-13 15:15:23 +00:00
59c2e8d8ed fix: LAST_RPM_VERSION doesn\'t take new map-style format of file into account, yet
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-12 11:28:32 +00:00
e9b6ade744 rpmdist.mk: Remove tracing of build-package.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-04-28 18:14:59 +00:00