[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1035505: marked as done (firmware-nonfree: debian/bin/gencontrol.py fails on spaces and backslashes)

Your message dated Sun, 30 Jun 2024 14:45:45 +0000
with message-id <E1sNvoH-00EEvZ-1c@fasolo.debian.org>
and subject line Bug#1035505: fixed in firmware-nonfree 20230625-3~exp3
has caused the Debian Bug report #1035505,
regarding firmware-nonfree: debian/bin/gencontrol.py fails on spaces and backslashes
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1035505: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1035505
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: firmware-nonfree
Version: 20230210-5
Severity: normal
X-Debbugs-Cc: 1029843@bugs.debian.org, kibi@debian.org

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

While trying to prepare a MR to fix bug #1029843, I encountered a
failure which seems to be `gencontrol.py`'s inability to deal with
spaces and/or backslashes (used to escape the spaces).

$ debian/rules debian/control-real
mkdir -p debian/build
printf >debian/build/version-info 'Source: %s\nVersion: %s\n' firmware-nonfree 20230210-6
./copy-firmware.sh debian/build/install
debian/bin/gencontrol.py /usr/src/linux-support-6.1.0-8
Traceback (most recent call last):
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 341, in <module>
    GenControl()()
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 94, in __call__
    self.do_main(packages, makefile)
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 128, in do_main
    self.do_package(packages, makefile, package, vars.copy(), makeflags.copy())
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 228, in do_package
    f, f_real, version = files_real[f]
                         ~~~~~~~~~~^^^
KeyError: 'brcm/brcmfmac43455-sdio.Raspberry\\'
make: *** [debian/rules:53: debian/control-real] Error 1

The upstream WHENCE file contains these lines:
Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ 4\ Model\ B.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt
Link: brcm/brcmfmac43455-sdio.Raspberry\ Pi\ Foundation-Raspberry\ Pi\ Compute\ Module\ 4.txt -> brcmfmac43455-sdio.raspberrypi,4-model-b.txt

Removing the `\`, but keeping the spaces, resulted in a similar error:

$ debian/rules debian/control-real
./copy-firmware.sh debian/build/install
debian/bin/gencontrol.py /usr/src/linux-support-6.1.0-8
Traceback (most recent call last):
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 341, in <module>
    GenControl()()
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 94, in __call__
    self.do_main(packages, makefile)
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 128, in do_main
    self.do_package(packages, makefile, package, vars.copy(), makeflags.copy())
  File "/home/diederik/dev/debian/salsa/kernel-team/firmware-nonfree/debian/bin/gencontrol.py", line 228, in do_package
    f, f_real, version = files_real[f]
                         ~~~~~~~~~~^^^
KeyError: 'brcm/brcmfmac43455-sdio.Raspberry'
make: *** [debian/rules:53: debian/control-real] Error 1

So AFAICT this means that firmware files or links with spaces in them
can not be added to the Debian packages.

I'm guessing this was the reason that the non-CM link was added, but
then removed again before the upload (but there's still an entry about
it in `debian/changelog`.
See commits 53779c7b6131a541 and b42c40616208270a.


- -- System Information:
Debian Release: 12.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.1.0-8-amd64 (SMP w/4 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-----BEGIN PGP SIGNATURE-----

iHUEARYIAB0WIQT1sUPBYsyGmi4usy/XblvOeH7bbgUCZFOIDwAKCRDXblvOeH7b
bkAhAP97KDfuB6CsxAokJnAUCcJvXT4APdYaVYtAjrzoJXYiVgEA8hjbsBy13Yp7
4OfoxKsQnbdFeSv35gQxAauaSvAJdAU=
=11HZ
-----END PGP SIGNATURE-----

--- End Message ---
--- Begin Message --- 
Source: firmware-nonfree
Source-Version: 20230625-3~exp3
Done: Ben Hutchings <benh@debian.org>

We believe that the bug you reported is fixed in the latest version of
firmware-nonfree, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1035505@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ben Hutchings <benh@debian.org> (supplier of updated firmware-nonfree package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 30 Jun 2024 16:16:28 +0200
Source: firmware-nonfree
Architecture: source
Version: 20230625-3~exp3
Distribution: experimental
Urgency: medium
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Changed-By: Ben Hutchings <benh@debian.org>
Closes: 1035505 1073832
Changes:
 firmware-nonfree (20230625-3~exp3) experimental; urgency=medium
 .
   [ Ben Hutchings ]
   * d/b/gencontrol.py: Remove support for encoding file version in filename
   * d/b/gencontrol.py: Remove check for .svn directories
   * d/b/gencontrol.py: Use path objects where possible
   * d/b/{gencontrol,check_upstream}.py: Support wildcards in file lists
     (Closes: #1035505)
   * d/config: Use wildcards in file lists
   * Use @package@ in new maintainer script templates instead of #PACKAGE#
   * Set the 'usrmovemitigation' config field to list type
   * Update to linux-support-6.9.7
 .
   [ Helmut Grohne ]
   * Mitigate loss of files due to restructuring and /usr-move
     (DEP17 P1, Closes: #1073832)
Checksums-Sha1:
 da588622974f53aa7a5c4e145e3e67d670aa3ba8 4693 firmware-nonfree_20230625-3~exp3.dsc
 ed4d8c9a71b70306369eea4654df9d4395d45a69 850696 firmware-nonfree_20230625-3~exp3.debian.tar.xz
 e26f2066b635950b8c178dbebac47dc335c2bcf1 14592 firmware-nonfree_20230625-3~exp3_amd64.buildinfo
Checksums-Sha256:
 44dbd4032234662ab2dbf309cfb26944c60ffc5df52665c9ef1b5b5d96ed361d 4693 firmware-nonfree_20230625-3~exp3.dsc
 fa4f16259908d496c24b15ea07d5fef263ff634112b0d03d5118981b5e822632 850696 firmware-nonfree_20230625-3~exp3.debian.tar.xz
 f321c5f4c79aac2031fcfcf3e0f0d181f8a021940faa7190182d4f2653de6b0c 14592 firmware-nonfree_20230625-3~exp3_amd64.buildinfo
Files:
 cd15e40f9017aac86d260b48fb60f49c 4693 non-free-firmware/kernel optional firmware-nonfree_20230625-3~exp3.dsc
 ca6cc97b2adc7849b84c6f4788621476 850696 non-free-firmware/kernel optional firmware-nonfree_20230625-3~exp3.debian.tar.xz
 3f0e144f1b508b3d649396eff3fd4afd 14592 non-free-firmware/kernel optional firmware-nonfree_20230625-3~exp3_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAmaBbKIACgkQ57/I7JWG
EQl24w/9FfSaxYTTU3dhy+pk0KYsBHis1VxaESymSpaRFk6rnLDcbiMFZv79IWMj
JbEUhz9ev9sa/T7XDdNqnSkF7U0OInOihPeMVPKedwDdB3e4o3ENKt2G4GQwkRrQ
+NXBPfACNNx/Gvo3sUx7hQVi8Rzt6xY8ZrUzsbUCi+snpMn79y8bjk71GRMhTfgs
TMc5efg9+X5PX6uYHoLEL0ZirgSje2Vk4714WTxgV3rVnvRtqy+YEGIIPgkOthIj
RQ0rCphCyt6IoZzdHGa73P7V4MuONcBOZtH9yWqkP1vWZw/jcLbkHq7vTWBHPPlh
xP45Dl6LUnXzFt4+GPJ/M/4+yf9bfxKeavlqFl6DMwHf3k5tFh+0/dvWTLZEGvuy
Ey9+DAFYVPii8q1Hl/Uhxku1IdUNTrISEJEA1pyMTDos8W9dS5vUvdjlNMYgBxci
VUulIVngHxmnSL1Jgf9PFktC6yFbvGmImPE97zEBkbwCWF679rdvNoUgdCgp83Ms
0Z1SgsMJhKIqXP+5BaAKUmiEEsfKodMP9sSvLId8kxFz8NtGuEW4CtfAvK7JjWFp
7XBdtxk37gDjjrabo4pJbRqb31c3DxIpmJDYQtzMNWmAiE9ASS8Vvqunm0nF4yvs
hXmz4etgOuP2s5CDZoFptozYndPKmNXtxclrBO8JXp5E0XOXOzI=
=2dyU
-----END PGP SIGNATURE-----

Attachment: pgpnmsh5TaDuJ.pgp
Description: PGP signature


--- End Message ---
Reply to: