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

defs.mk, rpmdist.mk, pkg.sh: Fix detection of rpmbuild path

Browse source 
$HOME/rpmbuild was not correctly assumed as build directory if it doesn't exist.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-03 20:00:01 +00:00
commit 98e7606029
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
make/defs.mk
View file

@ -168,7 +168,8 @@ else ifeq ($(ARCH),aarch64)
PROJECT_LDFLAGS +=
endif
JANWARE_USER ?= $(shell id -un)
BUILD_USER := $(shell id -un)
JANWARE_USER ?= $(BUILD_USER)
JANWARE_CLIENT ?= jw
JANWARE_WIKI ?= $(JANWARE_CLIENT)
JANWARE_URL_DOC_MODULE ?= https://janware.com/wiki/$(JANWARE_WIKI)/assets/types/data/sw/$(PROJECT)/$(notdir $(shell $(PWD)))

9
make/rpmdist.mk
View file

@ -59,8 +59,13 @@ ifeq ($(PKG_FORMAT),debian)
RPMS_DIR = $(TOPDIR)/dist/src
SRPMS_DIR = $(TOPDIR)/dist/src
else
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))
ifeq ($(BUILD_USER),root)
RPMS_BUILD_DIR = /usr/src/packages
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)

10
scripts/pkg.sh
View file

@ -1129,8 +1129,14 @@ shift
export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR`
export PKG_SH=`readlink -f $0`
SRPMS_DIR=`find_path $HOME/rpmbuild/SRPMS /usr/src/packages/SRPMS`
RPMS_DIR=`find_path $HOME/rpmbuild/RPMS/$RPM_ARCH /usr/src/packages/RPMS/$RPM_ARCH`
if [ `whoami` = root ]; then
RPMS_BUILD_DIR=/usr/src/packages
else
RPMS_BUILD_DIR=$HOME/rpmbuild
fi
SRPMS_DIR=$RPMS_BUILD_DIR/SRPMS
RPMS_DIR=$RPMS_BUILD_DIR/RPMS/$RPM_ARCH
# shift