Your message dated Fri, 11 Feb 2022 06:19:16 +0000
with message-id <e1niph2-0002b6...@fasolo.debian.org>
and subject line Bug#1004280: fixed in raspi-firmware 1.20220120+ds-1
has caused the Debian Bug report #1004280,
regarding raspi-firmware: Autogenerated-file warning fixes and clarification
for config.txt
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 ow...@bugs.debian.org
immediately.)
--
1004280: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004280
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: raspi-firmware
Version: 1.20210303+ds-2
Severity: normal
File: /etc/kernel/postinst.d/z50-raspi-firmware
Tags: patch
Hi Debian Raspberry Pi Maintainers,
I noticed that /etc/kernel/postinst.d/z50-raspi-firmware is meant to
include a comment with a warning when generating
/boot/firmware/config.txt:
---
# Truncate the config.txt file so that we start with a blank slate
echo <<EOF >/boot/firmware/config.txt
# Do not modify this file!
#
# It is automatically generated upon install or update of either the
# firmware or the Linux kernel.
#
# If you need to set boot-time parameters, do so via the
# /etc/default/raspi-firmware or /etc/default/raspi-extra-cmdline
#files.
EOF
---
But echo was used by mistake instead of cat, so the comment is not
actually included:
---
$ cat /boot/firmware/config.txt
enable_uart=1
upstream_kernel=1
kernel=vmlinuz-5.10.0-11-rpi
# For details on the initramfs directive, see
# https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=10532
initramfs initrd.img-5.10.0-11-rpi
---
This has the potential to frustrate users who aren't aware that the
file is automatically generated, and find their changes disappear upon
upgrading their kernel.
Additionally, for arm64 users, the comment would be overwritten due to
use of > instead of >>:
---
if [ "$arch" = "arm64" ]; then
cat >/boot/firmware/config.txt <<EOF
---
I also propose changing the reference to
/etc/default/raspi-extra-cmdline inside that comment to
/etc/default/raspi-firmware-custom instead, since the latter file (and
not the former) affects what goes into /boot/firmware/config.txt.
That is, if someone needs to add something to config.txt which isn't
covered by /e/d/raspi-firmware, then it's /e/d/raspi-firmware-custom
that they will need to edit.
I've attached a patch which addresses these three concerns. (If you
notice that I changed the order of the redirection and here-doc
operators in the first fix, it's to be consistent with the other uses
throughout the file: output first, then here-doc.)
Thanks for taking a look,
-Jean-Paul
-- System Information:
Debian Release: 11.2
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable')
Architecture: armel (armv6l)
Kernel: Linux 5.10.0-11-rpi
Kernel taint flags: TAINT_CRAP, TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C (charmap=UTF-8) (ignored: LC_ALL set to
en_US.UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages raspi-firmware depends on:
ii dosfstools 4.2-1
ii dpkg 1.20.9
raspi-firmware recommends no packages.
raspi-firmware suggests no packages.
-- no debconf information
--- /etc/kernel/postinst.d/z50-raspi-firmware.dpkg-dist 2021-04-20 22:52:21.000000000 -0700
+++ /etc/kernel/postinst.d/z50-raspi-firmware 2022-01-23 21:31:53.178811042 -0800
@@ -94,20 +94,20 @@
# Truncate the config.txt file so that we start with a blank slate
-echo <<EOF >/boot/firmware/config.txt
+cat >/boot/firmware/config.txt <<EOF
# Do not modify this file!
#
# It is automatically generated upon install or update of either the
# firmware or the Linux kernel.
#
# If you need to set boot-time parameters, do so via the
-# /etc/default/raspi-firmware or /etc/default/raspi-extra-cmdline
-#files.
+# /etc/default/raspi-firmware or /etc/default/raspi-firmware-custom
+# files.
EOF
if [ "$arch" = "arm64" ]; then
- cat >/boot/firmware/config.txt <<EOF
+ cat >>/boot/firmware/config.txt <<EOF
# Switch the CPU from ARMv7 into ARMv8 (aarch64) mode
arm_64bit=1
--- End Message ---
--- Begin Message ---
Source: raspi-firmware
Source-Version: 1.20220120+ds-1
Done: Gunnar Wolf <gw...@debian.org>
We believe that the bug you reported is fixed in the latest version of
raspi-firmware, 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 1004...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Gunnar Wolf <gw...@debian.org> (supplier of updated raspi-firmware 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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 10 Feb 2022 23:33:01 -0600
Source: raspi-firmware
Architecture: source
Version: 1.20220120+ds-1
Distribution: unstable
Urgency: medium
Maintainer: pkg-raspi <pkg-raspi-maintain...@lists.alioth.debian.org>
Changed-By: Gunnar Wolf <gw...@debian.org>
Closes: 1004280
Changes:
raspi-firmware (1.20220120+ds-1) unstable; urgency=medium
.
* New upstream release
* Update standards-version 4.5.1→4.6.0 (no changes needed)
* Fixed debian/watch to correctly report new versions
* Fix omitted clarification on autogenerated config.txt file (Closes:
#1004280)
Checksums-Sha1:
5189caadecfe79f6e6ade3fccd19a7dc056ae83c 1639
raspi-firmware_1.20220120+ds-1.dsc
8a9702f9612d7da9de78fa970565671dd602c87e 4516836
raspi-firmware_1.20220120+ds.orig.tar.xz
ec217545fe60f39217b4804da44fad3b9bdd0b8d 27304
raspi-firmware_1.20220120+ds-1.debian.tar.xz
6f2f17e47cbe6bab9fd6d3f7da0b1e8a17e07a8a 6134
raspi-firmware_1.20220120+ds-1_source.buildinfo
Checksums-Sha256:
ecb4a148fcc7c516f83f7a103ee01aa07f3388397c3bc32a3152cff075371855 1639
raspi-firmware_1.20220120+ds-1.dsc
e1d08ff22599c6406768379766ad6cd0916fb5fb3462b32ccd768ce0316c6100 4516836
raspi-firmware_1.20220120+ds.orig.tar.xz
38117f8c31e5226e5658a6f8370c869ce3501c2e5b743499752f5c09a7fcfd5a 27304
raspi-firmware_1.20220120+ds-1.debian.tar.xz
670163a99e34627fa4243bfa1b24d585a6f8998e3f30a782b0a371cb80602898 6134
raspi-firmware_1.20220120+ds-1_source.buildinfo
Files:
c4ba5194b1777c6b14c926dddcdec32c 1639 non-free/misc optional
raspi-firmware_1.20220120+ds-1.dsc
922220af3315018ab079d373ec210793 4516836 non-free/misc optional
raspi-firmware_1.20220120+ds.orig.tar.xz
a9244909f2b021edaea2698d67f8b334 27304 non-free/misc optional
raspi-firmware_1.20220120+ds-1.debian.tar.xz
06d4a04420bde8eb1592b0c54e852e5f 6134 non-free/misc optional
raspi-firmware_1.20220120+ds-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iHUEARYIAB0WIQRgswk9lhCOXLlxQu/i9jtDU/RZiQUCYgX5DgAKCRDi9jtDU/RZ
iUzUAPwOWHliaz4810DRmWcijDVluwrglOooRnLweLUCFUU73QEAyQy9rvte54Yd
yDmp4sRqMZlfW2UklCiUCu0wpfyDrQw=
=oYfs
-----END PGP SIGNATURE-----
--- End Message ---
