Bug#774551: unblock: flash-kernel/3.30
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package flash-kernel. This package produces a udeb, so kibi CCd
and d-i tag added.
Testing currently contains 3.28.
3.29 was a brown paper bag upload to revert an accidental upload of a version
intended for experimental to unstable. It fixed the content type for a
translation but was otherwise a nop compared with 3.28.
3.30 adds support for the TI OMAP5 uEVM board (#77325) and LinkSprite pcDuino3
(user request on debian-arm@) as well as an alternative name for the BeagleBone
Black (#773890).
It also avoids issues arising from the old ambigous name used by BBB which
could be confused for the BeagleBone White by refusing to boot on the White
(which is a far less common platform, which we don't currently support). Fixing
things to work on both would be a far larger patch not suitable for Jessie (at
least in the abasence of a user request). This was discussed in #773890).
Lastly this version makes sure that /dev/mtdblock* will be available before use
by ensuring that the kernel module is loaded (#773991).
Thanks!
Ian.
debdiff:
diff -Nru flash-kernel-3.28/bootscript/bootscr.beaglebone flash-kernel-3.30/bootscript/bootscr.beaglebone
--- flash-kernel-3.28/bootscript/bootscr.beaglebone 2014-09-04 07:14:17.000000000 +0100
+++ flash-kernel-3.30/bootscript/bootscr.beaglebone 2014-12-30 15:31:54.000000000 +0000
@@ -1,4 +1,14 @@
-# boot script for BeagleBone
+# boot script for BeagleBone Black
+
+# BeagleBone white uses a different .dtb file, and flash-kernel is
+# currently unable to support multiple .dtb files.
+if test "${board_name}" = "A335BONE"
+then
+ echo "BeagleBone white detected, unsupported platform."
+ echo "Exiting in 10 seconds..."
+ sleep 10
+ exit
+fi
setenv device mmc
setenv partition ${bootpart}
diff -Nru flash-kernel-3.28/db/all.db flash-kernel-3.30/db/all.db
--- flash-kernel-3.28/db/all.db 2014-10-13 04:01:11.000000000 +0100
+++ flash-kernel-3.30/db/all.db 2014-12-30 15:31:54.000000000 +0000
@@ -301,6 +301,13 @@
U-Boot-Script-Name: bootscr.sunxi
Required-Packages: u-boot-tools
+Machine: LinkSprite pcDuino3
+Kernel-Flavors: armmp armmp-lpae
+Boot-Script-Path: /boot/boot.scr
+DTB-Id: sun7i-a20-pcduino3.dtb
+U-Boot-Script-Name: bootscr.sunxi
+Required-Packages: u-boot-tools
+
Machine: Linksys NSLU2
Method: slug
Kernel-Flavors: ixp4xx
@@ -574,12 +581,20 @@
Bootloader-Sets-Incorrect-Root: yes
Machine: TI AM335x BeagleBone
+Machine: TI AM335x BeagleBone Black
Kernel-Flavors: armmp
DTB-Id: am335x-boneblack.dtb
Boot-Script-Path: /boot/boot.scr
U-Boot-Script-Name: bootscr.beaglebone
Required-Packages: u-boot-tools
+Machine: TI OMAP5 uEVM board
+Kernel-Flavors: armmp armmp-lpae
+DTB-Id: omap5-uevm.dtb
+U-Boot-Script-Name: bootscr.uboot-generic
+Boot-Script-Path: /boot/boot.scr
+Required-Packages: u-boot-tools
+
Machine: Toshiba AC100 / Dynabook AZ
Method: android
Android-Boot-Device: /dev/mmcblk0
diff -Nru flash-kernel-3.28/debian/changelog flash-kernel-3.30/debian/changelog
--- flash-kernel-3.28/debian/changelog 2014-10-13 10:08:45.000000000 +0100
+++ flash-kernel-3.30/debian/changelog 2014-12-30 15:31:54.000000000 +0000
@@ -1,3 +1,27 @@
+flash-kernel (3.30) unstable; urgency=medium
+
+ [ Ian Campbell ]
+ * Support for TI OMAP5 uEVM board (Patch from Chen Baozi, Closes: #773255)
+ * Support for alternative machine name for BeagleBone Black. The old name was
+ ambiguous with the original BeagleBone (often called "White"), detect if
+ booting on a BeagleBone white and print an error since the DTB will be
+ wrong. We don't currently support the White. (Closes: #773890)
+ * Ensure mtdblock driver is loaded before accessing /dev/mtdblock*.
+ (Closes: #773991)
+
+ [ Karsten Merker ]
+ * Add a machine db entry for the LinkSprite pcDuino3
+
+ -- Ian Campbell <ijc@debian.org> Tue, 30 Dec 2014 15:31:42 +0000
+
+flash-kernel (3.29) unstable; urgency=medium
+
+ * Correct Content-Transfer-Encoding in zn_CH.po.
+ * No other changes vs 3.28, this supersedes the brown paper bag upload of
+ 3.29~exp.1 to unstable.
+
+ -- Ian Campbell <ijc@debian.org> Sat, 13 Dec 2014 11:19:47 +0000
+
flash-kernel (3.28) unstable; urgency=medium
[ Ian Campbell ]
diff -Nru flash-kernel-3.28/debian/po/zh_CN.po flash-kernel-3.30/debian/po/zh_CN.po
--- flash-kernel-3.28/debian/po/zh_CN.po 2011-08-12 02:00:53.000000000 +0100
+++ flash-kernel-3.30/debian/po/zh_CN.po 2014-12-30 15:31:54.000000000 +0000
@@ -39,7 +39,7 @@
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. Type: text
diff -Nru flash-kernel-3.28/functions flash-kernel-3.30/functions
--- flash-kernel-3.28/functions 2014-09-30 04:01:05.000000000 +0100
+++ flash-kernel-3.30/functions 2014-12-30 15:31:54.000000000 +0000
@@ -41,7 +41,11 @@
mtdblock() {
local mtdname="$1"
- sed -rn "s,^mtd([^:]*).*\"$mtdname\"\$,/dev/mtdblock\\1,p" "$PROC_MTD"
+ local dev=`sed -rn "s,^mtd([^:]*).*\"$mtdname\"\$,/dev/mtdblock\\1,p" "$PROC_MTD"`
+
+ modprobe -q mtdblock && udevadm settle --exit-if-exists=$dev || :
+
+ echo $dev
}
check_block_dev() {
unblock flash-kernel/3.30
-- System Information:
Debian Release: 8.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf, armel
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: sysvinit (via /sbin/init)
Reply to: