Bug#770121: unblock: isenkram/0.18 (update firmware list and fix autopkgtest check)
Package: release.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock the isenkram package to get the latest firmware lists
included in Jessie (Bug #769230).
The package also contain a fix for the autpkgtest script to make sure
the test is successful in the normal case and only report a failure if
the python script fail to run. This was my intention with the test
script, but took some iterations to get right with the virtual setup
used by ci.debian.net. If this change is unacceptable by the release
managers, I am happy to drop it for now and reintroduce it later. But I
thought it best to get a working test included in Jessie, and hope you
agree with me there.
Here is the complete diff between version 0.15 already in testing and
0.18 in unstable:
diff --git a/debian/changelog b/debian/changelog
index 9c29464..c5e5209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+isenkram (0.18) unstable; urgency=low
+
+ * Adjust debian/tests/test-command-line to accept no firmware to
+ install as a OK result when running the test.
+
+ -- Petter Reinholdtsen <pere@debian.org> Wed, 12 Nov 2014 10:34:56 +0100
+
+isenkram (0.17) unstable; urgency=low
+
+ * Update generated firmware lists (Closes: #769230).
+ * Change debian/tests/test-command-line to ignore errors from lspci
+ and lsusb, as their output is only for debugging purposes and not
+ really testing isenkram.
+
+ -- Petter Reinholdtsen <pere@debian.org> Thu, 06 Nov 2014 07:41:59 +0100
+
+isenkram (0.16) unstable; urgency=low
+
+ * Change debian/tests/test-command-line to send errors from lspci and
+ lsusb to stdout to avoid ci.debian.net count missing USB or PCI
+ devices as a failure.
+
+ -- Petter Reinholdtsen <pere@debian.org> Tue, 28 Oct 2014 19:34:35 +0100
+
isenkram (0.15) unstable; urgency=low
* Fix typo in the task description, to make the firmware task get
diff --git a/debian/tests/test-command-line b/debian/tests/test-command-line
index a810678..e673c58 100755
--- a/debian/tests/test-command-line
+++ b/debian/tests/test-command-line
@@ -12,10 +12,14 @@ at_exit() {
trap at_exit INT TERM EXIT
echo "info: PCI devices"
-lspci -nn
+lspci -nn 2>&1 || true
echo "info: USB devices"
-lsusb
+lsusb 2>&1 || true
echo "info: Running isenkram-lookup"
isenkram-lookup 2>&1
echo "info: Running isenkram-autoinstall-firmware"
-isenkram-autoinstall-firmware 2>&1
+if isenkram-autoinstall-firmware 2>&1 ; then
+ :
+else
+ echo "info: isenkram-autoinstall-firmware exited with error code $! - no firmware to install?"
+fi
diff --git a/generated/Fw-Contents-amd64-jessie-non-free b/generated/Fw-Contents-amd64-jessie-non-free
index cee69a3..a071738 100644
--- a/generated/Fw-Contents-amd64-jessie-non-free
+++ b/generated/Fw-Contents-amd64-jessie-non-free
@@ -184,12 +184,13 @@ lib/firmware/intel-ucode/06-2d-06 non-free/admin/intel-mic
lib/firmware/intel-ucode/06-2d-07 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-2f-02 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3a-09 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-3c-03 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3c-03.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-04 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-06 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-07 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-45-01 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-46-01 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3f-02.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-45-01.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-46-01.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-03-04 non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-04-01 non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-04-03 non-free/admin/intel-microcode
diff --git a/generated/Fw-Contents-amd64-sid-non-free b/generated/Fw-Contents-amd64-sid-non-free
index cee69a3..a071738 100644
--- a/generated/Fw-Contents-amd64-sid-non-free
+++ b/generated/Fw-Contents-amd64-sid-non-free
@@ -184,12 +184,13 @@ lib/firmware/intel-ucode/06-2d-06 non-free/admin/intel-mic
lib/firmware/intel-ucode/06-2d-07 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-2f-02 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3a-09 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-3c-03 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3c-03.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-04 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-06 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-07 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-45-01 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-46-01 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3f-02.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-45-01.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-46-01.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-03-04 non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-04-01 non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-04-03 non-free/admin/intel-microcode
diff --git a/generated/Fw-Contents-i386-jessie-non-free b/generated/Fw-Contents-i386-jessie-non-free
index 20d3694..9bc0659 100644
--- a/generated/Fw-Contents-i386-jessie-non-free
+++ b/generated/Fw-Contents-i386-jessie-non-free
@@ -221,12 +221,13 @@ lib/firmware/intel-ucode/06-2d-06 non-free/admin/intel-mic
lib/firmware/intel-ucode/06-2d-07 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-2f-02 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3a-09 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-3c-03 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3c-03.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-04 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-06 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-07 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-45-01 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-46-01 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3f-02.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-45-01.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-46-01.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-00-07 non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-00-0a non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-01-01 non-free/admin/intel-microcode
diff --git a/generated/Fw-Contents-i386-sid-non-free b/generated/Fw-Contents-i386-sid-non-free
index 20d3694..9bc0659 100644
--- a/generated/Fw-Contents-i386-sid-non-free
+++ b/generated/Fw-Contents-i386-sid-non-free
@@ -221,12 +221,13 @@ lib/firmware/intel-ucode/06-2d-06 non-free/admin/intel-mic
lib/firmware/intel-ucode/06-2d-07 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-2f-02 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3a-09 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-3c-03 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3c-03.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-04 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-06 non-free/admin/intel-microcode
lib/firmware/intel-ucode/06-3e-07 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-45-01 non-free/admin/intel-microcode
-lib/firmware/intel-ucode/06-46-01 non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-3f-02.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-45-01.initramfs non-free/admin/intel-microcode
+lib/firmware/intel-ucode/06-46-01.initramfs non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-00-07 non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-00-0a non-free/admin/intel-microcode
lib/firmware/intel-ucode/0f-01-01 non-free/admin/intel-microcode
--
Happy hacking
Petter Reinholdtsen
Reply to: