Source: lirc Severity: normal Tags: patch User: [email protected] Usertags: usrmerge X-Debbugs-Cc: [email protected]
Various files embed paths to "modinfo" and "sh" differently on a non-usrmerge vs. usrmerge system. https://tests.reproducible-builds.org/debian/rb-pkg/bullseye/i386/diffoscope-results/lirc.html /usr/lib/x86_64-linux-gnu/python3.9/site-packages/lirc/config.py MODINFO·=·"/sbin/modinfo" vs. MODINFO·=·"/usr/sbin/modinfo" /usr/include/lirc/config.h #define·SH_PATH·"/bin/sh" vs. #define·SH_PATH·"/usr/bin/sh" The attached patches fix this by patching configure.ac to accept the MODINFO variable, and passing the SH_PATH and MODINFO variables to configure. Thanks for maintaining lirc! live well, vagrant
From 63155d63989f7470ce5231e4846029cd8b20be34 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <[email protected]> Date: Sat, 2 Jan 2021 01:04:17 +0000 Subject: [PATCH 2/3] debian/patches: Add patch to support passing MODINFO to configure. --- ...figure.ac-to-support-passing-MODINFO.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch diff --git a/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch b/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch new file mode 100644 index 0000000..fd4d9f8 --- /dev/null +++ b/debian/patches/0010-Patch-configure.ac-to-support-passing-MODINFO.patch @@ -0,0 +1,25 @@ +From 6f3ba4fa2b98d7fede17da5888fb8e00fb54dba4 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian <[email protected]> +Date: Sat, 2 Jan 2021 01:03:10 +0000 +Subject: [PATCH] Patch configure.ac to support passing MODINFO. + +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 58347d8..1d910b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -25,8 +25,6 @@ AC_CHECK_PROGS([MODINFO], [modinfo], [no], [$PATH:/sbin:/usr/sbin]) + if test x$MODINFO = xno; then + AC_MSG_WARN(["No modinfo command found - skipping kernel drivers."]) + MODINFO="false" +-else +- MODINFO=$( PATH=$PATH:/sbin:/usr/sbin which modinfo ) + fi + AC_SUBST(MODINFO) + AC_CHECK_PROG([PKGCONFIG],[pkg-config],[yes],[no]) +-- +2.20.1 + diff --git a/debian/patches/series b/debian/patches/series index 7797a6c..0dbfd25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 0007-python3.8.diff 0008-doxyfile-Don-t-include-full-pathname-961954.patch 0009-Do-not-embed-build-date-and-kernel-version-in-variou.patch +0010-Patch-configure.ac-to-support-passing-MODINFO.patch -- 2.20.1
From c4e6f2360108bf15d23684290f56e09e78a6fc1e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <[email protected]> Date: Sat, 2 Jan 2021 00:47:10 +0000 Subject: [PATCH 3/3] debian/rules: Pass MODINFO and SH_PATH to configure. The paths to "modinfo" and "sh" may vary as either located in /bin and /sbin or in /usr/bin and /usr/sbin if the system is configured as a usrmerge system. Use the non-usrmerge paths for the most compatible location. --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 84787ef..446510f 100755 --- a/debian/rules +++ b/debian/rules @@ -17,10 +17,14 @@ override_dh_autoreconf: override_dh_auto_configure: ifeq ($(DEB_BUILD_ARCH_OS), linux) dh_auto_configure -- \ + SH_PATH=/bin/sh \ + MODINFO=/sbin/modinfo \ --enable-uinput --enable-devinput \ --enable-silent-rules else dh_auto_configure -- \ + SH_PATH=/bin/sh \ + MODINFO=/sbin/modinfo \ --disable-uinput --disable-devinput \ --enable-silent-rules endif -- 2.20.1
signature.asc
Description: PGP signature
