Bug#1064620: firmware-nonfree: suggestions for the packaging, gencontrol.py and debian/rules
Source: firmware-nonfree Version: 20230210-5 Severity: wishlist Tags: patch Hello. The source package builds with the attached changes (2 to 10), and debdiff finds no difference in the resulting debs for firmware-{linux,linux-nonfree,qcom-media} (testing do_extra in gencontrol.py) firmware-realtek (testing an example of do_main in gencontrol.py) Commit 2 to 9 are cosmetic. Commit 10 simplifies the build system in my opinion, and may improve the handling of spaces in file names (1#1035505). This is a complex package and I miss context, so I may of course split 10 in separate commits or revert parts of it depending on your answer. >From 798e5b247db70dc24ce6736a4eba7b5ae17ca41d Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez Date: Fri, 23 Feb 2024 17:10:17 +0100 Subject: [PATCH 02/10] d/README.Debian: typo --- debian/README.source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/README.source b/debian/README.source index 15c11bf..43e897a 100644 --- a/debian/README.source +++ b/debian/README.source @@ -85,7 +85,7 @@ Optional per-file metadata: [_base] desc: One-line description for this file, used in package description -[_base] version: Verson number for this file, used in package +[_base] version: Version number for this file, used in package description To re-generate debian/control (and other files) based on these -- 2.39.2 >From c525da983a782b3d58e7ba4f793930e197fc05d7 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez Date: Fri, 23 Feb 2024 17:11:31 +0100 Subject: [PATCH 03/10] d/clean: instead of complexity in d/rules --- debian/clean | 2 ++ debian/rules | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/clean diff --git a/debian/clean b/debian/clean new file mode 100644 index 000..b0bff90 --- /dev/null +++ b/debian/clean @@ -0,0 +1,2 @@ +debian/build/ +debian/lib/python/__pycache__/ diff --git a/debian/rules b/debian/rules index 5867d9f..ccd41a7 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ build-indep build-arch build: debian/control clean: debian/control dh_testdir - rm -rf debian/build debian/lib/python/__pycache__ dh_clean binary-indep: build-indep -- 2.39.2 >From d193cb90f02e2c669c1ad2fb91759f4d9c3591e8 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez Date: Fri, 23 Feb 2024 17:28:04 +0100 Subject: [PATCH 04/10] d/rules: use dpkg pkg-info.mk snippet instead of reinventing it --- debian/rules | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index ccd41a7..d9a2d38 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,9 @@ #!/usr/bin/make -f SHELL := sh -e -SOURCE := $(shell dpkg-parsechangelog -SSource) -VERSION := $(shell dpkg-parsechangelog -SVersion) -VERSION_UPSTREAM := $(shell echo "$(VERSION)" | sed -e 's,-[^-]*$$,,') -VERSION_BINNMU := $(shell echo "$(VERSION)" | sed -rne 's,.*\+b([0-9]+)$$,\1,p') -VERSION_SOURCE := $(patsubst %+b$(VERSION_BINNMU),%,$(VERSION)) + +include /usr/share/dpkg/pkg-info.mk +VERSION_BINNMU := $(shell echo "$(DEB_VERSION)" | sed -rne 's,.*\+b([0-9]+)$$,\1,p') +VERSION_SOURCE := $(patsubst %+b$(VERSION_BINNMU),%,$(DEB_VERSION)) include debian/rules.defs @@ -35,7 +34,7 @@ CONTROL_FILES += debian/bin/gencontrol.py debian/config/defines $(wildcard debia # in the checksum. debian/build/version-info: debian/changelog mkdir -p $(@D) - printf >$@ 'Source: %s\nVersion: %s\n' $(SOURCE) $(VERSION_SOURCE) + printf >$@ 'Source: %s\nVersion: %s\n' $(DEB_SOURCE) $(VERSION_SOURCE) debian/control debian/rules.gen: $(GENCONTROL) $(CONTROL_FILES) ifeq ($(wildcard debian/control.md5sum),) @@ -59,8 +58,8 @@ debian/control-real: $(GENCONTROL) $(CONTROL_FILES) @echo exit 1 -DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM) -TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz +DIR_ORIG = ../orig/$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM) +TAR_ORIG_NAME = $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME))) orig: $(DIR_ORIG) -- 2.39.2 >From 1327a9f8e15b602e7f3df768758f478b548dbd50 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez Date: Fri, 23 Feb 2024 17:28:38 +0100 Subject: [PATCH 05/10] d/rules: expand GENCONTROL instead of duplicating its contents --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index d9a2d38..f455e5e 100755 --- a/debian/rules +++ b/debian/rules @@ -26,9 +26,9 @@ binary-arch: build-arch binary: binary-indep binary-arch CONTROL_FILES = debian/build/version-info $(wildcard debian/templates/*.in) -CONTROL_FILES += debian/bin/gencontrol.py debian/config/defines $(wildcard debian/config/*/defines) debian/modinfo.json +CONTROL_FILES += $(GENCONTROL) debian/config/defines $(wildcard debian/config/*/defines) debian/modinfo.json -# debian/bin/gencontrol.py us
Bug#1064618: firmware-realtek: please install rtlwifi/rtl8188fufw.bin
Package: firmware-realtek Severity: wishlist Tags: patch Hello. It seems that rtlwifi/rtl8188fufw.bin is now part of the Linux firmwares repository. The attachment attempts to spare you some time, and builds on Debian, but is not tested on actual hardware yet. >From 3a37cc18ee2709e807ff1f330bdc05a8db63efa0 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez Date: Fri, 23 Feb 2024 17:12:57 +0100 Subject: [PATCH 01/10] realtek: Add RTL8188fufw firmware --- debian/config/realtek/defines | 5 + debian/copyright | 2 +- debian/modinfo.json | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/config/realtek/defines b/debian/config/realtek/defines index a68029b..9f600bd 100644 --- a/debian/config/realtek/defines +++ b/debian/config/realtek/defines @@ -70,6 +70,7 @@ files: rtl_nic/rtl8411-2.fw rtlwifi/rtl8188efw.bin rtlwifi/rtl8188eufw.bin + rtlwifi/rtl8188fufw.bin rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cfwU.bin @@ -340,6 +341,10 @@ desc: Realtek RTL8188EE firmware desc: Realtek RTL8188EU firmware version: 28.0 +[rtlwifi/rtl8188fufw.bin_base] +desc: Realtek RTL8188FU firmware +version: 4.3.23.6_20964.20170110 + [rtlwifi/rtl8192cfw.bin_base] desc: Realtek RTL8192CE/RTL8188CE firmware diff --git a/debian/copyright b/debian/copyright index 809b65d..0f1f247 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4265,7 +4265,7 @@ License: binary-redist-Realtek-permissive notice is accompanying it. Files: RTL8192E/* rtlwifi/* rtw88/* -Copyright: 2009-2010, Realtek Semiconductor Corporation +Copyright: 2009-2017, Realtek Semiconductor Corporation License: binary-redist-Realtek-restrictive All rights reserved. . diff --git a/debian/modinfo.json b/debian/modinfo.json index ffee46a..333bc30 100644 --- a/debian/modinfo.json +++ b/debian/modinfo.json @@ -7000,6 +7000,7 @@ "rtlwifi/rtl8192cufw_B.bin", "rtlwifi/rtl8192cufw_A.bin", "rtlwifi/rtl8188eufw.bin", + "rtlwifi/rtl8188fufw.bin", "rtlwifi/rtl8723aufw_B_NoBT.bin", "rtlwifi/rtl8723aufw_B.bin", "rtlwifi/rtl8723aufw_A.bin" -- 2.39.2
Processed: reassign 1064571 to nvidia-kernel-dkms
Processing commands for cont...@bugs.debian.org: > reassign 1064571 nvidia-kernel-dkms Bug #1064571 [src:linux] linux-image-6.6.15-amd64 dies not build on Trixie with Nvidia 545.23.08 Bug reassigned from package 'src:linux' to 'nvidia-kernel-dkms'. No longer marked as found in versions linux/6.6.15-2. Ignoring request to alter fixed versions of bug #1064571 to the same values previously set > thanks Stopping processing here. Please contact me if you need assistance. -- 1064571: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1064571 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Processed: Re: Bug#1064579: new git url for non-free firmware
Processing control commands: > tag -1 moreinfo Bug #1064579 [firmware-iwlwifi] new git url for non-free firmware Added tag(s) moreinfo. -- 1064579: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1064579 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#1064579: new git url for non-free firmware
Control: tag -1 moreinfo On Saturday, 24 February 2024 14:16:53 CET Harald Dunkel wrote: > Package: firmware-iwlwifi > Version: 20230625-2 > > The source URL mentioned in the copyright file doesn't work anymore. Which URL do you mean? https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git works, although it redirects to https://git.kernel.org/pub/scm/linux/kernel/git/ firmware/linux-firmware.git signature.asc Description: This is a digitally signed message part.
Bug#1064579: new git url for non-free firmware
Package: firmware-iwlwifi Version: 20230625-2 The source URL mentioned in the copyright file doesn't work anymore. It seems to be https://kernel.googlesource.com/pub/scm/linux/kernel/git/firmware/linux-firmware now. Same goes for other packages. Regards Harri
Bug#1064571: linux-image-6.6.15-amd64 dies not build on Trixie with Nvidia 545.23.08
Package: src:linux Version: 6.6.15-2 Severity: normal Tags: ftbfs Setting up linux-image-6.6.15-amd64 (6.6.15-2) ... /etc/kernel/postinst.d/dkms: dkms: running auto installation service for kernel 6.6.15-amd64. Sign command: /lib/modules/6.6.15-amd64/build/scripts/sign-file Signing key: /var/lib/dkms/mok.key Public certificate (MOK): /var/lib/dkms/mok.pub Building module: Cleaning build area... unset ARCH; env NV_VERBOSE=1 make -j8 modules KERNEL_UNAME=6.6.15-amd64(bad exit status: 2) Error! Bad return status for module build on kernel: 6.6.15-amd64 (x86_64) Consult /var/lib/dkms/nvidia-current/545.23.08/build/make.log for more information. dkms autoinstall on 6.6.15-amd64/x86_64 failed for nvidia-current(10) Error! One or more modules failed to install during autoinstall. Refer to previous errors for more information. dkms: autoinstall for kernel: 6.6.15-amd64 failed! run-parts: /etc/kernel/postinst.d/dkms exited with return code 11 dpkg: error processing package linux-image-6.6.15-amd64 (--configure): installed linux-image-6.6.15-amd64 package post-installation script subprocess returned error exit status 1 pkg: dependency problems prevent configuration of linux-image-amd64: linux-image-amd64 depends on linux-image-6.6.15-amd64 (= 6.6.15-2); however: Package linux-image-6.6.15-amd64 is not configured yet. dpkg: error processing package linux-image-amd64 (--configure): dependency problems - leaving unconfigured dpkg: dependency problems prevent configuration of linux-headers-6.6.15-amd64: linux-headers-6.6.15-amd64 depends on linux-image-6.6.15-amd64 (= 6.6.15-2) | linux-image-6.6.15-amd64-unsigned (= 6.6.15-2); however: Package linux-image-6.6.15-amd64 is not configured yet. Package linux-image-6.6.15-amd64-unsigned is not installed. dpkg: error processing package linux-headers-6.6.15-amd64 (--configure): dependency problems - leaving unconfigured dpkg: dependency problems prevent configuration of linux-headers-amd64: linux-headers-amd64 depends on linux-headers-6.6.15-amd64 (= 6.6.15-2); however: Package linux-headers-6.6.15-amd64 is not configured yet. dpkg: error processing package linux-headers-amd64 (--configure): dependency problems - leaving unconfigured Errors were encountered while processing: linux-image-6.6.15-amd64 linux-image-amd64 linux-headers-6.6.15-amd64 linux-headers-amd64 E: Sub-process /usr/bin/dpkg returned an error code (1) - >From /var/lib/dkms/nvidia-current/545.23.08/build/make.log: /var/lib/dkms/nvidia-current/545.23.08/build/nvidia.o: warning: objtool: _nv039738rm+0x12f: 'naked' return found in RETHUNK build # cmd_gen_objtooldep /var/lib/dkms/nvidia-current/545.23.08/build/nvidia.o { echo ; echo '/var/lib/dkms/nvidia-current/545.23.08/build/nvidia.o: $(wildcard ./tools/objtool/objtool)' ; } >> /var/lib/dkms/nvidia- current/545.23.08/build/.nvidia.o.cmd # cmd_modules_order /var/lib/dkms/nvidia-current/545.23.08/build/modules.order { echo /var/lib/dkms/nvidia-current/545.23.08/build/nvidia.o; echo /var/lib/dkms/nvidia-current/545.23.08/build/nvidia-uvm.o; echo /var/lib/dkms/nvidia-current/545.23.08/build/nvidia-modeset.o; echo /var/lib/dkms/nvidia-current/545.23.08/build/nvidia-drm.o; echo /var/lib/dkms/nvidia-current/545.23.08/build/nvidia-peermem.o; :; } > /var/lib/dkms/nvidia-current/545.23.08/build/modules.order sh /usr/src/linux-headers-6.6.15-common/scripts/modules-check.sh /var/lib/dkms/nvidia-current/545.23.08/build/modules.order make -f /usr/src/linux-headers-6.6.15-common/scripts/Makefile.modpost # MODPOST /var/lib/dkms/nvidia-current/545.23.08/build/Module.symvers scripts/mod/modpost -M -m -o /var/lib/dkms/nvidia- current/545.23.08/build/Module.symvers -T /var/lib/dkms/nvidia- current/545.23.08/build/modules.order -i Module.symvers -e ERROR: modpost: GPL-incompatible module nvidia.ko uses GPL-only symbol '__rcu_read_unlock' ERROR: modpost: GPL-incompatible module nvidia.ko uses GPL-only symbol '__rcu_read_lock' make[4]: *** [/usr/src/linux- headers-6.6.15-common/scripts/Makefile.modpost:145: /var/lib/dkms/nvidia- current/545.23.08/build/Module.symvers] Error 1 make[3]: *** [/usr/src/linux-headers-6.6.15-common/Makefile:1890: modpost] Error 2 make[2]: *** [/usr/src/linux-headers-6.6.15-common/Makefile:246: __sub-make] Error 2 make[2]: Leaving directory '/usr/src/linux-headers-6.6.15-amd64' make[1]: *** [Makefile:246: __sub-make] Error 2 make[1]: Leaving directory '/usr/src/linux-headers-6.6.15-common' make: *** [Makefile:82: modules] Error 2 - System: Host: laptop1 Kernel: 6.6.13-amd64 arch: x86_64 bits: 64 Desktop: Cinnamon v: 5.8.4 Distro: Debian GNU/Linux trixie/sid Repos: Active apt repos in: /etc/apt/sources.list 1: deb https://deb.debian.org/debian/ testing main contrib non-free non- free-firmware 2: deb-src https://deb.debian.org/debian/ testing main contrib non-free non-free-firmware 3: deb