Your message dated Sat, 06 Jan 2024 03:08:28 +0000
with message-id <e1rlx2y-006ijx...@fasolo.debian.org>
and subject line Bug#979688: fixed in u-boot 2024.01~rc6+dfsg-1
has caused the Debian Bug report #979688,
regarding Simplifying the list of image files for arm64 sunxi boards
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.)
--
979688: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=979688
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: u-boot-sunxi
Version: 2021.01~rc4+dfsg-2
Severity: wishlist
Hi Vagrant,
For 32-bit Allwinner boards, the u-boot-sunxi package provides the image
u-boot-sunxi-with-spl.bin (as well as the standard uboot.elf), but for
64-bit boards it provides instead several components such as sunxi-spl.bin,
u-boot.bin and u-boot-nodtb.bin. This is because originally ARM Trusted
Firmware wasn't available in Debian (according to commit 59a1bb4f) and so
a full bootable image had to be made later on the target system using the
u-boot-install-sunxi64 script.
Now that we have arm-trusted-firmware which can be incorporated into U-Boot
images at build time, I think we could simply use u-boot-sunxi-with-spl.bin
for the 64-bit boards as well as the 32-bit ones. So for example the
Orange Pi One Plus entry in debian/targets could be simplified from:
arm64 sunxi orangepi_one_plus
/usr/lib/arm-trusted-firmware/sun50i_h6/bl31.bin u-boot.bin spl/sunxi-spl.bin
u-boot-nodtb.bin arch/arm/dts/sun50i-h6-orangepi-one-plus.dtb
u-boot-sunxi-with-spl.fit.itb
to:
arm64 sunxi orangepi_one_plus
/usr/lib/arm-trusted-firmware/sun50i_h6/bl31.bin u-boot-sunxi-with-spl.bin
and similarly so could all the other arm64 sunxi entries.
That would mean we could further simplify the u-boot-install-sunxi script.
Below is a suggested patch to the latest version (commit 81c17086) which
includes some other suggested small improvements such as eliminating
temporary files.
Out of interest, what's the reason for including uboot.elf? It was
originally added for all boards in commit d22b2e11, removed in c769484b
then reinstated in 128e7344, but I'm not sure where it gets used.
Thanks a lot for considering these suggestions.
Best wishes,
Harold.
--- debian/bin/u-boot-install-sunxi 2021-01-10 05:10:34.586009078 +0000
+++ debian/bin/u-boot-install-sunxi.simplified 2021-01-10 05:08:20.817459903
+0000
@@ -18,7 +18,7 @@
"FriendlyARM NanoPi NEO Plus2")
TARGET="/usr/lib/u-boot/nanopi_neo_plus2/" ;;
*)
echo >&2 "ERROR: Unknown system: ${dtmodelname}"
- echo >&2 "Specify target: TARGET=/usr/lib/u-boot/UBOOT"
+ echo >&2 "Specify target:
TARGET=/usr/lib/u-boot/<board_name>"
exit 1
;;
esac
@@ -33,11 +33,6 @@
exit 1;;
esac
-if [ -z "$(which mkimage)" ]; then
- echo >&2 "$0: mkimage: command not found. Please install u-boot-tools."
- exit 1
-fi
-
DEV="$1"
if [ -z "$DEV" ] || ! shift || [ -n "$*" ]; then
echo >&2 "Usage: $0 /dev/your-sd-or-mmc-or-image"
@@ -58,36 +53,24 @@
if [ -z "$FORCE" ]; then
# A very simple sanity check. GPT mandates a "protective MBR" so this
works
# even with GPT partitioning.
- printf '%b' '\0125\0252' >mbr-sign
- if ! cmp -s -i 0:510 -n 2 mbr-sign "$DEV"; then
+ if ! printf '\125\252' | cmp -s -i 0:510 -n 2 - "$DEV"; then
echo >&2 "$0: device/image ($DEV) has no MBR partition table"
exit 1
fi
# But, on sunxi64, spl will trample upon GPT.
- printf "EFI PART" >gpt-sign
- if cmp -s -i 0:512 -n 8 gpt-sign "$DEV"; then
+ if printf 'EFI PART' | cmp -s -i 0:512 -n 8 - "$DEV"; then
echo >&2 "$0: device/image ($DEV) uses GPT partition table, unusable on
sunxi64"
exit 1
fi
fi
-itbfiles="u-boot.itb u-boot-sunxi-with-spl.fit.itb"
-itb=
-for i in $itbfiles ; do
- i=${TARGET}/$i
- if [ -f "$i" ]; then
- itb=$i
- fi
-done
+imfile="u-boot-sunxi-with-spl.bin"
-if [ -z "$itb" ]; then
- echo >&2 "$0: no known .itb file in ${TARGET}"
+if [ ! -f "${TARGET}/${imfile}" ]; then
+ echo >&2 "$0: no ${imfile} image file in ${TARGET}"
exit 1
fi
-echo "Writing sunxi-spl"
-dd conv=notrunc if=${TARGET}/sunxi-spl.bin of="$DEV" bs=8k seek=1
-echo "Writing u-boot FIT image"
-dd conv=notrunc if=${itb} of="$DEV" bs=8k seek=5
-sync "$DEV"
+echo "Writing U-Boot image to ${DEV}"
+dd conv=fsync,notrunc if="${TARGET}/${imfile}" of="$DEV" bs=8k seek=1
--- End Message ---
--- Begin Message ---
Source: u-boot
Source-Version: 2024.01~rc6+dfsg-1
Done: Vagrant Cascadian <vagr...@debian.org>
We believe that the bug you reported is fixed in the latest version of
u-boot, 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 979...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Vagrant Cascadian <vagr...@debian.org> (supplier of updated u-boot 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: SHA512
Format: 1.8
Date: Fri, 05 Jan 2024 14:17:59 -0800
Source: u-boot
Architecture: source
Version: 2024.01~rc6+dfsg-1
Distribution: experimental
Urgency: medium
Maintainer: Vagrant Cascadian <vagr...@debian.org>
Changed-By: Vagrant Cascadian <vagr...@debian.org>
Closes: 979688 1041827 1052724 1056289 1056750
Changes:
u-boot (2024.01~rc6+dfsg-1) experimental; urgency=medium
.
* New upstream release candidate.
.
[ harr...@gmx.ph ]
* Remove check for mkimage in u-boot-install-sunxi. (Closes: #1041827)
.
[ Vagrant Cascadian ]
* debian/rules: Disable hardening branch feature to fix arch:all build.
(Closes: #1052724)
* debian/patches: Drop Makefile-fix-upstream-version, fixed upstream.
* debian/patches: Refresh qemu/efi-secure-boot.patch.
* debian/copyright: Updated for new version.
* debian/targets.mk: Remove nokia_rx51, no longer supported upstream.
Thanks to xypron for noticing!
* debian/patches: Drop riscv64
unmatched-prevent-relocating-initrd-and-fdt, no longer needed. Thanks
to xypron for testing!
.
[ harr...@gmx.ph ]
* Clarify error message in u-boot-install-sunxi. (Closes: #1056289)
.
[ Guillem Jover ]
* Remove avr32 arch support removed in dpkg 1.22.0. (Closes: #1056750)
.
[ Harry 88 ]
* Include u-boot-sunxi-with-spl.bin for all sunxi boards
(Closes: #979688)
.
[ Vagrant Cascadian ]
* debian/patches: Update qemu efi-secure-boot patch.
Checksums-Sha1:
d90d7c5e595596ffcba61bb9b52e4aa0d5073a78 3063 u-boot_2024.01~rc6+dfsg-1.dsc
9feb8a984ba3dc59cd289f9f9f0fa56e4de8771f 16761624
u-boot_2024.01~rc6+dfsg.orig.tar.xz
becc3c16a38eb0a692172174e0d7fb94289c2280 99868
u-boot_2024.01~rc6+dfsg-1.debian.tar.xz
9d98d1777444b32921c9200bef110a8104be34cb 7386
u-boot_2024.01~rc6+dfsg-1_amd64.buildinfo
Checksums-Sha256:
606fdeb7abe9ed9ff83279a22f44ab3040bdf4f384a07b32d61b76a935ec06ae 3063
u-boot_2024.01~rc6+dfsg-1.dsc
3e523cea0870566e21d1ddd86b10d01936004976972b5e04dfade47afa040e08 16761624
u-boot_2024.01~rc6+dfsg.orig.tar.xz
7805365357ca8fe07961a007d5c5d35927dc913cd5e36bb4da0e26dc5f836da6 99868
u-boot_2024.01~rc6+dfsg-1.debian.tar.xz
407231ff0aef7dcd0d480a9e64bedffbc471b9a90c40fea3d02fd63d06e60014 7386
u-boot_2024.01~rc6+dfsg-1_amd64.buildinfo
Files:
562fec9e5b64df63b305329ba9648c76 3063 admin optional
u-boot_2024.01~rc6+dfsg-1.dsc
e7e5159709790da4d6152b801d13b917 16761624 admin optional
u-boot_2024.01~rc6+dfsg.orig.tar.xz
2cdfa09967abfa0fb1f0edee9e2da632 99868 admin optional
u-boot_2024.01~rc6+dfsg-1.debian.tar.xz
594ed1b04ab585435791f45e4187ba8f 7386 admin optional
u-boot_2024.01~rc6+dfsg-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iIkEARYKADEWIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZZiCMxMcdmFncmFudEBk
ZWJpYW4ub3JnAAoJENxRj8h/lxaqd3UA/Aw8L5Zg5xitatuEO2yOnFFcNcZyuYQL
IMQ3j6F+AuJkAQDQ8HbObFbnXB7k1CjQGdp9SG0jBvTHFpXdH1UbvzVkCg==
=YASv
-----END PGP SIGNATURE-----
--- End Message ---
