janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

rpmdist.mk: pkg-release ignores PACKAGE_VCS_FILES

Browse source 
PACKAGE_VCS_FILES is only considered by pkg-rebuild and ignored by
pkg-release. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2025-12-23 13:17:35 +01:00
commit 5bdd917abc
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/projects-dir.mk
View file

@ -340,6 +340,14 @@ git-show-non-master-branches:
fi ;\
done
git-show-pushable-master-branches:
@for p in $(PROJECTS); do \
if git -C $$p log --oneline origin/master.. | grep -q .; then \
echo ======================= $$p ;\
git -C $$p log --oneline origin/master.. ;\
fi ;\
done
# git-echo-link-<filename> returns a string functioning as hyperlink to
# matching files in git when embedded into a janware wiki or ticket.
git-echo-links-%: | $(TEXT_FILES_CACHE)

3
make/rpmdist.mk
View file

@ -341,8 +341,7 @@ pkg-rebuild-reinstall: pkg-clean pkg-build pkg-reinstall
# pkg-release-update: pkg-release pkg-update
pkg-release-reinstall: update
$(PKG_SH) release
$(PKG_SH) release $(PKG_SH_BUILD_OPTS)
ifneq ($(TARGET_HOST),)
pkg-remote-install:
scp $(addprefix dist/pckg/,$(PCKG_RPM_RUN_I386) $(PCKG_RPM_DEVEL_I386)) root@$(TARGET_HOST):/tmp/