From 52715491e540c296e5b5a1bd6a964c15bc7f246e Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Thu, 25 May 2017 16:21:46 -0500 Subject: [PATCH 1/2] grub2: updated to version 2.02 --- grub2/.md5sum | 5 ++-- grub2/.signature | 9 +++--- grub2/Pkgfile | 16 +++++----- grub2/grub2-intel-ucode.diff | 58 ++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 13 deletions(-) create mode 100644 grub2/grub2-intel-ucode.diff diff --git a/grub2/.md5sum b/grub2/.md5sum index 06b528a26..fb8bca08a 100644 --- a/grub2/.md5sum +++ b/grub2/.md5sum @@ -1,5 +1,6 @@ -ab399fc6f74a97d66ff77f04b743149c grub-2.02~beta3.tar.xz +8a4a2a95aac551fb0fba860ceabfa1d3 grub-2.02.tar.xz 8459e7425bf9eea9d482e53c5b5c91c9 grub.cfg.sample 3a03d3f53911ac1889e6e68c8429f700 grub2-00_header.diff 0d8c1aa18cbb52ac57c8414abb185e19 grub2-10_linux.diff -8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz +855f84c669927cfdce3489f83b8d6712 grub2-intel-ucode.diff +fc1de0fd5ce0f235906da98aefbd9517 unifont-9.0.06.pcf.gz diff --git a/grub2/.signature b/grub2/.signature index a7fc50a89..40e71a8c9 100644 --- a/grub2/.signature +++ b/grub2/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TORQrsGm37PfEV7WxdMkDPiIVXuudM7pWnjhuWgq/94MAauNuxE3jwOBwbAytC6lnGoHmqRig2qC5gD/cfOswo= -SHA256 (Pkgfile) = f8f4fa810e87362239d640a0c621c9c7ae7641e5d572401ce30c2c2e2137832e +RWSE3ohX2g5d/RVH55Gh/WLyiSXxHdepeduzOcX8eBMRarMSojPWLiWv349183iFAwsu5bL0EeNYEmJTMv+i1qFv1F8TVCMrVgA= +SHA256 (Pkgfile) = a8c813307d9cb5a75225c7418aa20f6ecf2117dad8c8cf8edf08026631af0b15 SHA256 (.footprint) = b592950a75c1fb931e49e42b9f2b27c5eb2e23d5c4a2c24d27a80d1ccdcac054 -SHA256 (grub-2.02~beta3.tar.xz) = 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 -SHA256 (unifont-5.1.20080820.pcf.gz) = 122b9c470f29b70223b0e07404a6dfa7f339fcfa6ae74c024f478945af7a9a63 +SHA256 (grub-2.02.tar.xz) = 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f +SHA256 (unifont-9.0.06.pcf.gz) = 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA256 (grub2-00_header.diff) = e4b30c60aa0fa37d48cad2c4e5a53278f1cd5f4ae2df075f55f7be5fa931f8a7 SHA256 (grub2-10_linux.diff) = 5621b312a199647909a09e94e710bb4fca1a2be687d61e2ce7a3cf529f09d1ef SHA256 (grub.cfg.sample) = c2e72228c1dd150f727e8d611d6f14956080ce078651b03eb14fcf65b0917dda +SHA256 (grub2-intel-ucode.diff) = c20d9f0d207e30c930815bee5b833757da771535ea13436dd94274360f601f0f diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 4c3766de6..792f98867 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -4,21 +4,23 @@ # Depends on: libdevmapper freetype name=grub2 -version=2.02-beta3 +version=2.02 release=1 -source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta3.tar.xz \ - http://unifoundry.com/unifont-5.1.20080820.pcf.gz \ - $name-00_header.diff $name-10_linux.diff grub.cfg.sample) +source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ + http://unifoundry.com/pub/unifont-9.0.06/font-builds/unifont-9.0.06.pcf.gz \ + $name-00_header.diff $name-10_linux.diff grub.cfg.sample \ + $name-intel-ucode.diff) build() { export CFLAGS="${CFLAGS} -Wno-error" - cd grub-2.02~beta3 + cd grub-$version # fix for glibc 'gets' removal sed -i -e '/gets is a/d' grub-core/gnulib/stdio.in.h patch -i $SRC/$name-00_header.diff util/grub.d/00_header.in patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in + patch -i $SRC/$name-intel-ucode.diff util/grub.d/10_linux.in ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -28,8 +30,8 @@ build() { make make DESTDIR=$PKG install rm -rf $PKG/usr/share/{info,locale,grub/themes} - gzip -d $SRC/unifont-5.1.20080820.pcf.gz + gzip -d $SRC/unifont-9.0.06.pcf.gz install -d $PKG/usr/lib/grub/fonts ./grub-mkfont -o $PKG/usr/lib/grub/fonts/unifont.pf2 \ - $SRC/unifont-5.1.20080820.pcf + $SRC/unifont-9.0.06.pcf } diff --git a/grub2/grub2-intel-ucode.diff b/grub2/grub2-intel-ucode.diff new file mode 100644 index 000000000..c66b0bf1b --- /dev/null +++ b/grub2/grub2-intel-ucode.diff @@ -0,0 +1,58 @@ +diff -urN grub-2.02.orig/util/grub.d/10_linux.in grub-2.02/util/grub.d/10_linux.in +--- grub-2.02.orig/util/grub.d/10_linux.in 2017-04-24 04:15:50.000000000 -0500 ++++ grub-2.02/util/grub.d/10_linux.in 2017-05-25 15:58:11.559658295 -0500 +@@ -135,11 +135,27 @@ + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. ++ if test -n "${intel_ucode}" ; then ++ message="$(gettext_printf "Loading intel microcode and initial ramdisk ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ initrd ${rel_dirname}/${intel_ucode} ${rel_dirname}/${initrd} ++EOF ++ else + message="$(gettext_printf "Loading initial ramdisk ...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + initrd ${rel_dirname}/${initrd} + EOF ++ fi ++ else ++ if test -n "${intel_ucode}" ; then ++ message="$(gettext_printf "Loading intel microcode ...")" ++ sed "s/^/$submenu_indentation/" << EOF ++ echo '$(echo "$message" | grub_quote)' ++ initrd ${rel_dirname}/${intel_ucode} ++EOF ++ fi + fi + sed "s/^/$submenu_indentation/" << EOF + } +@@ -203,6 +219,15 @@ + fi + done + ++ intel_ucode= ++ for i in "early-ucode.cpio" "early-ucode.cpio.gz" \ ++ "intel-ucode.img" "intel-ucode.img.gz"; do ++ if test -e "${dirname}/${i}" ; then ++ intel_ucode="$i" ++ break ++ fi ++ done ++ + config= + for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do + if test -e "${i}" ; then +@@ -216,6 +241,10 @@ + initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"` + fi + ++ if test -n "${intel_ucode}" ; then ++ gettext_printf "Found intel-ucode image: %s\n" "${dirname}/${intel_ucode}" >&2 ++ fi ++ + if test -n "${initrd}" ; then + gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 + elif test -z "${initramfs}" ; then From 1a26d32316c8635dcc6609238c0359f8aeae6274 Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Thu, 25 May 2017 16:22:17 -0500 Subject: [PATCH 2/2] grub2-efi: updated to version 2.02 --- grub2-efi/.md5sum | 2 +- grub2-efi/.signature | 6 +++--- grub2-efi/Pkgfile | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/grub2-efi/.md5sum b/grub2-efi/.md5sum index e38ae4f43..60bd99c4f 100644 --- a/grub2-efi/.md5sum +++ b/grub2-efi/.md5sum @@ -1 +1 @@ -ab399fc6f74a97d66ff77f04b743149c grub-2.02~beta3.tar.xz +8a4a2a95aac551fb0fba860ceabfa1d3 grub-2.02.tar.xz diff --git a/grub2-efi/.signature b/grub2-efi/.signature index 0e18f5d94..f5d5cc344 100644 --- a/grub2-efi/.signature +++ b/grub2-efi/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QnjGkOkjAmPlQXJpUionLaVF9xLwwQ8YkYJ3RYan+HRK3ymn1irT7aHMqBAhNkci3Dn6cutAjmlLGr6TC5RjAc= -SHA256 (Pkgfile) = 8ebc5426ff89f5c72ec18940b6c747fedcb7e6eb0fb645765a6177dc1514b593 +RWSE3ohX2g5d/YJmUPwai4w+Twi2eTcGTxxLuh6HExjesdh+URSxqlpP1xWSFwLQ9xl2NyRwC0LMrQZ4S8i+m0oMo7kxShoIMAw= +SHA256 (Pkgfile) = 4e628b4ad1739b28f0c0935d429bcac90557297cb222adb6ca4e3fcb762aad14 SHA256 (.footprint) = be3c0c176335de61fb03e01702968798c101216091640b618b61b467dcfd92d8 -SHA256 (grub-2.02~beta3.tar.xz) = 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 +SHA256 (grub-2.02.tar.xz) = 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f diff --git a/grub2-efi/Pkgfile b/grub2-efi/Pkgfile index 36138dac3..3190dfe71 100644 --- a/grub2-efi/Pkgfile +++ b/grub2-efi/Pkgfile @@ -4,15 +4,15 @@ # Depends on: grub2 name=grub2-efi -version=2.02-beta3 +version=2.02 release=1 -source=(http://alpha.gnu.org/gnu/grub/grub-2.02~beta3.tar.xz) +source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz) build() { export CFLAGS="${CFLAGS} -Wno-error" # fix for glibc 'gets' removal - sed -i -e '/gets is a/d' grub-2.02~beta3/grub-core/gnulib/stdio.in.h + sed -i -e '/gets is a/d' grub-$version/grub-core/gnulib/stdio.in.h MODLIST="boot chain configfile fat ext2 linux normal ntfs part_gpt part_msdos" @@ -20,7 +20,7 @@ build() { do mkdir $ARCH cd $ARCH - ../grub-2.02~beta3/configure --prefix=/usr \ + ../grub-$version/configure --prefix=/usr \ --with-platform=efi --target=$ARCH \ --program-prefix="" make