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

rpmbuild.mk: Remove cruft

Browse source 
Remove stuff from rpmbuild.mk which is either unused, unusable or
not aligned with non-rpm-centric packaging workflows:

  - Variable RPMBUILD

  - Targets pkgbuild.dist pkg-upload-local.dist

  - Variables used by these targets

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

14
make/rpmdist.mk
View file

@ -24,7 +24,6 @@ FTP_HOST_LOGIN ?= root
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
@ -41,7 +40,6 @@ include $(JWBDIR)/make/tag-defs.mk
DIST_DIR = dist
DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION)
DIST_PCKG_DIR = $(DIST_DIR)/pckg
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
UPLOAD_SRC_DIR = $(DIST_PCKG_DIR)
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
@ -53,13 +51,11 @@ ifeq ($(PKG_FORMAT),debian)
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
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
@ -67,7 +63,6 @@ GENERATED = $(sort $(shell find . -name '*.in' | \
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
ifeq ($(PKG_FORMAT),debian)
RPMS_DIR = $(TOPDIR)/dist/src
SRPMS_DIR = $(TOPDIR)/dist/src
else
ifeq ($(BUILD_USER),root)
RPMS_BUILD_DIR = /usr/src/packages
@ -75,7 +70,6 @@ else
RPMS_BUILD_DIR = $(HOME)/rpmbuild
endif
RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH)
SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS
endif
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
@ -83,7 +77,6 @@ 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)
RPM_REQUIRES_BUILD += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) build $(PROJECT))
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT))
@ -153,13 +146,6 @@ src-dir.dist:
mkdir -p $(DIST_SRC_DIR)
touch $@
pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
touch $@
pkg-upload-local.dist: pkgbuild.dist
$(JWB_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
touch $@
pkginstall.dist: pkg-build.dist
$(Q)set -e; for p in $(BINARY_RPM); do \
if ! $(RPM) -q `basename $$p | $(SED) "s/[._]$(RPM_ARCH)\.$(RPM_SUFFIX)//; s/_\([0-9.-]\+\)$$/-\1/"` > /dev/null 2>&1 ; then \