Adam D. Barratt <adam@adam-barratt.org.uk> (07/06/2013): > On Thu, 2013-06-06 at 23:27 +0200, Cyril Brulebois wrote: > > after the temptation of adding a dependency to fix installation failures > > on some devices, NACKed by Martin[1], #693839 was diagnosed and fixed by > > the same Martin[2]. :) > [...] > > The db and its minimal test suite get refined in 3.7 (just landed in > > unstable)[3,4], but cosmetics don't belong in stable. > > Please go ahead; thanks. So it didn't actually build (depending on the locale), not seen at home, but reproduced on harris when Hector mentioned the FTBFS on his side… Reported as: http://bugs.debian.org/711759 Fixed in the master and wheezy branches, debdiff against previous pu candidate attached; build-tested on harris. Hector, can you please check it builds fine and upload? http://people.debian.org/~kibi/d-i/flash-kernel_3.3+deb7u2.dsc Adam, if you feel it's still O-borderline-K-ish for 7.1, please consider accepting it. In the meanwhile, I'll be preparing the debian-installer upload (new kernel, some checks, etc.). Sorry it took so long; and thanks already. Mraw, KiBi.
diff -Nru flash-kernel-3.3+deb7u1/debian/changelog flash-kernel-3.3+deb7u2/debian/changelog
--- flash-kernel-3.3+deb7u1/debian/changelog 2013-06-06 23:17:15.000000000 +0200
+++ flash-kernel-3.3+deb7u2/debian/changelog 2013-06-12 01:49:50.000000000 +0200
@@ -1,3 +1,10 @@
+flash-kernel (3.3+deb7u2) wheezy; urgency=low
+
+ * Fix test_db testsuite to be LC_COLLATE-independent, by calling sort -u
+ on both the $expected and $fields variables. Closes: #711759
+
+ -- Cyril Brulebois <kibi@debian.org> Wed, 12 Jun 2013 01:41:30 +0200
+
flash-kernel (3.3+deb7u1) wheezy; urgency=low
[ Cyril Brulebois ]
diff -Nru flash-kernel-3.3+deb7u1/test_db flash-kernel-3.3+deb7u2/test_db
--- flash-kernel-3.3+deb7u1/test_db 2013-06-06 23:14:49.000000000 +0200
+++ flash-kernel-3.3+deb7u2/test_db 2013-06-12 01:50:59.000000000 +0200
@@ -24,7 +24,9 @@
test_no_unknown_fields() {
local expected='Android-Boot-Device Boot-Device Boot-DTB-Path Boot-Initrd-Path Boot-Kernel-Path Bootloader-sets-root Boot-Multi-Path Boot-Script-Path DTB-Append DTB-Id Kernel-Flavors Machine Machine-Id Method Mtd-Initrd Mtd-Kernel Optional-Packages Required-Packages U-Boot-Initrd-Address U-Boot-Kernel-Address U-Boot-Multi-Address U-Boot-Script-Address U-Boot-Script-Name'
+ expected="$(echo "$expected" | sed 's/ /\n/g' | sort -u | xargs)"
local fields="$(echo "$MACHINE_DB" | sed -n '/^[^#]*:/s/:.*//p' | sort -u | xargs)"
+ echo $fields
if [ "$fields" != "$expected" ]; then
return 1
fi
Attachment:
signature.asc
Description: Digital signature