diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-17 10:49:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-17 10:49:18 +0000 |
| commit | 19e444aab0893f08ded168153ae10a96ede47d1c (patch) | |
| tree | 1bf7cc1dac509c540b3fac39d2b4bb77b60b9851 /debian | |
| parent | Merging upstream version 3.20240531.1+nmu1. (diff) | |
| download | intel-microcode-19e444aab0893f08ded168153ae10a96ede47d1c.tar.xz intel-microcode-19e444aab0893f08ded168153ae10a96ede47d1c.zip | |
Merging debian version 3.20240531.1+nmu1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/initramfs.hook | 2 | ||||
| -rw-r--r-- | debian/intel-microcode.dirs | 2 | ||||
| -rwxr-xr-x | debian/rules | 6 | ||||
| -rw-r--r-- | debian/tests/control | 7 | ||||
| -rw-r--r-- | debian/tests/initramfs | 12 |
6 files changed, 32 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 64de299..99ed3e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +intel-microcode (3.20240531.1+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Install aliased files into /usr (DEP17 M2) (Closes: #1060200) + * Add superficial autopkgtest for initramfs hook. + + -- Chris Hofstaedtler <zeha@debian.org> Mon, 03 Jun 2024 22:45:50 +0200 + intel-microcode (3.20240531.1-0.0~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/initramfs.hook b/debian/initramfs.hook index a464d09..45812b0 100755 --- a/debian/initramfs.hook +++ b/debian/initramfs.hook @@ -45,7 +45,7 @@ if [ -z "${IUCODE_TOOL}" ] && [ -x /usr/sbin/iucode_tool ] ; then 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 --git a/debian/intel-microcode.dirs b/debian/intel-microcode.dirs index b0a2588..3738717 100644 --- a/debian/intel-microcode.dirs +++ b/debian/intel-microcode.dirs @@ -1,3 +1,3 @@ -lib/firmware/intel-ucode +usr/lib/firmware/intel-ucode etc/default etc/modprobe.d diff --git a/debian/rules b/debian/rules index eac0d2e..97c06a5 100755 --- a/debian/rules +++ b/debian/rules @@ -32,13 +32,13 @@ override_dh_auto_install: 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 --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..a5d82d6 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,7 @@ +Tests: initramfs +Architecture: amd64 +Depends: + @, + linux-image-amd64, + initramfs-tools, +Restrictions: needs-root, allow-stderr, superficial diff --git a/debian/tests/initramfs b/debian/tests/initramfs new file mode 100644 index 0000000..2cd833c --- /dev/null +++ b/debian/tests/initramfs @@ -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' + |