Commit graph

581 commits

Author SHA1 Message Date
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
6e14ee930f pkg.sh: Fix target directory layout for CentOS
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 10:03:19 +00:00
be98a4049c pgit.sh: Don't uncoditionally set -e
Base that on whether or not PGIT_KEEP_GOING is defined

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-12 16:53:27 +00:00
c3d38b67b5 Make CVSROOT point to cvs.janware.com:/srv/cvs
Change the following occurrences:

  cvs.jannet.de        -> cvs.janware.com
  /home/jannet/arc/cvs -> /srv/cvs
  git.jannet.de        -> git.janware.com

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-11 16:44:29 +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
7ee054b9e8 jw-pkg: Add command rm-template-output
Also add lots of small fixes and beautifications all over the place.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-19 12:34:36 +00:00
0b8dc4bbfd jw-pkg: Add command list-template-output
This should come in handy for removing generated files. Do some
code-cleanup, too.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-19 09:55:41 +00:00
adb18caa13 make, scripts: git submodule update --init --recursive
Consistently run git submodule update with --init --recursive.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-18 18:31:30 +00:00
82a3f4dc92 projects.py: Read /usr/share/doc/packages/<name>/VERSION, too
Add support for searching VERSION below the project root
_and_ below /usr/share/doc/packages/

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-18 12:32:31 +00:00
3349767c2e jw-pkg: Add support for query options VPUD
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 12:13:25 +00:00
3e95eb58e3 jw-pkg info-projects: Rename to list-xxx
Rename jw-pkg commands "info" and "info-projects" to "list-info" and
"list-projects", respectively.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 11:50:27 +00:00
a1183a216e create-mkspec.sh: Add support for entry url in [global] of project.conf
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 11:17:43 +00:00
d56c3b98c5 jw-pkg: Add command line to warning about missing templates
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-12 12:54:52 +00:00
ac4d0964d7 jw-build-create-project.sh: Add *.dist and dist to gitignore by default
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 17:02:53 +00:00
a836719a51 jw-pkg: Add command list-template-tables
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 12:48:07 +00:00
2e42b36728 jw-pkg compile-templates: Support options -ogm
Make jw-pkg compile-templates support options -o owner, -g group
and -m mode

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 12:27:23 +00:00
44373a7832 jw-pkg: Add command list-templates
- Add command list-templates, showing all template files.
- Fixes and improvements to compile-templates

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-10 07:53:30 +00:00
246246573f jw-pkg: Add command compile-templates
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 13:18:48 +00:00
4c54a52c66 jw-pkg: Introduce package argument to commands
Many commands can now be limited to a list of packages

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 11:48:50 +00:00
52db897dbb list-cvs-files.sh: Use git ls-files --recurse-submodules
Use --recurse-submodules option to git ls-files instead of implementing that
own our own.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 11:11:02 +00:00
38fd8e7d4d pkg.sh log-install: Fix bogus -a option replacement
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 11:09:57 +00:00
c1c38e1458 git-srv-admin.sh update-descriptions: Use summary instead of description
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-04 10:56:13 +00:00
5a85b5ce97 jcs.conf: Work around often disfunctional /usr/bin/hostname
/usr/bin/hostname often returns nonsense, especially during early phases
of installation. Rely on the contents of /etc/hostname for determining
jcs_dir

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-28 10:13:43 +00:00
8f196287af projects.py: Fix bogus interpretation of os dep package version
requires.os.run = java-headless = 1.8.0 led to an attempt to
look up ../java-headless/VERSION

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-24 11:00:22 +00:00
4e6a237865 projects.py: Beautify logging ([] around iteration count)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 13:09:58 +00:00
fb7df55e6f pgit.sh: Add iteration counter to logging
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:10 +00:00
51884a3f7e jw-pkg: Add command info-projects to help message
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:09 +00:00
bd28a1d41d scripts/Makefile, jw-pkg, jw-sw: Rename jw-sw to jw-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:48:25 +00:00
169e04a2f4 scripts/Makefile, jw-sw: Add jw-sw
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:45:31 +00:00
6224f48900 projects.py: Remove messages for build-order output
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 09:48:33 +00:00
83631eafc5 projects.py: Add support for --build-order
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 21:13:59 +00:00
f7db38275f projects.py: Protect against null-string dependencies
A dependency of the form run = a, b, (trailing comma) led to the attempt
to build an empty project and, hence, infinite recursion

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 20:02:48 +00:00
ce08110e2b pkg.sh log-install: Fix handling of links
- Links are installed with file attributes
  - Sometimes links are wrongly logged as directories

Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-21 20:23:32 +00:00
e37e7f91c1 pkg.sh and defs.mk: Add pkg.sh install-log -N, fix links
pkg.sh install-log now supports a -N option, meaning no-log-directories. This
installs directories, but doesn't log then in the install log, effectively
excluding them from being packaged. This is necessary for directories provided
by other packages. -N can be activated by adding LOG_INSTALL_EXTRA_OPTS += -N
to a Makefile, see changes in defs.mk.

pgk.sh install-log now also omits addition of %attr tags to symbolic links.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 12:02:23 +00:00
65c77e1d3f pkg-manager.sh: Cut -tumbleweed off $ID for platform identification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 15:51:38 +00:00
20f675c280 make, scripts: Fix CentOS 7 build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 10:46:02 +00:00
bfe28086c7 get-os.sh: Replace cut with bash-internal pattern substitution
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-08 09:57:08 +00:00
193db3ecdb create-mkspec.sh: Some output beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 11:02:48 +00:00
2ffe744709 create-mkspec.sh: Heavy beautification and simplification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 10:50:25 +00:00
0d14436afb create-mkspec.sh: Create-mkspec.sh remove %exclude opt/$NAME/make/*.mk from spec
Not exactly sure why this was needed in the first place. It apparently
was introduced on 2013-03-18, and already then denoted as a kludge.

Also some more code beautification

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 10:06:58 +00:00
2a88f1ceca create-mk(spec|debian).sh: Code beautication
Beautify code and fix backtick and backslash escaping of package scripts

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 09:32:14 +00:00
1a27f6ecf5 create-mkspec.sh: Fix SUBPACKAGES selection
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-05 08:23:38 +00:00
0371cec047 create-mkspec.sh, pkg.sh: Fix RPM specs missing files from devel packages
This commit makes pkg.sh and create-mkspec.sh check, if a -devel package is
specified, and if not, adds the contents of the -devel file list from the
install log to the -run file list.

This also involves adding a [-s subpackage] option to the
pkg.sh milk-install-log command.

Not implemented for debian packages.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-08-31 11:19:44 +00:00
1c992bfd3c build.py: Remove build.py, superseded now by projects.py build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-16 14:03:18 +00:00
d8115e6b22 projects.py, pkg_relations(): Fix --no-subpackages, support multiple flavours
- --no-subpackages sometimes doesn\'t strip off -devel -run
- Flavours can now be comma-separated

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-15 10:13:17 +00:00
9d2e192256 projects.py: Add support for --skip-excluded to command requires-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 17:28:20 +00:00
8ef3c06234 projects.py: Optimize os_cascade()
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 16:58:32 +00:00
3b77b5ae55 projects.py: Fix and re-enable reading dependencies in-memory
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 15:59:36 +00:00
775795c8fa projects.py: Add support for [build.exclude]
Also disable recent switch to in-memory dependency detection, because
it is buggy and messes up the order

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 14:26:21 +00:00
fd2ca4f6ff projects.py: Disable superfluous invocations of projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 11:40:58 +00:00