X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id B5C035C4ED8 for ; Wed, 28 Jun 2017 06:41:41 +0000 (GMT) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id DB72340060 for ; Wed, 28 Jun 2017 08:41:39 +0200 (CEST) Received: from localhost.localdomain (euk-gateway.cs.uni-magdeburg.de [141.44.25.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 1D20A4005F; Wed, 28 Jun 2017 08:41:39 +0200 (CEST) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [alpine-aports] [PATCH] main/syslinux: Changed update-extlinux to detect intel-ucode Date: Wed, 28 Jun 2017 08:41:28 +0200 Message-Id: <20170628064128.2737-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.13.1 X-PMX-Version: 6.3.3.2656215, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.6.28.63616, AntiVirus-Engine: 5.38.0, AntiVirus-Data: 2017.6.27.5380001 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HTTPS_URI 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NO_WWW 0, __URI_NS , __URI_WITHOUT_PATH 0, __URI_WITH_PATH 0' X-Spam-Score: Gauge=IIIIIIII X-PMX-consideredAsSpam: no X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: If `/boot/intel-ucode.img` is present, update-extlinux will add it as (first) INITRD. This way the microcode update in package non-free/intel-ucode will be automatically loaded, if installed. This package fixes, among other processor bugs, the hyper-threading bug in Intel Skylake and Kaby Lake processers currently in the news [1]. More details here [2] and here [3]. [1] https://lists.debian.org/debian-devel/2017/06/msg00308.html [2] https://wiki.archlinux.org/index.php/Microcode#Syslinux [3] https://wiki.gentoo.org/wiki/Intel_microcode --- main/syslinux/APKBUILD | 4 ++-- main/syslinux/update-extlinux | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index 94334a5ade..d8f380492e 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=syslinux pkgver=6.04_pre1 -pkgrel=1 +pkgrel=2 _ver=${pkgver/_/-} pkgdesc="Boot loader for the Linux operating system" url="http://syslinux.org" @@ -57,4 +57,4 @@ package() { sha512sums="7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 syslinux-6.04-pre1.tar.xz c3ff809f9cd60aa8a837d9508e6fcd08204b03cd8a9df86ab42fc6a8fe68784416b359b46378fb0a8f4163bbcbe444957e0e5751c30ff4631d4677eaa94874f4 update-extlinux.conf -6b90164c5669744d1c3ba379d3d919bd16dfccb87e04ed5dcb6c324617fa0186840b359f5bb2d8515da3b26077b585050812755eb4e0b36e0e646dc7bcf024d2 update-extlinux" +5b76e00b06f2f21732858f48beb98ea4e6f04c0ec6e4f12092bc7c574bef04b5e01f595f3e9cb710935736fb419a8d2805d7d0d8695ef1b4179c2196f258a3f5 update-extlinux" diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux index 3ee258cd06..63c3fda27a 100755 --- a/main/syslinux/update-extlinux +++ b/main/syslinux/update-extlinux @@ -167,7 +167,18 @@ for kernel in $(find /boot -name "vmlinuz*" -type f); do echo " LINUX $(basename $kernel)" >> $conf.new if [ -f "/boot/initramfs-$tag" ]; then everbose "Found initramfs: /boot/initramfs-$tag" - echo " INITRD initramfs-$tag" >> $conf.new + initrd="initramfs-$tag" + if [ -f "/boot/intel-ucode.img" ]; then + everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img" + initrd="intel-ucode.img,${initrd}" + fi + echo " INITRD ${initrd}" >> $conf.new + else + if [ -f "/boot/intel-ucode.img" ]; then + everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img" + initrd="intel-ucode.img${initrd}" + echo " INITRD intel-ucode.img" >> $conf.new + fi fi echo " APPEND root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts" >> $conf.new echo "" >> $conf.new -- 2.13.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---