Control: tags -1 + patch
Control: forwarded -1
https://lore.kernel.org/all/20230120070809.6169-1-jo...@mister-muffin.de/
Hi,
Johannes tried upstreaming the necessary change and that was rejected
with a note that this is the responsibility of the builder. I'm
attaching the appropriate Debian patch as requested. Please consider
applying it.
Helmut
diff --minimal -Nru linux-6.1.8/debian/changelog linux-6.1.8/debian/changelog
--- linux-6.1.8/debian/changelog 2023-01-29 13:33:36.000000000 +0100
+++ linux-6.1.8/debian/changelog 2023-02-07 07:55:34.000000000 +0100
@@ -1,3 +1,10 @@
+linux (6.1.8-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Supply the host pkg-config to the rtla build. (Closes:
#1019118)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 07 Feb 2023 07:55:34 +0100
+
linux (6.1.8-1) unstable; urgency=medium
* New upstream stable update:
diff --minimal -Nru linux-6.1.8/debian/rules.d/Makefile.inc
linux-6.1.8/debian/rules.d/Makefile.inc
--- linux-6.1.8/debian/rules.d/Makefile.inc 2022-11-20 16:33:47.000000000
+0100
+++ linux-6.1.8/debian/rules.d/Makefile.inc 2023-02-07 07:55:34.000000000
+0100
@@ -7,6 +7,7 @@
CC = $(CROSS_COMPILE)gcc
CXX = $(CROSS_COMPILE)g++
+PKG_CONFIG = $(CROSS_COMPILE)pkg-config
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) \
-I$(top_srcdir)/$(OUTDIR) \
diff --minimal -Nru linux-6.1.8/debian/rules.d/tools/tracing/rtla/Makefile
linux-6.1.8/debian/rules.d/tools/tracing/rtla/Makefile
--- linux-6.1.8/debian/rules.d/tools/tracing/rtla/Makefile 2023-01-28
14:24:06.000000000 +0100
+++ linux-6.1.8/debian/rules.d/tools/tracing/rtla/Makefile 2023-02-07
07:55:34.000000000 +0100
@@ -5,7 +5,7 @@
echo '$(UPSTREAMVERSION)' >VERSION
rsync -a $(top_srcdir)/tools/tracing/rtla/ .
rsync -a $(top_srcdir)/Documentation/tools/rtla/ Documentation/
- $(MAKE) EXTRA_CFLAGS='$(CFLAGS) $(CPPFLAGS)' EXTRA_LDFLAGS='$(LDFLAGS)'
+ $(MAKE) EXTRA_CFLAGS='$(CFLAGS) $(CPPFLAGS)' EXTRA_LDFLAGS='$(LDFLAGS)'
PKG_CONFIG='$(PKG_CONFIG)'
install:
$(MAKE) install
