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

defs.mk: Pass -f $(PKG_FORMAT) to pkg.sh log-install

Browse source 
pkg.sh log-install needs to know what package format it should log
an install for, so specify it.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-02-15 11:16:05 +00:00
commit 37b436c04f
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
make/defs.mk
View file

@ -96,34 +96,6 @@ ifndef PRISTINE_MAKE
PRISTINE_MAKE := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE) PRISTINE_MAKE := umask $(MINIMAL_UMASK) && MAKEFLAGS=$(MINIMAL_MAKEFLAGS) LD_LIBRARY_PATH=$(MINIMAL_LD_LIBRARY_PATH) PATH=$(MINIMAL_PATH) $(MAKE)
endif endif
PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
ifdef INSTALL_LINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else ifdef INSTALL_SYMLINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else
ifdef INSTALL_LOG
INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
else
ifndef INSTALL
ifeq ($(DEVELOPMENT),false)
INSTALL = $(SUDO) install
else
INSTALL = install
endif
endif
ifndef LINK_LIB
LINK_LIB = $(LOG_INSTALL_SH) -L
endif
endif
endif
# ----- function definitions # ----- function definitions
reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1)) reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$(1))) $(firstword $(1)),$(1))
@ -206,6 +178,34 @@ else
PKG_FORMAT ?= rpm PKG_FORMAT ?= rpm
endif endif
PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install -f $(PKG_FORMAT)
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
ifdef INSTALL_LINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -WA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else ifdef INSTALL_SYMLINK
INSTALL = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
else
ifdef INSTALL_LOG
INSTALL = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
LINK_LIB = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
else
ifndef INSTALL
ifeq ($(DEVELOPMENT),false)
INSTALL = $(SUDO) install
else
INSTALL = install
endif
endif
ifndef LINK_LIB
LINK_LIB = $(LOG_INSTALL_SH) -L
endif
endif
endif
ifeq ($(PKG_FORMAT),debian) ifeq ($(PKG_FORMAT),debian)
RPM ?= /bin/bash $(JWB_SCRIPT_DIR)/dpm.sh RPM ?= /bin/bash $(JWB_SCRIPT_DIR)/dpm.sh
RPM_ARCH := $(shell dpkg --print-architecture) RPM_ARCH := $(shell dpkg --print-architecture)