[arch-commits] Commit in grub/repos/testing-x86_64 (10 files)
Christian Hesse
eworm at archlinux.org
Mon Apr 26 18:22:46 UTC 2021
Date: Monday, April 26, 2021 @ 18:22:46
Author: eworm
Revision: 413909
archrelease: copy trunk to testing-x86_64
Added:
grub/repos/testing-x86_64/0001-00_header-add-GRUB_COLOR_-variables.patch
(from rev 413908, grub/trunk/0001-00_header-add-GRUB_COLOR_-variables.patch)
grub/repos/testing-x86_64/0002-10_linux-detect-archlinux-initramfs.patch
(from rev 413908, grub/trunk/0002-10_linux-detect-archlinux-initramfs.patch)
grub/repos/testing-x86_64/PKGBUILD
(from rev 413908, grub/trunk/PKGBUILD)
grub/repos/testing-x86_64/grub.default
(from rev 413908, grub/trunk/grub.default)
grub/repos/testing-x86_64/grub.install
(from rev 413908, grub/trunk/grub.install)
Deleted:
grub/repos/testing-x86_64/0001-00_header-add-GRUB_COLOR_-variables.patch
grub/repos/testing-x86_64/0002-10_linux-detect-archlinux-initramfs.patch
grub/repos/testing-x86_64/PKGBUILD
grub/repos/testing-x86_64/grub.default
grub/repos/testing-x86_64/grub.install
------------------------------------------------+
0001-00_header-add-GRUB_COLOR_-variables.patch | 82 +--
0002-10_linux-detect-archlinux-initramfs.patch | 111 ++--
PKGBUILD | 620 +++++++++++------------
grub.default | 114 ++--
grub.install | 45 +
5 files changed, 493 insertions(+), 479 deletions(-)
Deleted: 0001-00_header-add-GRUB_COLOR_-variables.patch
===================================================================
--- 0001-00_header-add-GRUB_COLOR_-variables.patch 2021-04-26 18:22:41 UTC (rev 413908)
+++ 0001-00_header-add-GRUB_COLOR_-variables.patch 2021-04-26 18:22:46 UTC (rev 413909)
@@ -1,41 +0,0 @@
-From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Wed, 10 Mar 2021 18:42:25 +0100
-Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
----
- util/grub-mkconfig.in | 2 ++
- util/grub.d/00_header.in | 8 ++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index f8cbb8d7a..1189d95f9 100644
---- a/util/grub-mkconfig.in
-+++ b/util/grub-mkconfig.in
-@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
- GRUB_BACKGROUND \
- GRUB_THEME \
- GRUB_GFXPAYLOAD_LINUX \
-+ GRUB_COLOR_NORMAL \
-+ GRUB_COLOR_HIGHLIGHT \
- GRUB_INIT_TUNE \
- GRUB_SAVEDEFAULT \
- GRUB_ENABLE_CRYPTODISK \
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a90233e..c5955df00 100644
---- a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -125,6 +125,14 @@ cat <<EOF
-
- EOF
-
-+if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
-+ cat << EOF
-+set menu_color_normal=$GRUB_COLOR_NORMAL
-+set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
-+
-+EOF
-+fi
-+
- serial=0;
- gfxterm=0;
- for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
Copied: grub/repos/testing-x86_64/0001-00_header-add-GRUB_COLOR_-variables.patch (from rev 413908, grub/trunk/0001-00_header-add-GRUB_COLOR_-variables.patch)
===================================================================
--- 0001-00_header-add-GRUB_COLOR_-variables.patch (rev 0)
+++ 0001-00_header-add-GRUB_COLOR_-variables.patch 2021-04-26 18:22:46 UTC (rev 413909)
@@ -0,0 +1,41 @@
+From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Wed, 10 Mar 2021 18:42:25 +0100
+Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
+---
+ util/grub-mkconfig.in | 2 ++
+ util/grub.d/00_header.in | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index f8cbb8d7a..1189d95f9 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
+ GRUB_BACKGROUND \
+ GRUB_THEME \
+ GRUB_GFXPAYLOAD_LINUX \
++ GRUB_COLOR_NORMAL \
++ GRUB_COLOR_HIGHLIGHT \
+ GRUB_INIT_TUNE \
+ GRUB_SAVEDEFAULT \
+ GRUB_ENABLE_CRYPTODISK \
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 93a90233e..c5955df00 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -125,6 +125,14 @@ cat <<EOF
+
+ EOF
+
++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then
++ cat << EOF
++set menu_color_normal=$GRUB_COLOR_NORMAL
++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT
++
++EOF
++fi
++
+ serial=0;
+ gfxterm=0;
+ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
Deleted: 0002-10_linux-detect-archlinux-initramfs.patch
===================================================================
--- 0002-10_linux-detect-archlinux-initramfs.patch 2021-04-26 18:22:41 UTC (rev 413908)
+++ 0002-10_linux-detect-archlinux-initramfs.patch 2021-04-26 18:22:46 UTC (rev 413909)
@@ -1,49 +0,0 @@
-From 058d08a025f9a6ec77d5ddd1fc62c7bd6abe1a52 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Wed, 10 Mar 2021 18:40:00 +0100
-Subject: [PATCH] 10_linux: detect archlinux initramfs
----
- util/grub.d/10_linux.in | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index e8b01c0d0..e703dcdb0 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -93,6 +93,8 @@ linux_entry ()
- case $type in
- recovery)
- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
-+ fallback)
-+ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
- *)
- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
- esac
-@@ -198,7 +200,7 @@ while [ "x$list" != "x" ] ; do
- basename=`basename $linux`
- dirname=`dirname $linux`
- rel_dirname=`make_system_path_relative_to_its_root $dirname`
-- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
-+ version=`echo $basename | sed -e "s,vmlinuz-,,g"`
- alt_version=`echo $version | sed -e "s,\.old$,,g"`
- linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-
-@@ -285,6 +287,18 @@ while [ "x$list" != "x" ] ; do
-
- linux_entry "${OS}" "${version}" advanced \
- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+
-+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
-+ initrd="initramfs-${version}-fallback.img"
-+
-+ if test -n "${initrd}" ; then
-+ gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
-+ fi
-+
-+ linux_entry "${OS}" "${version}" fallback \
-+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+ fi
-+
- if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
- linux_entry "${OS}" "${version}" recovery \
- "single ${GRUB_CMDLINE_LINUX}"
Copied: grub/repos/testing-x86_64/0002-10_linux-detect-archlinux-initramfs.patch (from rev 413908, grub/trunk/0002-10_linux-detect-archlinux-initramfs.patch)
===================================================================
--- 0002-10_linux-detect-archlinux-initramfs.patch (rev 0)
+++ 0002-10_linux-detect-archlinux-initramfs.patch 2021-04-26 18:22:46 UTC (rev 413909)
@@ -0,0 +1,62 @@
+From dbc289f59a2b204af19ef7212f3b6b07d3060452 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Mon, 26 Apr 2021 11:10:01 +0200
+Subject: [PATCH 1/1] 10_linux: detect archlinux initramfs
+---
+ util/grub.d/10_linux.in | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index e8b01c0d0..9b60af944 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -91,6 +91,10 @@ linux_entry ()
+ fi
+ if [ x$type != xsimple ] ; then
+ case $type in
++ booster)
++ title="$(gettext_printf "%s, with Linux %s (booster initramfs)" "${os}" "${version}")" ;;
++ fallback)
++ title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
+ recovery)
+ title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
+ *)
+@@ -198,7 +202,7 @@ while [ "x$list" != "x" ] ; do
+ basename=`basename $linux`
+ dirname=`dirname $linux`
+ rel_dirname=`make_system_path_relative_to_its_root $dirname`
+- version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
++ version=`echo $basename | sed -e "s,vmlinuz-,,g"`
+ alt_version=`echo $version | sed -e "s,\.old$,,g"`
+ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+@@ -285,6 +289,29 @@ while [ "x$list" != "x" ] ; do
+
+ linux_entry "${OS}" "${version}" advanced \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++
++ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
++ initrd="${initrd_early} initramfs-${version}-fallback.img"
++
++ if test -n "${initrd}" ; then
++ gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
++ fi
++
++ linux_entry "${OS}" "${version}" fallback \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ fi
++
++ if test -e "${dirname}/booster-${version}.img" ; then
++ initrd="${initrd_early} booster-${version}.img"
++
++ if test -n "${initrd}" ; then
++ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
++ fi
++
++ linux_entry "${OS}" "${version}" booster \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ fi
++
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" recovery \
+ "single ${GRUB_CMDLINE_LINUX}"
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-26 18:22:41 UTC (rev 413908)
+++ PKGBUILD 2021-04-26 18:22:46 UTC (rev 413909)
@@ -1,315 +0,0 @@
-# Maintainer : Christian Hesse <mail at eworm.de>
-# Maintainer : Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-
-## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
-_IA32_EFI_IN_ARCH_X64="1"
-
-## "1" to enable EMU build, "0" to disable
-_GRUB_EMU_BUILD="0"
-
-_GRUB_EXTRAS_COMMIT='8a245d5c1800627af4cefa99162a89c7a46d8842'
-_GNULIB_COMMIT='be584c56eb1311606e5ea1a36363b97bddb6eed3'
-_UNIFONT_VER='13.0.06'
-
-[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64'
-[[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386'
-
-[[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64'
-[[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386'
-
-pkgname='grub'
-pkgdesc='GNU GRand Unified Bootloader (2)'
-epoch=2
-_tag='7d42d00f0e314f1535752bd5126a6b8d1be3352b' # git rev-parse grub-${_pkgver}
-_pkgver=2.06-rc1
-pkgver=${_pkgver/-/}
-pkgrel=1
-url='https://www.gnu.org/software/grub/'
-arch=('x86_64')
-license=('GPL3')
-backup=('etc/default/grub'
- 'etc/grub.d/40_custom')
-install="${pkgname}.install"
-options=('!makeflags')
-
-conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
-replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
-provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
-
-makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
- 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2')
-depends=('sh' 'xz' 'gettext' 'device-mapper')
-optdepends=('freetype2: For grub-mkfont usage'
- 'fuse2: For grub-mount usage'
- 'dosfstools: For grub-mkrescue FAT FS and EFI support'
- 'efibootmgr: For grub-install EFI support'
- 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
- 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
- 'mtools: For grub-mkrescue FAT FS support')
-
-if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
- makedepends+=('libusbx' 'sdl')
- optdepends+=('libusbx: For grub-emu USB support'
- 'sdl: For grub-emu SDL support')
-fi
-
-validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder at gmail.com>
- 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper at net-space.pl>
- '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry at unifoundry.com>
-
-source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
- "git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
- "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}"
- "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
- '0001-00_header-add-GRUB_COLOR_-variables.patch'
- '0002-10_linux-detect-archlinux-initramfs.patch'
- 'grub.default')
-
-sha256sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
- 'SKIP'
- '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
- '580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5'
- '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
-
-_backports=(
-)
-
-_configure_options=(
- FREETYPE="pkg-config freetype2"
- BUILD_FREETYPE="pkg-config freetype2"
- --enable-mm-debug
- --enable-nls
- --enable-device-mapper
- --enable-cache-stats
- --enable-grub-mkfont
- --enable-grub-mount
- --prefix="/usr"
- --bindir="/usr/bin"
- --sbindir="/usr/bin"
- --mandir="/usr/share/man"
- --infodir="/usr/share/info"
- --datarootdir="/usr/share"
- --sysconfdir="/etc"
- --program-prefix=""
- --with-bootdir="/boot"
- --with-grubdir="grub"
- --disable-silent-rules
- --disable-werror
-)
-
-prepare() {
- cd "${srcdir}/grub/"
-
- echo "Apply backports..."
- local _c
- for _c in "${_backports[@]}"; do
- git log --oneline -1 "${_c}"
- git cherry-pick -n "${_c}"
- done
-
- echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
- ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
- patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
-
- echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
- patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
-
- echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
- sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
-
- echo "Fix mkinitcpio 'rw' FS#36275..."
- sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
-
- echo "Fix OS naming FS#33393..."
- sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
-
- echo "Pull in latest language files..."
- ./linguas.sh
-
- echo "Avoid problem with unifont during compile of grub..."
- # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847
- gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf"
-
- echo "Run bootstrap..."
- ./bootstrap \
- --gnulib-srcdir="${srcdir}/gnulib/" \
- --no-git
-
- echo "Make translations reproducible..."
- sed -i '1i /^PO-Revision-Date:/ d' po/*.sed
-}
-
-_build_grub-common_and_bios() {
- echo "Set ARCH dependent variables for bios build..."
- if [[ "${CARCH}" == 'x86_64' ]]; then
- _EFIEMU="--enable-efiemu"
- else
- _EFIEMU="--disable-efiemu"
- fi
-
- echo "Copy the source for building the bios part..."
- cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/"
- cd "${srcdir}/grub-bios/"
-
- echo "Add the grub-extra sources for bios build..."
- install -d "${srcdir}/grub-bios/grub-extras"
- cp -r "${srcdir}/grub-extras/915resolution" \
- "${srcdir}/grub-bios/grub-extras/915resolution"
- export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/"
-
- echo "Unset all compiler FLAGS for bios build..."
- unset CFLAGS
- unset CPPFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- echo "Run ./configure for bios build..."
- ./configure \
- --with-platform="pc" \
- --target="i386" \
- "${_EFIEMU}" \
- --enable-boot-time \
- "${_configure_options[@]}"
-
- if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
- echo "Make info pages reproducible..."
- touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi')
- fi
-
- echo "Run make for bios build..."
- make
-}
-
-_build_grub-efi() {
- echo "Copy the source for building the ${_EFI_ARCH} efi part..."
- cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/"
- cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
-
- echo "Unset all compiler FLAGS for ${_EFI_ARCH} efi build..."
- unset CFLAGS
- unset CPPFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- echo "Run ./configure for ${_EFI_ARCH} efi build..."
- ./configure \
- --with-platform="efi" \
- --target="${_EFI_ARCH}" \
- --disable-efiemu \
- --enable-boot-time \
- "${_configure_options[@]}"
-
- echo "Run make for ${_EFI_ARCH} efi build..."
- make
-}
-
-_build_grub-emu() {
- echo "Copy the source for building the emu part..."
- cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/"
- cd "${srcdir}/grub-emu/"
-
- echo "Unset all compiler FLAGS for emu build..."
- unset CFLAGS
- unset CPPFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- echo "Run ./configure for emu build..."
- ./configure \
- --with-platform="emu" \
- --target="${_EMU_ARCH}" \
- --enable-grub-emu-usb=no \
- --enable-grub-emu-sdl=no \
- --disable-grub-emu-pci \
- "${_configure_options[@]}"
-
- echo "Run make for emu build..."
- make
-}
-
-build() {
- cd "${srcdir}/grub/"
-
- echo "Build grub bios stuff..."
- _build_grub-common_and_bios
-
- echo "Build grub ${_EFI_ARCH} efi stuff..."
- _build_grub-efi
-
- if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
- echo "Build grub i386 efi stuff..."
- _EFI_ARCH="i386" _build_grub-efi
- fi
-
- if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
- echo "Build grub emu stuff..."
- _build_grub-emu
- fi
-}
-
-_package_grub-common_and_bios() {
- cd "${srcdir}/grub-bios/"
-
- echo "Run make install for bios build..."
- make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
- echo "Remove gdb debugging related files for bios build..."
- rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
- rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
- rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
-
- echo "Install /etc/default/grub (used by grub-mkconfig)..."
- install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-}
-
-_package_grub-efi() {
- cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
-
- echo "Run make install for ${_EFI_ARCH} efi build..."
- make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
- echo "Remove gdb debugging related files for ${_EFI_ARCH} efi build..."
- rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
- rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
- rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
-}
-
-_package_grub-emu() {
- cd "${srcdir}/grub-emu/"
-
- echo "Run make install for emu build..."
- make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
-
- echo "Remove gdb debugging related files for emu build..."
- rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true
- rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true
- rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true
-}
-
-package() {
- cd "${srcdir}/grub/"
-
- echo "Package grub ${_EFI_ARCH} efi stuff..."
- _package_grub-efi
-
- if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
- echo "Package grub i386 efi stuff..."
- _EFI_ARCH="i386" _package_grub-efi
- fi
-
- if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
- echo "Package grub emu stuff..."
- _package_grub-emu
- fi
-
- echo "Package grub bios stuff..."
- _package_grub-common_and_bios
-}
Copied: grub/repos/testing-x86_64/PKGBUILD (from rev 413908, grub/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-26 18:22:46 UTC (rev 413909)
@@ -0,0 +1,305 @@
+# Maintainer : Christian Hesse <mail at eworm.de>
+# Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+
+## "1" to enable IA32-EFI build in Arch x86_64, "0" to disable
+_IA32_EFI_IN_ARCH_X64="1"
+
+## "1" to enable EMU build, "0" to disable
+_GRUB_EMU_BUILD="0"
+
+[[ "${CARCH}" == 'x86_64' ]] && _EFI_ARCH='x86_64'
+[[ "${CARCH}" == 'i686' ]] && _EFI_ARCH='i386'
+
+[[ "${CARCH}" == 'x86_64' ]] && _EMU_ARCH='x86_64'
+[[ "${CARCH}" == 'i686' ]] && _EMU_ARCH='i386'
+
+pkgname='grub'
+pkgdesc='GNU GRand Unified Bootloader (2)'
+epoch=2
+_tag='7d42d00f0e314f1535752bd5126a6b8d1be3352b' # git rev-parse grub-${_pkgver}
+_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
+_unifont_ver='13.0.06'
+_pkgver=2.06-rc1
+pkgver=${_pkgver/-/}
+pkgrel=2
+url='https://www.gnu.org/software/grub/'
+arch=('x86_64')
+license=('GPL3')
+backup=('etc/default/grub'
+ 'etc/grub.d/40_custom')
+install="${pkgname}.install"
+options=('!makeflags')
+
+conflicts=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
+replaces=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
+provides=('grub-common' 'grub-bios' 'grub-emu' "grub-efi-${_EFI_ARCH}")
+
+makedepends=('git' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' 'python' 'autogen'
+ 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse2')
+depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: For grub-mkfont usage'
+ 'fuse2: For grub-mount usage'
+ 'dosfstools: For grub-mkrescue FAT FS and EFI support'
+ 'efibootmgr: For grub-install EFI support'
+ 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
+ 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+ 'mtools: For grub-mkrescue FAT FS support')
+
+if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
+ makedepends+=('libusbx' 'sdl')
+ optdepends+=('libusbx: For grub-emu USB support'
+ 'sdl: For grub-emu SDL support')
+fi
+
+validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder at gmail.com>
+ 'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper at net-space.pl>
+ '95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry at unifoundry.com>
+
+source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
+ "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
+ "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
+ '0001-00_header-add-GRUB_COLOR_-variables.patch'
+ '0002-10_linux-detect-archlinux-initramfs.patch'
+ 'grub.default')
+
+sha256sums=('SKIP'
+ 'SKIP'
+ 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
+ 'SKIP'
+ '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
+ '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d'
+ '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
+
+_backports=(
+)
+
+_configure_options=(
+ FREETYPE="pkg-config freetype2"
+ BUILD_FREETYPE="pkg-config freetype2"
+ --enable-mm-debug
+ --enable-nls
+ --enable-device-mapper
+ --enable-cache-stats
+ --enable-grub-mkfont
+ --enable-grub-mount
+ --prefix="/usr"
+ --bindir="/usr/bin"
+ --sbindir="/usr/bin"
+ --mandir="/usr/share/man"
+ --infodir="/usr/share/info"
+ --datarootdir="/usr/share"
+ --sysconfdir="/etc"
+ --program-prefix=""
+ --with-bootdir="/boot"
+ --with-grubdir="grub"
+ --disable-silent-rules
+ --disable-werror
+)
+
+prepare() {
+ cd "${srcdir}/grub/"
+
+ echo "Apply backports..."
+ local _c
+ for _c in "${_backports[@]}"; do
+ git log --oneline -1 "${_c}"
+ git cherry-pick -n "${_c}"
+ done
+
+ echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
+ ## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
+ patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
+
+ echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..."
+ patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch"
+
+ echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
+ sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
+
+ echo "Fix mkinitcpio 'rw' FS#36275..."
+ sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
+
+ echo "Fix OS naming FS#33393..."
+ sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in"
+
+ echo "Pull in latest language files..."
+ ./linguas.sh
+
+ echo "Avoid problem with unifont during compile of grub..."
+ # http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847
+ gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf"
+
+ echo "Run bootstrap..."
+ ./bootstrap \
+ --gnulib-srcdir="${srcdir}/gnulib/" \
+ --no-git
+
+ echo "Make translations reproducible..."
+ sed -i '1i /^PO-Revision-Date:/ d' po/*.sed
+}
+
+_build_grub-common_and_bios() {
+ echo "Set ARCH dependent variables for bios build..."
+ if [[ "${CARCH}" == 'x86_64' ]]; then
+ _EFIEMU="--enable-efiemu"
+ else
+ _EFIEMU="--disable-efiemu"
+ fi
+
+ echo "Copy the source for building the bios part..."
+ cp -r "${srcdir}/grub/" "${srcdir}/grub-bios/"
+ cd "${srcdir}/grub-bios/"
+
+ echo "Unset all compiler FLAGS for bios build..."
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ echo "Run ./configure for bios build..."
+ ./configure \
+ --with-platform="pc" \
+ --target="i386" \
+ "${_EFIEMU}" \
+ --enable-boot-time \
+ "${_configure_options[@]}"
+
+ if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
+ echo "Make info pages reproducible..."
+ touch -d "@${SOURCE_DATE_EPOCH}" $(find -name '*.texi')
+ fi
+
+ echo "Run make for bios build..."
+ make
+}
+
+_build_grub-efi() {
+ echo "Copy the source for building the ${_EFI_ARCH} efi part..."
+ cp -r "${srcdir}/grub/" "${srcdir}/grub-efi-${_EFI_ARCH}/"
+ cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
+
+ echo "Unset all compiler FLAGS for ${_EFI_ARCH} efi build..."
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ echo "Run ./configure for ${_EFI_ARCH} efi build..."
+ ./configure \
+ --with-platform="efi" \
+ --target="${_EFI_ARCH}" \
+ --disable-efiemu \
+ --enable-boot-time \
+ "${_configure_options[@]}"
+
+ echo "Run make for ${_EFI_ARCH} efi build..."
+ make
+}
+
+_build_grub-emu() {
+ echo "Copy the source for building the emu part..."
+ cp -r "${srcdir}/grub/" "${srcdir}/grub-emu/"
+ cd "${srcdir}/grub-emu/"
+
+ echo "Unset all compiler FLAGS for emu build..."
+ unset CFLAGS
+ unset CPPFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ unset MAKEFLAGS
+
+ echo "Run ./configure for emu build..."
+ ./configure \
+ --with-platform="emu" \
+ --target="${_EMU_ARCH}" \
+ --enable-grub-emu-usb=no \
+ --enable-grub-emu-sdl=no \
+ --disable-grub-emu-pci \
+ "${_configure_options[@]}"
+
+ echo "Run make for emu build..."
+ make
+}
+
+build() {
+ cd "${srcdir}/grub/"
+
+ echo "Build grub bios stuff..."
+ _build_grub-common_and_bios
+
+ echo "Build grub ${_EFI_ARCH} efi stuff..."
+ _build_grub-efi
+
+ if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
+ echo "Build grub i386 efi stuff..."
+ _EFI_ARCH="i386" _build_grub-efi
+ fi
+
+ if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
+ echo "Build grub emu stuff..."
+ _build_grub-emu
+ fi
+}
+
+_package_grub-common_and_bios() {
+ cd "${srcdir}/grub-bios/"
+
+ echo "Run make install for bios build..."
+ make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+
+ echo "Remove gdb debugging related files for bios build..."
+ rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
+ rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
+ rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
+
+ echo "Install /etc/default/grub (used by grub-mkconfig)..."
+ install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+}
+
+_package_grub-efi() {
+ cd "${srcdir}/grub-efi-${_EFI_ARCH}/"
+
+ echo "Run make install for ${_EFI_ARCH} efi build..."
+ make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+
+ echo "Remove gdb debugging related files for ${_EFI_ARCH} efi build..."
+ rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+}
+
+_package_grub-emu() {
+ cd "${srcdir}/grub-emu/"
+
+ echo "Run make install for emu build..."
+ make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+
+ echo "Remove gdb debugging related files for emu build..."
+ rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.module || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/*.image || true
+ rm -f "${pkgdir}/usr/lib/grub/${_EMU_ARCH}-emu"/{kernel.exec,gdb_grub,gmodule.pl} || true
+}
+
+package() {
+ cd "${srcdir}/grub/"
+
+ echo "Package grub ${_EFI_ARCH} efi stuff..."
+ _package_grub-efi
+
+ if [[ "${CARCH}" == "x86_64" ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" == "1" ]]; then
+ echo "Package grub i386 efi stuff..."
+ _EFI_ARCH="i386" _package_grub-efi
+ fi
+
+ if [[ "${_GRUB_EMU_BUILD}" == "1" ]]; then
+ echo "Package grub emu stuff..."
+ _package_grub-emu
+ fi
+
+ echo "Package grub bios stuff..."
+ _package_grub-common_and_bios
+}
Deleted: grub.default
===================================================================
--- grub.default 2021-04-26 18:22:41 UTC (rev 413908)
+++ grub.default 2021-04-26 18:22:46 UTC (rev 413909)
@@ -1,57 +0,0 @@
-# GRUB boot loader configuration
-
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR="Arch"
-GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet"
-GRUB_CMDLINE_LINUX=""
-
-# Preload both GPT and MBR modules so that they are not missed
-GRUB_PRELOAD_MODULES="part_gpt part_msdos"
-
-# Uncomment to enable booting from LUKS encrypted devices
-#GRUB_ENABLE_CRYPTODISK=y
-
-# Set to 'countdown' or 'hidden' to change timeout behavior,
-# press ESC key to display menu.
-GRUB_TIMEOUT_STYLE=menu
-
-# Uncomment to use basic console
-GRUB_TERMINAL_INPUT=console
-
-# Uncomment to disable graphical terminal
-#GRUB_TERMINAL_OUTPUT=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=auto
-
-# Uncomment to allow the kernel use the same resolution used by grub
-GRUB_GFXPAYLOAD_LINUX=keep
-
-# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
-# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-GRUB_DISABLE_RECOVERY=true
-
-# Uncomment and set to the desired menu colors. Used by normal and wallpaper
-# modes only. Entries specified as foreground/background.
-#GRUB_COLOR_NORMAL="light-blue/black"
-#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
-
-# Uncomment one of them for the gfx desired, a image background or a gfxtheme
-#GRUB_BACKGROUND="/path/to/wallpaper"
-#GRUB_THEME="/path/to/gfxtheme"
-
-# Uncomment to get a beep at GRUB start
-#GRUB_INIT_TUNE="480 440 1"
-
-# Uncomment to make GRUB remember the last selection. This requires
-# setting 'GRUB_DEFAULT=saved' above.
-#GRUB_SAVEDEFAULT=true
-
-# Uncomment to disable submenus in boot menu
-#GRUB_DISABLE_SUBMENU=y
Copied: grub/repos/testing-x86_64/grub.default (from rev 413908, grub/trunk/grub.default)
===================================================================
--- grub.default (rev 0)
+++ grub.default 2021-04-26 18:22:46 UTC (rev 413909)
@@ -0,0 +1,57 @@
+# GRUB boot loader configuration
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Arch"
+GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3 quiet"
+GRUB_CMDLINE_LINUX=""
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable booting from LUKS encrypted devices
+#GRUB_ENABLE_CRYPTODISK=y
+
+# Set to 'countdown' or 'hidden' to change timeout behavior,
+# press ESC key to display menu.
+GRUB_TIMEOUT_STYLE=menu
+
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT=console
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+GRUB_GFXPAYLOAD_LINUX=keep
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_RECOVERY=true
+
+# Uncomment and set to the desired menu colors. Used by normal and wallpaper
+# modes only. Entries specified as foreground/background.
+#GRUB_COLOR_NORMAL="light-blue/black"
+#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+#GRUB_THEME="/path/to/gfxtheme"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
+
+# Uncomment to make GRUB remember the last selection. This requires
+# setting 'GRUB_DEFAULT=saved' above.
+#GRUB_SAVEDEFAULT=true
+
+# Uncomment to disable submenus in boot menu
+#GRUB_DISABLE_SUBMENU=y
Deleted: grub.install
===================================================================
--- grub.install 2021-04-26 18:22:41 UTC (rev 413908)
+++ grub.install 2021-04-26 18:22:46 UTC (rev 413909)
@@ -1,17 +0,0 @@
-#!/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'
-Generate your bootloader configuration with:
- grub-mkconfig -o /boot/grub/grub.cfg
-EOM
-}
-
Copied: grub/repos/testing-x86_64/grub.install (from rev 413908, grub/trunk/grub.install)
===================================================================
--- grub.install (rev 0)
+++ grub.install 2021-04-26 18:22:46 UTC (rev 413909)
@@ -0,0 +1,28 @@
+#!/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
+
+ # https://md.archlinux.org/F1JuYj5xQtWyhvH8_ilErg#
+ cat <<EOM
+:: Recent versions of grub may fail to boot with secure boot enabled. The
+ message will look like this:
+ > error: verification requested but nobody cares:
+ > (hd0,gpt2)/grub/x86_64-efi/normal.mod
+ > Entering rescue mode...
+ Handle installation to UEFI with care and be prepared!
+ For details see: https://md.archlinux.org/F1JuYj5xQtWyhvH8_ilErg#
+EOM
+}
+
+post_install() {
+ cat <<EOM
+:: Generate your bootloader configuration with:
+ grub-mkconfig -o /boot/grub/grub.cfg
+EOM
+}
+
More information about the arch-commits
mailing list