Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu wheezy
Hi,
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]. :)
1. https://lists.debian.org/20130102193706.ga2...@jirafa.cyrius.com
2. https://lists.debian.org/20130604192608.ga32...@jirafa.cyrius.com
I suggested to add a check to avoid issues in further updates, which
explains the test_db addition in the debdiff:
README | 2 +-
db/all.db | 24 ++++++++++++------------
debian/changelog | 15 +++++++++++++++
debian/rules | 1 +
test_db | 38 ++++++++++++++++++++++++++++++++++++++
5 files changed, 67 insertions(+), 13 deletions(-)
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.
3.
http://anonscm.debian.org/gitweb/?p=d-i/flash-kernel.git;a=commitdiff;h=343eeb3f642c3f4b4cc4ec6591bfa3b6164b8dc7
4.
http://anonscm.debian.org/gitweb/?p=d-i/flash-kernel.git;a=commitdiff;h=67e61b9cfa883d3b6ec234c773de1e0b01e48476
Thanks for your time.
Mraw,
KiBi.
diff -Nru flash-kernel-3.3/db/all.db flash-kernel-3.3+deb7u1/db/all.db
--- flash-kernel-3.3/db/all.db 2012-07-08 03:02:03.000000000 +0200
+++ flash-kernel-3.3+deb7u1/db/all.db 2013-06-06 23:15:44.000000000 +0200
@@ -7,7 +7,7 @@
U-Boot-Initrd-Address: 0x0
Boot-Kernel-Path: /boot/uImage.buffalo
Boot-Initrd-Path: /boot/initrd.buffalo
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: Buffalo Linkstation Mini
@@ -17,7 +17,7 @@
U-Boot-Initrd-Address: 0x0
Boot-Kernel-Path: /boot/uImage.buffalo
Boot-Initrd-Path: /boot/initrd.buffalo
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: Buffalo Linkstation Pro/Live
@@ -27,7 +27,7 @@
U-Boot-Initrd-Address: 0x0
Boot-Kernel-Path: /boot/uImage.buffalo
Boot-Initrd-Path: /boot/initrd.buffalo
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: Buffalo/Revogear Kurobox Pro
@@ -37,7 +37,7 @@
U-Boot-Initrd-Address: 0x0
Boot-Kernel-Path: /boot/uImage.buffalo
Boot-Initrd-Path: /boot/initrd.buffalo
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: D-Link DNS-323
@@ -47,7 +47,7 @@
Mtd-Initrd: File System
U-Boot-Kernel-Address: 0x00008000
U-Boot-Initrd-Address: 0x00800000
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: Freescale MX53 LOCO Board
@@ -56,7 +56,7 @@
U-Boot-Initrd-Address: 0x0
Boot-Kernel-Path: /boot/uImage
Boot-Initrd-Path: /boot/uInitrd
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: no
Machine: Genesi Efika Smartbook
@@ -68,7 +68,7 @@
Boot-Kernel-Path: /boot/uImage
Boot-Initrd-Path: /boot/uInitrd
Boot-Script-Path: /boot/boot.scr
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: Genesi EfikaMX nettop
@@ -80,7 +80,7 @@
Boot-Kernel-Path: /boot/uImage
Boot-Initrd-Path: /boot/uInitrd
Boot-Script-Path: /boot/boot.scr
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: GLAN Tank
@@ -94,7 +94,7 @@
Kernel-Flavors: s3c24xx
U-Boot-Multi-Address: 0x30008000
Boot-Multi-Path: /boot/uImage.bin
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: HP Media Vault mv2120
@@ -105,7 +105,7 @@
# mv2120-utils includes some initramfs-tools scripts that are nice to have but
# which are not essential
Optional-Packages: mv2120-utils
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: HP t5325 Thin Client
@@ -113,7 +113,7 @@
Machine-Id: 2846
U-Boot-Multi-Address: 0x01600000
Boot-Multi-Path: /boot/uImage
-Required-packages: u-boot-tools
+Required-Packages: u-boot-tools
Bootloader-sets-root: yes
Machine: LaCie 2Big Network v2
@@ -188,7 +188,7 @@
Optional-Packages: ixp4xx-firmware
# nslu2-utils will call update-initramfs -u to include the firmware and to run
# the hook from flash-kernel
-Required-packages: apex-nslu2 nslu2-utils
+Required-Packages: apex-nslu2 nslu2-utils
Bootloader-sets-root: no
Machine: Marvell DB-78x00-BP Development Board
diff -Nru flash-kernel-3.3/debian/changelog flash-kernel-3.3+deb7u1/debian/changelog
--- flash-kernel-3.3/debian/changelog 2012-09-23 08:18:10.000000000 +0200
+++ flash-kernel-3.3+deb7u1/debian/changelog 2013-06-06 23:17:15.000000000 +0200
@@ -1,3 +1,18 @@
+flash-kernel (3.3+deb7u1) wheezy; urgency=low
+
+ [ Cyril Brulebois ]
+ * Backport the following from unstable to wheezy.
+
+ [ Martin Michlmayr ]
+ * The machine database is case-sensitive so ensure that all instances
+ of "Required-Packages" are capitalized correctly. Closes: #693839
+
+ [ Loïc Minier ]
+ * Add test_db testsuite for the database; currently only checking for
+ unknown fields.
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 06 Jun 2013 23:17:11 +0200
+
flash-kernel (3.3) unstable; urgency=low
* Replace XC-Package-Type by Package-Type
diff -Nru flash-kernel-3.3/debian/rules flash-kernel-3.3+deb7u1/debian/rules
--- flash-kernel-3.3/debian/rules 2011-11-04 03:00:46.000000000 +0100
+++ flash-kernel-3.3+deb7u1/debian/rules 2013-06-06 23:14:49.000000000 +0200
@@ -1,6 +1,7 @@
#! /usr/bin/make -f
override_dh_auto_test:
+ FK_CHECKOUT=. ./test_db
FK_CHECKOUT=. ./test_flash-kernel
FK_CHECKOUT=. ./test_functions
diff -Nru flash-kernel-3.3/README flash-kernel-3.3+deb7u1/README
--- flash-kernel-3.3/README 2012-07-08 03:02:03.000000000 +0200
+++ flash-kernel-3.3+deb7u1/README 2013-06-06 23:15:44.000000000 +0200
@@ -117,7 +117,7 @@
but for a DTB file. The DTB file named by DTB-Id will be copied
here; see also DTB-Id
-* Required-packages: (optional) list of packages which must be added
+* Required-Packages: (optional) list of packages which must be added
during installer phase for flash-kernel to work properly; failure to
add these packages aborts the installation
diff -Nru flash-kernel-3.3/test_db flash-kernel-3.3+deb7u1/test_db
--- flash-kernel-3.3/test_db 1970-01-01 01:00:00.000000000 +0100
+++ flash-kernel-3.3+deb7u1/test_db 2013-06-06 23:14:49.000000000 +0200
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# Copyright (C) 2013 Loïc Minier <l...@dooz.org>
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
+. ./testlib
+
+MACHINE_DB="$(cat "${FK_CHECKOUT:-$FK_DIR}/db/"*.db)"
+flash_kernel="${FK_CHECKOUT:-$FK_DIR}/flash-kernel"
+
+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'
+ local fields="$(echo "$MACHINE_DB" | sed -n '/^[^#]*:/s/:.*//p' | sort -u | xargs)"
+ if [ "$fields" != "$expected" ]; then
+ return 1
+ fi
+ return 0
+}
+add_test test_no_unknown_fields
+
+
+test_main
+
+# vim:syntax=sh
