Control: tag -1 patch Hi!
On Wed, 2024-08-21 at 04:45:15 +0200, Guillem Jover wrote: > Source: devscripts > Source-Version: 2.24.1 > Severity: normal > This package includes the dpkg/vendor.mk fragment file from the > scripts/Makefile, which does not reside in the source package root > directory, which is not supported by the dpkg fragment files. This is > now generating errors such as: > > ,--- > make[2]: Leaving directory '/<<PKGBUILDDIR>>/doc' > dpkg-buildapi: error: cannot read debian/control: No such file or directory > /bin/sh: 1: test: Illegal number: > rm -f devscripts/__init__.py > `--- > > I guess to solve this, the header could be either included from the > top level Makefile, and the variable exported, or perhaps easier to > simply call dpkg-vendor directly and avoid the dpkg fragment file > entirely? Attached a patch that fixes this. Thanks, Guillem
From 387960d4019745ba149ffa9ce1596b96742de6d2 Mon Sep 17 00:00:00 2001 From: Guillem Jover <guil...@debian.org> Date: Mon, 2 Dec 2024 02:29:21 +0100 Subject: [PATCH] build: Use dpkg-vendor directly instead of including dpkg/mk/vendor.mk The vendor.mk Make fragment file expects to be executed from the root directory of an unpacked Debian source tree, otherwise we get warnings such as: ,--- make[2]: Leaving directory '/<<PKGBUILDDIR>>/doc' dpkg-buildapi: error: cannot read debian/control: No such file or directory /bin/sh: 1: test: Illegal number: rm -f devscripts/__init__.py `--- Call dpkg-vendor directly, which is the simplest and most correct fix. Closes: #1079186 --- scripts/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile b/scripts/Makefile index bd098969..d40661fe 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -1,6 +1,5 @@ include ../Makefile.common -include /usr/share/dpkg/vendor.mk DESTDIR = define \n @@ -11,6 +10,8 @@ endef VERSION_FILE = ../version VERSION = $(shell cat $(VERSION_FILE)) +DEB_VENDOR = $(shell dpkg-vendor --query Vendor) + PL_FILES := $(wildcard *.pl) SH_FILES = $(wildcard *.sh) SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst %.sh,%,$(SH_FILES)) -- 2.45.2
