From e93338872fb595ac1f8ad7a15919988fbb81d6fb Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 2 Mar 2026 12:42:40 +0000 Subject: [PATCH] defs.mk: Move PKG_FORMAT definition into platform.mk PKG_FORMAT is now more straightforward to get with from the revised jw-pkg.py distro info --format '%{cascade}', so do that, and do it in the context where all the other variables are set from the output of that command. Signed-off-by: Jan Lindemann --- make/defs.mk | 6 ------ make/platform.mk | 23 +++++++++-------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index fada83bd..8097169a 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -175,12 +175,6 @@ PKG_VENDOR ?= janware GmbH # ----- packaging variables -ifneq ($(findstring $(OS_NAME),debian ubuntu),) - PKG_FORMAT ?= debian -else - PKG_FORMAT ?= rpm -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 diff --git a/make/platform.mk b/make/platform.mk index 374bf8a2..cb6a4dd6 100644 --- a/make/platform.mk +++ b/make/platform.mk @@ -72,21 +72,16 @@ endif # -- arch, vendor, os, libc ifeq ($(HOST_TUPLE),) - HOST_TUPLE := $(shell $(JW_PKG_PY) distro info --format '%{gnu-triplet}') - HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) - HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) - HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) - HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) - HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) - HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) -else - HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) - HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) - HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) - HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) - HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) - HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) + HOST_TUPLE := $(shell $(JW_PKG_PY) distro info --format '%{gnu-triplet} %{cascade}') endif +HOST_TUPLE_WORDS := $(subst -, ,$(HOST_TUPLE)) +HOST_ARCH := $(word 1,$(HOST_TUPLE_WORDS)) +HOST_VENDOR := $(word 2,$(HOST_TUPLE_WORDS)) +HOST_OS := $(word 3,$(HOST_TUPLE_WORDS)) +HOST_ABI := $(word 4,$(HOST_TUPLE_WORDS)) +HOST_TRIPLET := $(HOST_ARCH)-$(HOST_OS)-$(HOST_ABI) +HOST_OS_CASCADE := $(wordlist 2,$(words $(HOST_TUPLE)),$(HOST_TUPLE)) +PKG_FORMAT ?= $(patsubst pkg-%,%,$(filter pkg-%,$(HOST_OS_CASCADE))) ifndef TARGET ifneq ($(subst mingw,,$(CWD)),$(CWD))