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

fix: LAST_RPM_VERSION doesn\'t take new map-style format of file into account, yet

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-12 11:28:32 +00:00
commit 59c2e8d8ed
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/rpmdist.mk
View file

@ -4,6 +4,7 @@ CREATE_DEVEL = false
endif endif
endif endif
RPM_ARCH ?= $(ARCH)
CREATE_DEVEL ?= true CREATE_DEVEL ?= true
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT) RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
@ -23,8 +24,7 @@ FTP_HOST_LOGIN ?= root
RPM_PROJECT ?= $(PROJECT) RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX) LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
LAST_RPM_VERSION ?= $(shell $(SED) 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null) LAST_RPM_VERSION ?= $(shell sh $(MOD_SCRIPT_DIR)/platform-map-file.sh -p $RPM_ARCH $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//'
RPM_ARCH ?= $(ARCH)
RPMBUILD ?= rpmbuild RPMBUILD ?= rpmbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) | \ HASH = $(shell $(cvs_files) | \
@ -258,20 +258,7 @@ rpm-check-release:
echo + source is unmodified ;\ echo + source is unmodified ;\
fi fi
rpm-release: rpm-update-release rpm-release: rpm-release-reinstall
@if ! grep -q "^$(LAST_RPM_VERSION)$$" VERSION; then \
$(check_cvs_sync) ;\
echo "+ version $(RPM_VERSION) doesn't match latest released rpm version "\
"$(LAST_RPM_VERSION), building a new release" ;\
make rpm-clean update-repo.dist || exit 1;\
cp VERSION $(LAST_RPM_VERSION_FILE) ;\
if ! grep -q $(LAST_RPM_VERSION_FILE) CVS/Entries; then \
cvs add $(LAST_RPM_VERSION_FILE) ;\
fi ;\
cvs commit -m "o `$(CAT) $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\
else \
echo "+ version matches latest released rpm version" ;\
fi
# doesn't work # doesn't work
# rpm-release-update: rpm-release rpm-update # rpm-release-update: rpm-release rpm-update