From af31e80678a255bacd3d0b783216551bcf839ee2 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 9 Sep 2026 06:29:40 +0200 Subject: [PATCH] pkg.sh: Fix broken version macro expansion pkg-dist.mk queries the package relations with --dont-expand-version-macros, and build_pkg() expanded the remaining VERSION and VERSION-REVISION macros with a local sed-based expand_version_macros(). That substitutes the version of the project being built for every macro, instead of the version of the dependency the macro refers to. Drop --dont-expand-version-macros from the proj_query calls so the macros resolve to the dependency's own version, and remove expand_version_macros() from build_pkg(), which passes the PKG_* variables to rpmbuild as they are queried. Signed-off-by: Jan Lindemann --- make/pkg-dist.mk | 14 +++++++------- scripts/pkg.sh | 16 ++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/make/pkg-dist.mk b/make/pkg-dist.mk index ab3ca837..879bfc54 100644 --- a/make/pkg-dist.mk +++ b/make/pkg-dist.mk @@ -78,13 +78,13 @@ ifeq ($(CREATE_DEVEL),true) BINARY_PKG += $(DIST_PCKG_DIR)/$(PKG_DEVEL_X86) endif -PKG_REQUIRES_BUILD += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) build $(PROJECT)) -PKG_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT)) -PKG_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT)) -PKG_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT)) -PKG_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT)) -PKG_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT)) -PKG_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT)) +PKG_REQUIRES_BUILD += $(call proj_query, pkg-requires $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) build $(PROJECT)) +PKG_REQUIRES_RUN += $(call proj_query, pkg-requires $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT)) +PKG_REQUIRES_DEVEL += $(call proj_query, pkg-requires $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT)) +PKG_CONFLICTS_RUN += $(call proj_query, pkg-conflicts $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT)) +PKG_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT)) +PKG_PROVIDES_RUN += $(call proj_query, pkg-provides $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT)) +PKG_PROVIDES_DEVEL += $(call proj_query, pkg-provides $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT)) PKG_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//') PKG_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//') diff --git a/scripts/pkg.sh b/scripts/pkg.sh index 9e24c9ae..39adaf3b 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -438,16 +438,12 @@ build_pkg() local tar_archive_orig=$src_base.orig.tar.bz2 local distribution=`get_os` - expand_version_macros() { - echo "$@" | sed "s/__NEXT_VERSION__/$version/g; s/VERSION-REVISION/$version/g; s/VERSION/$version/g" - } - - local rpm_requires_run=`expand_version_macros $PKG_REQUIRES_RUN` - local rpm_requires_devel=`expand_version_macros $PKG_REQUIRES_DEVEL` - local rpm_conflicts_run=`expand_version_macros $PKG_CONFLICTS_RUN` - local rpm_conflicts_devel=`expand_version_macros $PKG_CONFLICTS_DEVEL` - local rpm_provides_run=`expand_version_macros $PKG_PROVIDES_RUN` - local rpm_provides_devel=`expand_version_macros $PKG_PROVIDES_DEVEL` + local rpm_requires_run="$PKG_REQUIRES_RUN" + local rpm_requires_devel="$PKG_REQUIRES_DEVEL" + local rpm_conflicts_run="$PKG_CONFLICTS_RUN" + local rpm_conflicts_devel="$PKG_CONFLICTS_DEVEL" + local rpm_provides_run="$PKG_PROVIDES_RUN" + local rpm_provides_devel="$PKG_PROVIDES_DEVEL" # --- create source directory tree create_empty_dir $src_tree "Source files compilation directory" -- 2.55.0