[arch-commits] Commit in grub/trunk (PKGBUILD grub.cfg grub.install)
Christian Hesse
eworm at archlinux.org
Fri Nov 23 21:08:42 UTC 2018
Date: Friday, November 23, 2018 @ 21:08:42
Author: eworm
Revision: 340356
upgpkg: grub 2:2.02-8
* update unifont
* stop packaging useless boot configuration
* minor cleanups
Modified:
grub/trunk/PKGBUILD
grub/trunk/grub.install
Deleted:
grub/trunk/grub.cfg
--------------+
PKGBUILD | 24 +++------
grub.cfg | 139 ---------------------------------------------------------
grub.install | 20 ++++----
3 files changed, 20 insertions(+), 163 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-23 20:51:08 UTC (rev 340355)
+++ PKGBUILD 2018-11-23 21:08:42 UTC (rev 340356)
@@ -11,7 +11,7 @@
_GRUB_EXTRAS_COMMIT="f2a079441939eee7251bf141986cdd78946e1d20"
-_UNIFONT_VER="10.0.06"
+_UNIFONT_VER="11.0.02"
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
@@ -19,16 +19,15 @@
[[ "${CARCH}" == "x86_64" ]] && _EMU_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EMU_ARCH="i386"
-pkgname="grub"
-pkgdesc="GNU GRand Unified Bootloader (2)"
+pkgname='grub'
+pkgdesc='GNU GRand Unified Bootloader (2)'
pkgver=2.02
-pkgrel=7
+pkgrel=8
epoch=2
-url="https://www.gnu.org/software/grub/"
+url='https://www.gnu.org/software/grub/'
arch=('x86_64')
license=('GPL3')
-backup=('boot/grub/grub.cfg'
- 'etc/default/grub'
+backup=('etc/default/grub'
'etc/grub.d/40_custom')
install="${pkgname}.install"
options=('!makeflags')
@@ -68,13 +67,12 @@
'0008-Fix-packed-not-aligned-error-on-GCC-8.patch'
'0009-xfs-Accept-filesystem-with-sparse-inodes.patch'
'0010-relocation.patch'
- 'grub.default'
- 'grub.cfg')
+ 'grub.default')
sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
'2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
- '0d81571fc519573057b7641d26a31ead55cc0b02a931589fb346a3a534c3dcc1'
+ 'a7ea9ca4f6dcb59377d978194835ede669457069256184f86d46ab5b863c56e6'
'SKIP'
'b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
@@ -84,8 +82,7 @@
'e84b8de569c7e6b73263758c35cf95c6516fde85d4ed451991427864f6a4e5a8'
'fcd5a626d4af33665d041ce42df813f1f198d8230ea186481b155a5b676f3b87'
'51562fa1016c54567dbf42a86c0cfc902372ab579bbee17879a81aff09b76b99'
- '74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82'
- 'c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad')
+ '74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82')
_configure_options=(
FREETYPE="pkg-config freetype2"
@@ -280,9 +277,6 @@
echo "Install /etc/default/grub (used by grub-mkconfig)..."
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
- echo "Install grub.cfg for backup array..."
- install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
}
_package_grub-efi() {
Deleted: grub.cfg
===================================================================
--- grub.cfg 2018-11-23 20:51:08 UTC (rev 340355)
+++ grub.cfg 2018-11-23 21:08:42 UTC (rev 340356)
@@ -1,139 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-insmod part_gpt
-insmod part_msdos
-if [ -s $prefix/grubenv ]; then
- load_env
-fi
-set default="0"
-
-if [ x"${feature_menuentry_id}" = xy ]; then
- menuentry_id_option="--id"
-else
- menuentry_id_option=""
-fi
-
-export menuentry_id_option
-
-if [ "${prev_saved_entry}" ]; then
- set saved_entry="${prev_saved_entry}"
- save_env saved_entry
- set prev_saved_entry=
- save_env prev_saved_entry
- set boot_once=true
-fi
-
-function savedefault {
- if [ -z "${boot_once}" ]; then
- saved_entry="${chosen}"
- save_env saved_entry
- fi
-}
-
-function load_video {
- if [ x$feature_all_video_module = xy ]; then
- insmod all_video
- else
- insmod efi_gop
- insmod efi_uga
- insmod ieee1275_fb
- insmod vbe
- insmod vga
- insmod video_bochs
- insmod video_cirrus
- fi
-}
-
-if [ x$feature_default_font_path = xy ] ; then
- font=unicode
-else
-insmod part_msdos
-insmod ext2
-set root='hd0,msdos5'
-if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
-else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
-fi
- font="/usr/share/grub/unicode.pf2"
-fi
-
-if loadfont $font ; then
- set gfxmode=auto
- load_video
- insmod gfxterm
- set locale_dir=$prefix/locale
- set lang=en_US
- insmod gettext
-fi
-terminal_input console
-terminal_output gfxterm
-set timeout=5
-### END /etc/grub.d/00_header ###
-
-### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Arch Linux, with Linux core repo kernel' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos5'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
- else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
- fi
- echo 'Loading Linux core repo kernel ...'
- linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw quiet
- echo 'Loading initial ramdisk ...'
- initrd /boot/initramfs-linux.img
-}
-menuentry 'Arch Linux, with Linux core repo kernel (Fallback initramfs)' --class arch --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos5'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
- else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
- fi
- echo 'Loading Linux core repo kernel ...'
- linux /boot/vmlinuz-linux root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 rw quiet
- echo 'Loading initial ramdisk ...'
- initrd /boot/initramfs-linux-fallback.img
-}
-
-### END /etc/grub.d/10_linux ###
-
-### BEGIN /etc/grub.d/20_linux_xen ###
-### END /etc/grub.d/20_linux_xen ###
-
-### BEGIN /etc/grub.d/20_memtest86+ ###
-### END /etc/grub.d/20_memtest86+ ###
-
-### BEGIN /etc/grub.d/30_os-prober ###
-### END /etc/grub.d/30_os-prober ###
-
-### BEGIN /etc/grub.d/40_custom ###
-# This file provides an easy way to add custom menu entries. Simply type the
-# menu entries you want to add after this comment. Be careful not to change
-# the 'exec tail' line above.
-### END /etc/grub.d/40_custom ###
-
-### BEGIN /etc/grub.d/41_custom ###
-if [ -f ${config_directory}/custom.cfg ]; then
- source ${config_directory}/custom.cfg
-elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then
- source $prefix/custom.cfg;
-fi
-### END /etc/grub.d/41_custom ###
Modified: grub.install
===================================================================
--- grub.install 2018-11-23 20:51:08 UTC (rev 340355)
+++ grub.install 2018-11-23 21:08:42 UTC (rev 340356)
@@ -1,15 +1,17 @@
-post_install() {
- if [ -f /boot/grub/grub.cfg.pacsave ]; then
- echo "Copying /boot/grub/grub.cfg.pacsave to /boot/grub/grub.cfg"
- install -D -m0644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
+#!/bin/sh
+
+post_upgrade() {
+ # We used to package /boot/grub/grub.cfg, but there is no reason to.
+ # Remove the file from package, but move real file back in place.
+ if [ ! -f /boot/grub/grub.cfg -a -f /boot/grub/grub.cfg.pacsave ]; then
+ mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
fi
+}
+post_install() {
cat << 'EOM'
-Generating grub.cfg.example config file...
-This may fail on some machines running a custom kernel.
+Generate your bootloader configuration with:
+ grub-mkconfig -o /boot/grub/grub.cfg
EOM
-
- grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null
- echo "done."
}
More information about the arch-commits
mailing list