Source: intel-microcode
Version: 3.20231114.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Please find a patch attached to install aliased files into /usr,
for the currently ongoing UsrMerge effort [1].
It has been build-tested and checked by dumat.
The patch also adds a superficial autopkgtest, testing the microcode
ends up in the initramfs.
Please review it and upload to unstable during the trixie cycle,
preferably before the time_t-64bit transition.
Note: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.
If your package will otherwise rename/split/move its binaries
(packages) during trixie, please then upload to experimental and get
in touch with the UsrMerge driver, please see the wiki [1].
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru intel-microcode-3.20231114.1/debian/changelog intel-microcode-3.20231114.1+nmu1/debian/changelog
--- intel-microcode-3.20231114.1/debian/changelog 2023-11-16 12:09:43.000000000 +0100
+++ intel-microcode-3.20231114.1+nmu1/debian/changelog 2024-01-07 12:26:09.000000000 +0100
@@ -1,3 +1,11 @@
+intel-microcode (3.20231114.1+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install aliased files into /usr (DEP17 M2) (Closes: #-1)
+ * Add superficial autopkgtest for initramfs hook.
+
+ -- Chris Hofstaedtler <z...@debian.org> Sun, 07 Jan 2024 12:26:09 +0100
+
intel-microcode (3.20231114.1) unstable; urgency=medium
* New upstream microcode datafile 20231114 (closes: #1055962)
diff -Nru intel-microcode-3.20231114.1/debian/initramfs.hook intel-microcode-3.20231114.1+nmu1/debian/initramfs.hook
--- intel-microcode-3.20231114.1/debian/initramfs.hook 2023-11-16 12:08:54.000000000 +0100
+++ intel-microcode-3.20231114.1+nmu1/debian/initramfs.hook 2024-01-07 12:25:28.000000000 +0100
@@ -45,7 +45,7 @@
IUCODE_TOOL=/usr/sbin/iucode_tool
fi
-IUCODE_FW_DIR=/lib/firmware/intel-ucode
+IUCODE_FW_DIR=/usr/lib/firmware/intel-ucode
if [ "$MODULES" = "most" ]; then
IUCODE_TOOL_INITRAMFS=early
IUCODE_TOOL_SCANCPUS=no
diff -Nru intel-microcode-3.20231114.1/debian/intel-microcode.dirs intel-microcode-3.20231114.1+nmu1/debian/intel-microcode.dirs
--- intel-microcode-3.20231114.1/debian/intel-microcode.dirs 2023-11-16 12:07:09.000000000 +0100
+++ intel-microcode-3.20231114.1+nmu1/debian/intel-microcode.dirs 2024-01-07 12:24:23.000000000 +0100
@@ -1,3 +1,3 @@
-lib/firmware/intel-ucode
+usr/lib/firmware/intel-ucode
etc/default
etc/modprobe.d
diff -Nru intel-microcode-3.20231114.1/debian/rules intel-microcode-3.20231114.1+nmu1/debian/rules
--- intel-microcode-3.20231114.1/debian/rules 2023-11-16 12:07:09.000000000 +0100
+++ intel-microcode-3.20231114.1+nmu1/debian/rules 2024-01-07 12:26:03.000000000 +0100
@@ -32,13 +32,13 @@
dh_install
# split microcode pack
- $(IUCODE_TOOL) -q --write-firmware="$(PKGDIR)/lib/firmware/intel-ucode" $(IUCODE_FILE)
+ $(IUCODE_TOOL) -q --write-firmware="$(PKGDIR)/usr/lib/firmware/intel-ucode" $(IUCODE_FILE)
# apply best-effort blacklist
if [ -r debian/ucode-blacklist.txt ] ; then \
cat debian/ucode-blacklist.txt | while read -r fn crap ; do \
- if [ -r "$(PKGDIR)/lib/firmware/intel-ucode/$${fn}" ] ; then \
- mv "$(PKGDIR)/lib/firmware/intel-ucode/$${fn}" "$(PKGDIR)/lib/firmware/intel-ucode/$${fn}.initramfs" ;\
+ if [ -r "$(PKGDIR)/usr/lib/firmware/intel-ucode/$${fn}" ] ; then \
+ mv "$(PKGDIR)/usr/lib/firmware/intel-ucode/$${fn}" "$(PKGDIR)/usr/lib/firmware/intel-ucode/$${fn}.initramfs" ;\
echo "Renaming blacklisted microcode $${fn}" ; \
fi ; \
done ; \
diff -Nru intel-microcode-3.20231114.1/debian/tests/control intel-microcode-3.20231114.1+nmu1/debian/tests/control
--- intel-microcode-3.20231114.1/debian/tests/control 1970-01-01 01:00:00.000000000 +0100
+++ intel-microcode-3.20231114.1+nmu1/debian/tests/control 2024-01-07 12:26:09.000000000 +0100
@@ -0,0 +1,7 @@
+Tests: initramfs
+Architecture: amd64
+Depends:
+ @,
+ linux-image-amd64,
+ initramfs-tools,
+Restrictions: needs-root, allow-stderr, superficial
diff -Nru intel-microcode-3.20231114.1/debian/tests/initramfs intel-microcode-3.20231114.1+nmu1/debian/tests/initramfs
--- intel-microcode-3.20231114.1/debian/tests/initramfs 1970-01-01 01:00:00.000000000 +0100
+++ intel-microcode-3.20231114.1+nmu1/debian/tests/initramfs 2024-01-07 12:26:09.000000000 +0100
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -ex -o pipefail
+
+update-initramfs -kall -u
+INITRDS=(/boot/initrd.img-*)
+
+unmkinitramfs "${INITRDS[0]}" initramfs/
+find initramfs/
+
+test -e initramfs/early/kernel/x86/microcode/GenuineIntel.bin
+echo '# everything seems ok'
+
