janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 17:23:36 +02:00
Code Activity Actions

rpmdist.mk: Remove dead code

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-03-16 06:12:01 +01:00
commit e66acbee70
1 changed files with 0 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

44
make/rpmdist.mk
View file

@ -115,8 +115,6 @@ PKG_SH = $(PKG_SH_EXE) \
-m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \ -m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
-B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB) -B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB)
# -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently
all: all:
install: install:
clean: pkg-clean clean: pkg-clean
@ -129,7 +127,6 @@ pkg-upload-stable: pkg-upload-STABLE.dist
pkg-upload-rc: pkg-upload-RC.dist pkg-upload-rc: pkg-upload-RC.dist
pkg-clean: clean.rpm pkg-clean: clean.rpm
#pkg-clean: clean.mkspec
pkg-uninstall: config pkguninstall.dist pkg-uninstall: config pkguninstall.dist
pkg-build: pkg-build.dist pkg-build: pkg-build.dist
pkg-install: config pkg-build pkginstall.dist pkg-install: config pkg-build pkginstall.dist
@ -141,20 +138,6 @@ pkg-upload-local: pkg-upload-local.dist
clean.rpm: clean.rpm:
$(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk $(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk
#ifeq ($(PROJECT_DESCR_FILE),)
#
#clean.mkspec:
#
#else
#
#$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
# sh $(JWB_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
# mv $@.tmp $@
#
#clean.mkspec:
# $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp
#
#endif
pkg-build.dist: $(VERSION_FILE) pkg-build.dist: $(VERSION_FILE)
$(PKG_SH) build $(PKG_SH_BUILD_OPTS) $(PKG_SH) build $(PKG_SH_BUILD_OPTS)
@ -172,23 +155,6 @@ src-dir.dist:
mkdir -p $(DIST_SRC_DIR) mkdir -p $(DIST_SRC_DIR)
touch $@ touch $@
#%.tar.gz: $(RPM_EXTRA_FILES) cpfiles.dist
# mkdir -p $(DIST_PCKG_DIR)
# tar --anchored $(addprefix --exclude=,$(GENERATED)) \
# -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
#
#$(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_$*) > $@
#
pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES) pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
touch $@ touch $@
@ -205,13 +171,6 @@ pkginstall.dist: pkg-build.dist
done done
touch $@ touch $@
#pkgupdate.dist: $(DIST_PCKG_RPM)
# @set -e; for p in $^; do \
# echo + updating $$p ;\
# sudo /bin/rpm -U --replacepkgs --replacefiles $$p; \
# done
# touch $@
pkguninstall.dist: pkguninstall.dist:
$(Q)set -e; for s in devel run; do \ $(Q)set -e; for s in devel run; do \
if $(RPM) -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \ if $(RPM) -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \
@ -336,9 +295,6 @@ pkg-release: pkg-release-reinstall
pkg-rebuild-reinstall: pkg-clean pkg-build pkg-reinstall pkg-rebuild-reinstall: pkg-clean pkg-build pkg-reinstall
# doesn't work
# pkg-release-update: pkg-release pkg-update
pkg-release-reinstall: get-maintainer get-official pkg-release-reinstall: get-maintainer get-official
$(PKG_SH) release $(PKG_SH_BUILD_OPTS) $(PKG_SH) release $(PKG_SH_BUILD_OPTS)
ifneq ($(TARGET_HOST),) ifneq ($(TARGET_HOST),)