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: Disable some now unused stuff

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-05-28 07:59:01 +00:00
commit 3e00419ed6
1 changed files with 67 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

121
make/rpmdist.mk
View file

@ -5,7 +5,11 @@ endif
endif endif
PKG_FORMAT ?= rpm PKG_FORMAT ?= rpm
ifeq ($(PKG_FORMAT),debian)
RPM_ARCH ?= $(shell dpkg --print-architecture)
else
RPM_ARCH ?= $(ARCH) RPM_ARCH ?= $(ARCH)
endif
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)
@ -42,25 +46,40 @@ DIST_PCKG_DIR = $(DIST_DIR)/pckg
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz #DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
ifeq ($(CREATE_DEVEL),true) ifeq ($(PKG_FORMAT),debian)
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION)_$(RPM_ARCH).deb
ifeq ($(CREATE_DEVEL),true)
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION)_$(RPM_ARCH).deb
endif
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan
else
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
ifeq ($(CREATE_DEVEL),true)
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
endif
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
endif endif
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
include $(MODDIR)/make/upload-defs-rpm.mk include $(MODDIR)/make/upload-defs-rpm.mk
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g') DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
GENERATED = $(sort $(shell find . -name '*.in' | \ GENERATED = $(sort $(shell find . -name '*.in' | \
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%")) $(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
RPMS_DIR = $(firstword $(wildcard $(HOME)/rpmbuild/RPMS/$(RPM_ARCH) /usr/src/packages/RPMS/$(RPM_ARCH))) ifeq ($(PKG_FORMAT),debian)
SRPMS_DIR = $(firstword $(wildcard $(HOME)/rpmbuild/SRPMS /usr/src/packages/SRPMS)) RPMS_DIR = $(TOPDIR)/dist/src
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) SRPMS_DIR = $(TOPDIR)/dist/src
DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) else
ifeq ($(CREATE_DEVEL),true) RPMS_DIR = $(firstword $(wildcard $(HOME)/rpmbuild/RPMS/$(RPM_ARCH) /usr/src/packages/RPMS/$(RPM_ARCH)))
DIST_PCKG_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) SRPMS_DIR = $(firstword $(wildcard $(HOME)/rpmbuild/SRPMS /usr/src/packages/SRPMS))
endif endif
DIST_PCKG_SRPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386)
ifeq ($(CREATE_DEVEL),true)
BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
endif
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
# to be replaced by build-package.sh # to be replaced by build-package.sh
RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = __NEXT_VERSION__ RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = __NEXT_VERSION__
@ -90,9 +109,8 @@ rpm-upload-rc: rpm-upload-RC.dist
rpm-clean: clean.rpm rpm-clean: clean.rpm
#rpm-clean: clean.mkspec #rpm-clean: clean.mkspec
rpm-uninstall: config rpmuninstall.dist rpm-uninstall: config rpmuninstall.dist
rpm-build: rpm-build: rpm-build.dist
$(BUILD_PACKAGE_SH) build rpm-install: config rpm-build rpminstall.dist
rpm-install: config rpminstall.dist
rpm-reinstall: rpm-uninstall rpm-clean rpm-install rpm-reinstall: rpm-uninstall rpm-clean rpm-install
rpm-rebuild: rpm-clean rpm-build rpm-rebuild: rpm-clean rpm-build
rpm-update: rpmupdate.dist rpm-update: rpmupdate.dist
@ -101,20 +119,24 @@ rpm-upload-local: rpm-upload-local.dist
clean.rpm: clean.rpm:
rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
ifeq ($(PROJECT_DESCR_FILE),) #ifeq ($(PROJECT_DESCR_FILE),)
#
#clean.mkspec:
#
#else
#
#$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
# sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
# mv $@.tmp $@
#
#clean.mkspec:
# rm -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
#
#endif
clean.mkspec: rpm-build.dist:
$(BUILD_PACKAGE_SH) build
else touch $@
$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
mv $@.tmp $@
clean.mkspec:
rm -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
endif
rpm-update-local-repo: rpm-update-local-repo:
for a in src i386 i586 i686 x86_64; do \ for a in src i386 i586 i686 x86_64; do \
@ -128,31 +150,22 @@ src-dir.dist:
mkdir -p $(DIST_SRC_DIR) mkdir -p $(DIST_SRC_DIR)
touch $@ touch $@
#cpfiles.dist: src-dir.dist $(LOCAL_MKSPEC_SH) #%.tar.gz: $(RPM_EXTRA_FILES) cpfiles.dist
# rm -rf $(DIST_SRC_DIR)/* # mkdir -p $(DIST_PCKG_DIR)
# $(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i) # tar --anchored $(addprefix --exclude=,$(GENERATED)) \
# sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \ # -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
# -R "$(RPM_REQUIRES_RUN)" \ #
# -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ #$(DIST_PCKG_SRPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
# > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec # $(RPMBUILD) -ts $<
# echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION # cp $(SRPMS_DIR)/$(PCKG_RPM_SRC) $(dir $@)/
# touch $@ #
#$(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
%.tar.gz: $(RPM_EXTRA_FILES) cpfiles.dist # if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then $(RPMBUILD) -tb $<; fi
mkdir -p $(DIST_PCKG_DIR) # cp $(addprefix $(RPMS_DIR)/,$(notdir $(DIST_PCKG_RPM))) $(dir $@)/
tar --anchored $(addprefix --exclude=,$(GENERATED)) \ #
-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) #$(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
# echo $(CURRENT_$*) > $@
$(DIST_PCKG_SRPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) #
$(RPMBUILD) -ts $<
cp $(SRPMS_DIR)/$(PCKG_RPM_SRC) $(dir $@)/
$(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)
if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then $(RPMBUILD) -tb $<; fi
cp $(addprefix $(RPMS_DIR)/,$(notdir $(DIST_PCKG_RPM))) $(dir $@)/
$(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION
echo $(CURRENT_$*) > $@
rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES) rpmbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
touch $@ touch $@
@ -161,8 +174,8 @@ rpm-upload-local.dist: rpmbuild.dist
$(MOD_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM) $(MOD_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
touch $@ touch $@
rpminstall.dist: $(DIST_PCKG_RPM) rpminstall.dist: rpm-build.dist
@set -e; for p in $^; do \ @set -e; for p in $(BINARY_RPM); do \
if ! /bin/rpm -q `basename $$p | $(SED) "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \ if ! /bin/rpm -q `basename $$p | $(SED) "s/\.$(RPM_ARCH)\.rpm//"` > /dev/null 2>&1 ; then \
echo + installing $$p ;\ echo + installing $$p ;\
sudo /bin/rpm -U $$p; \ sudo /bin/rpm -U $$p; \