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

rpmdist.mk: Add target rpm-upload-local

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2013-08-12 15:19:43 +00:00
commit 798615c697
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
make/rpmdist.mk
View file

@ -24,7 +24,7 @@ RPM_PROJECT ?= $(PROJECT)
RPM_VERSION ?= $(DIST_VERSION)
LAST_RPM_VERSION_FILE = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
LAST_RPM_VERSION ?= $(shell $(SED) 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
RPM_ARCH ?= i586
RPM_ARCH ?= $(ARCH)
RPMBUILD ?= rpmbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) | \
@ -51,14 +51,14 @@ include $(MODDIR)/make/upload-defs-rpm.mk
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
GENERATED = $(sort $(shell find . -name '*.in' | \
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
RPMS_DIR = /usr/src/packages/RPMS/$(RPM_ARCH)
SRPMS_DIR = /usr/src/packages/SRPMS
RPMS_DIR = $(firstword $(wildcard $(HOME)/rpmbuild/RPMS/$(RPM_ARCH) /usr/src/packages/RPMS/$(RPM_ARCH)))
SRPMS_DIR = $(firstword $(wildcard $(HOME)/rpmbuild/SRPMS /usr/src/packages/SRPMS))
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386)
ifeq ($(CREATE_DEVEL),true)
DIST_PCKG_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
endif
DIST_PCKG_SRPM += $(DIST_SRC_DIR)/$(PCKG_RPM_SRC)
RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = $(RPM_VERSION)
unexport RPM_VERSION VERSION DIST_SRC_DIR
@ -84,7 +84,8 @@ rpm-install: config rpminstall.dist
rpm-reinstall: rpm-uninstall rpm-clean rpm-install
rpm-rebuild: rpm-clean rpm-build
rpm-update: rpmupdate.dist
rpm-upload-local: rpm-upload-local.dist
clean.rpm:
rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
@ -130,7 +131,7 @@ cpfiles.dist: src-dir.dist $(LOCAL_MKSPEC_SH)
tar --anchored $(addprefix --exclude=,$(GENERATED)) \
-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
%.src.rpm: %.tar.gz
$(DIST_PCKG_SRPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
$(RPMBUILD) -ts $<
cp $(SRPMS_DIR)/$(notdir $@) $@
@ -141,7 +142,11 @@ $(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
$(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
echo $(CURRENT_$*) > $@
rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_FILES)
rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
touch $@
rpm-upload-local.dist: rpmbuild.dist
$(MOD_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
touch $@
rpminstall.dist: $(DIST_PCKG_RPM)
@ -260,3 +265,5 @@ rpm-release: rpm-update-release
echo "+ version matches latest relea$(SED) rpm version" ;\
fi
blah:
@echo RPMS_DIR = $(RPMS_DIR)