diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 4c8ef4d0..381c5b45 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -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- 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) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 74e42c27..6b480a70 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -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/