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

$(MODDIR)/make/defs.mk: Replace variable OS with OS_NAME_VERSION

Browse source 
OS_NAME_VERSION is less ambiguous.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-02-27 10:22:27 +00:00
commit b37359a725
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/packaging/add-pkg-conflicts-support.patch
View file

@ -13,8 +13,8 @@ diff -u -r1.137 rpmdist.mk
+RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT)) +RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
+RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT)) +RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT))
RPM_UPLOAD_OS_NAME = $(shell echo $(OS) | sed 's/-.*//') RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
@@ -88,8 +89,9 @@ @@ -88,8 +89,9 @@
include $(MODDIR)/make/upload-rules.mk include $(MODDIR)/make/upload-rules.mk

6
make/defs.mk
View file

@ -54,7 +54,7 @@ ifeq ($(PROJECT),)
endif endif
GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh
OS ?= $(shell $(GET_OS_SH)) OS_NAME_VERSION ?= $(shell $(GET_OS_SH))
OS_NAME ?= $(shell $(GET_OS_SH) name) OS_NAME ?= $(shell $(GET_OS_SH) name)
OSTYPE ?= $(shell $(GET_OS_SH) type) OSTYPE ?= $(shell $(GET_OS_SH) type)
@ -72,7 +72,7 @@ FLAVOUR_PATH_SUFFIX ?= /win32
endif endif
endif endif
ifneq ($(filter debian%,$(OS)),) ifneq ($(filter debian%,$(OS_NAME_VERSION)),)
PKG_FORMAT ?= debian PKG_FORMAT ?= debian
else else
PKG_FORMAT ?= rpm PKG_FORMAT ?= rpm
@ -241,7 +241,7 @@ BUILD_CFLAGS += -DCATCH_ONLY_YERROR
BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR BUILD_CPPFLAGS += -DCATCH_ONLY_YERROR
endif endif
ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) ifneq ($(shell echo $(OS_NAME_VERSION) | cut -d: -f1),suse-9)
SYSCFG_DIR ?= /etc SYSCFG_DIR ?= /etc
SYSCFG_FILE ?= /etc/rc.config SYSCFG_FILE ?= /etc/rc.config
else else

8
make/rpmdist.mk
View file

@ -23,13 +23,13 @@ FTP_DIR_MODE ?= 755
FTP_HOST_LOGIN ?= root FTP_HOST_LOGIN ?= root
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX) RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
RELEASES ?= $(shell $(PKG_SH_EXE) version \ RELEASES ?= $(shell $(PKG_SH_EXE) version \
-p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//') -p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
RPMBUILD ?= pkgbuild RPMBUILD ?= pkgbuild
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
HASH = $(shell $(cvs_files) -z | \ HASH = $(shell $(cvs_files) -z | \
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \ grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
xargs -0 md5sum | md5sum | $(SED) 's/ .*//') xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS) LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION)
include $(MODDIR)/make/tag-defs.mk include $(MODDIR)/make/tag-defs.mk
@ -89,8 +89,8 @@ RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-versi
RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT)) RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT))
RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT)) RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT))
RPM_UPLOAD_OS_NAME = $(shell echo $(OS) | sed 's/-.*//') RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//') RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
RPM_UPLOAD_USER ?= $(shell id -un) RPM_UPLOAD_USER ?= $(shell id -un)
RPM_UPLOAD_GROUP ?= $(shell id -gn) RPM_UPLOAD_GROUP ?= $(shell id -gn)

4
make/upload-defs-rpm.mk
View file

@ -17,8 +17,8 @@
#FTP_HOST ?= pkg.janware.com #FTP_HOST ?= pkg.janware.com
#FTP_HOST_LOGIN ?= root #FTP_HOST_LOGIN ?= root
# #
#OS_NAME = $(shell echo $(OS) | sed 's/-.*//') #OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
#OS_VERSION = $(shell echo $(OS) | sed 's/[^-]\+-//') #OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
# #
## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src ## $(FTP_PCKG_DIR)/linux/$(OS_NAME)/$(OS_VERSION)/rpm/src
#FTP_PCKG_DIR ?= /pub/packages #FTP_PCKG_DIR ?= /pub/packages