summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/grub/0010-relocation.patch65
-rw-r--r--libre/grub/PKGBUILD503
-rw-r--r--libre/grub/grub.install21
3 files changed, 261 insertions, 328 deletions
diff --git a/libre/grub/0010-relocation.patch b/libre/grub/0010-relocation.patch
new file mode 100644
index 000000000..1aeae6849
--- /dev/null
+++ b/libre/grub/0010-relocation.patch
@@ -0,0 +1,65 @@
+commit 842c390469e2c2e10b5aa36700324cd3bde25875
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date: Sat Feb 17 06:47:28 2018 -0800
+
+ x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
+
+ Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
+
+ https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
+
+ x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
+ 32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
+ R_X86_64_PC32.
+
+ Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+ Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+
+diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
+index e49d0b6ff..18facf47f 100644
+--- a/grub-core/efiemu/i386/loadcore64.c
++++ b/grub-core/efiemu/i386/loadcore64.c
+@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
+ break;
+
+ case R_X86_64_PC32:
++ case R_X86_64_PLT32:
+ err = grub_efiemu_write_value (addr,
+ *addr32 + rel->r_addend
+ + sym.off
+diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
+index 440690673..3a73e6e6c 100644
+--- a/grub-core/kern/x86_64/dl.c
++++ b/grub-core/kern/x86_64/dl.c
+@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
+ break;
+
+ case R_X86_64_PC32:
++ case R_X86_64_PLT32:
+ {
+ grub_int64_t value;
+ value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
+diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
+index a2bb05439..39d7efb91 100644
+--- a/util/grub-mkimagexx.c
++++ b/util/grub-mkimagexx.c
+@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
+ break;
+
+ case R_X86_64_PC32:
++ case R_X86_64_PLT32:
+ {
+ grub_uint32_t *t32 = (grub_uint32_t *) target;
+ *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
+index 9179285a5..a79271f66 100644
+--- a/util/grub-module-verifier.c
++++ b/util/grub-module-verifier.c
+@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
+ -1
+ }, (int[]){
+ R_X86_64_PC32,
++ R_X86_64_PLT32,
+ -1
+ }
+ },
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index f4dc27eb8..c87d49a0a 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -20,7 +20,7 @@ _GRUB_EMU_BUILD='0'
_GRUB_EXTRAS_COMMIT=f2a079441939eee7251bf141986cdd78946e1d20
-_UNIFONT_VER='10.0.06'
+_UNIFONT_VER='11.0.02'
[[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm'
[[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64'
@@ -39,7 +39,7 @@ pkgname=('grub')
'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
pkgver='2.02'
-pkgrel='6.parabola1'
+pkgrel='8.par1'
epoch='2'
url='https://www.gnu.org/software/grub/'
arch=('x86_64' 'i686' 'armv7h')
@@ -83,6 +83,7 @@ source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
'0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch'
'0008-Fix-packed-not-aligned-error-on-GCC-8.patch'
'0009-xfs-Accept-filesystem-with-sparse-inodes.patch'
+ '0010-relocation.patch'
'grub.default'
'0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch'
'0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch'
@@ -94,7 +95,7 @@ source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'SKIP'
'2844601914cea6b1231eca0104853a93c4d67a5209933a0766f1475953300646'
- '0d81571fc519573057b7641d26a31ead55cc0b02a931589fb346a3a534c3dcc1'
+ 'a7ea9ca4f6dcb59377d978194835ede669457069256184f86d46ab5b863c56e6'
'SKIP'
'3f68a78ecba0284b9d39af60431236cb2ebc8547d3dc1fb26a1ac7a6b9afbbc7'
'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
@@ -103,6 +104,7 @@ sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
'e43566c4fe3b1b87e677167323d4716b82ac0810410a9d8dc7fbf415c8db2b8a'
'e84b8de569c7e6b73263758c35cf95c6516fde85d4ed451991427864f6a4e5a8'
'fcd5a626d4af33665d041ce42df813f1f198d8230ea186481b155a5b676f3b87'
+ '51562fa1016c54567dbf42a86c0cfc902372ab579bbee17879a81aff09b76b99'
'959f3d8d65d9504df798924554c3de0e92dfcd39e087b099a5f5e0a9b7885102'
'9ece1db537a989ce4dc55ece471883e19b8ab16902f8c4feb68436c3b5700f71'
'de71452b9b0fbfb08ea742e9fa217ab34fddf6312452f155fb9d82ebf1c024a5'
@@ -114,51 +116,76 @@ sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f'
validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
'95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
+_configure_options=(
+ 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-${pkgver}/"
- msg 'Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig'
+ echo 'Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
- msg 'Patch to enable GRUB_COLOR_* variables in grub-mkconfig'
+ 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}/0004-add-GRUB_COLOR_variables.patch"
- msg "Patch to allow GRUB to mount ext2/3/4 filesystems that have the encryption feature"
+ echo "Patch to allow GRUB to mount ext2/3/4 filesystems that have the encryption feature..."
patch -Np1 -i "${srcdir}/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch"
- msg "Patch to change default tsc calibration method to pmtimer on EFI systems"
+ echo "Patch to change default tsc calibration method to pmtimer on EFI systems..."
patch -Np1 -i "${srcdir}/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch"
- msg "Support multiple early initrd images"
+ echo "Patch to Support multiple early initrd images..."
patch -Np1 -i "${srcdir}/0007-grub-mkconfig_10_linux_Support_multiple_early_initrd_images.patch"
- msg "Fix packed-not-aligned error on GCC 8"
+ echo "Patch to fix packed-not-aligned error on GCC 8..."
patch -Np1 -i "${srcdir}/0008-Fix-packed-not-aligned-error-on-GCC-8.patch"
- msg "xfs: Accept filesystem with sparse inodes"
+ echo "Patch xfs: Accept filesystem with sparse inodes..."
patch -Np1 -i "${srcdir}/0009-xfs-Accept-filesystem-with-sparse-inodes.patch"
- msg 'Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme'
+ echo "Patch x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32..."
+ patch -Np1 -i "${srcdir}/0010-relocation.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"
- msg 'Rebranding for some free distros'
+ echo 'Rebranding for some free distros...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-rebrand-free-distros.patch"
- msg "Fix mkinitcpio 'rw' FS#36275"
+ echo "Fix mkinitcpio 'rw' FS#36275..."
sed 's| ro | rw |g' -i "util/grub.d/10_linux.in"
- msg 'Pull in latest language files'
+ echo 'Pull in latest language files...'
./linguas.sh
- msg 'Remove not working langs which need LC_ALL=C.UTF-8'
+ echo 'Remove not working langs which need LC_ALL=C.UTF-8...'
sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
- msg "Avoid problem with unifont during compile of grub"
+ echo "Avoid problem with unifont during compile of grub..."
# http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847
cp "${srcdir}/unifont-${_UNIFONT_VER}.bdf" "unifont.bdf"
- msg "Add the grub-extra sources for BIOS build"
+ echo "Add the grub-extra sources for BIOS build..."
install -d "grub-extras"
cp -r "${srcdir}/grub-extras-${_GRUB_EXTRAS_COMMIT}/915resolution" \
"grub-extras/915resolution"
@@ -166,381 +193,237 @@ prepare() {
}
_build_grub-efi() {
- msg "Copy the source for building the ${_EFI_ARCH} EFI part"
+ echo "Copy the source for building the ${_EFI_ARCH} EFI part..."
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi-${_EFI_ARCH}"
cd "${srcdir}/grub-${pkgver}-efi-${_EFI_ARCH}"
- msg "Unset all compiler FLAGS for ${_EFI_ARCH} EFI build"
+ echo "Unset all compiler FLAGS for ${_EFI_ARCH} EFI build..."
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg "Run autogen.sh for ${_EFI_ARCH} EFI build"
+ echo "Run autogen.sh for ${_EFI_ARCH} EFI build..."
./autogen.sh
- msg "Run ./configure for ${_EFI_ARCH} EFI build"
+ echo "Run ./configure for ${_EFI_ARCH} EFI build..."
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform="efi" \
--target="${_EFI_ARCH}" \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg "Run make for ${_EFI_ARCH} EFI build"
+ "${_configure_options[@]}"
+
+ echo "Run make for ${_EFI_ARCH} EFI build..."
make
}
_build_grub-xen() {
- msg "Copy the source for building the ${_XEN_ARCH} XEN part"
+ echo "Copy the source for building the ${_XEN_ARCH} XEN part..."
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-xen-${_XEN_ARCH}"
cd "${srcdir}/grub-${pkgver}-xen-${_XEN_ARCH}"
- msg "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build"
+ echo "Unset all compiler FLAGS for ${_XEN_ARCH} XEN build..."
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg "Run autogen.sh for ${_XEN_ARCH} XEN build"
+ echo "Run autogen.sh for ${_XEN_ARCH} XEN build..."
./autogen.sh
- msg "Run ./configure for ${_XEN_ARCH} XEN build"
+ echo "Run ./configure for ${_XEN_ARCH} XEN build..."
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform='xen' \
--target="${_XEN_ARCH}" \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg "Run make for ${_XEN_ARCH} XEN build"
+ "${_configure_options[@]}"
+
+ echo "Run make for ${_XEN_ARCH} XEN build..."
make
}
_build_grub-bios() {
- msg 'Set ARCH dependent variables for BIOS build'
+ echo 'Set ARCH dependent variables for BIOS build...'
if [[ "${CARCH}" = 'x86_64' ]]; then
_EFIEMU='--enable-efiemu'
else
_EFIEMU='--disable-efiemu'
fi
- msg 'Copy the source for building the BIOS part'
+ echo 'Copy the source for building the BIOS part...'
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
cd "${srcdir}/grub-${pkgver}-bios"
- msg 'Unset all compiler FLAGS for BIOS build'
+ echo 'Unset all compiler FLAGS for BIOS build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg 'Run autogen.sh for BIOS build'
+ echo 'Run autogen.sh for BIOS build...'
./autogen.sh
- msg 'Run ./configure for BIOS build'
+ echo 'Run ./configure for BIOS build...'
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform='pc' \
--target='i386' \
"${_EFIEMU}" \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg 'Run make for BIOS build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for BIOS build...'
make
}
_build_grub-qemu() {
- msg 'Copy the source for building the QEMU part'
+ echo 'Copy the source for building the QEMU part...'
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-qemu"
cd "${srcdir}/grub-${pkgver}-qemu"
- msg 'Unset all compiler FLAGS for QEMU build'
+ echo 'Unset all compiler FLAGS for QEMU build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg 'Run autogen.sh for QEMU build'
+ echo 'Run autogen.sh for QEMU build...'
./autogen.sh
- msg 'Run ./configure for QEMU build'
+ echo 'Run ./configure for QEMU build...'
./configure \
- FREETYPE="pkg-config freetype2" \
BUILD_FREETYPE="pkg-config freetype2" \
--with-platform='qemu' \
--target='i386' \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg 'Run make for QEMU build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for QEMU build...'
make
}
_build_grub-ieee1275() {
- msg 'Copy the source for building the IEEE1275 (OpenFirmware) part'
+ echo 'Copy the source for building the IEEE1275 (OpenFirmware) part...'
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-ieee1275"
cd "${srcdir}/grub-${pkgver}-ieee1275"
- msg 'Unset all compiler FLAGS for IEEE1275 (OpenFirmware) build'
+ echo 'Unset all compiler FLAGS for IEEE1275 (OpenFirmware) build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg 'Run autogen.sh for IEEE1275 (OpenFirmware) build'
+ echo 'Run autogen.sh for IEEE1275 (OpenFirmware) build...'
./autogen.sh
- msg 'Run ./configure for IEEE1275 (OpenFirmware) build'
+ echo 'Run ./configure for IEEE1275 (OpenFirmware) build...'
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform='ieee1275' \
--target='i386' \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg 'Run make for IEEE1275 (OpenFirmware) build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for IEEE1275 (OpenFirmware) build...'
make
}
_build_grub-libreboot() {
- msg 'Copy the source for building the Libreboot part'
+ echo 'Copy the source for building the Libreboot part...'
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-libreboot"
cd "${srcdir}/grub-${pkgver}-libreboot"
- msg 'Unset all compiler FLAGS for Libreboot build'
+ echo 'Unset all compiler FLAGS for Libreboot build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg 'Run autogen.sh for Libreboot build'
+ echo 'Run autogen.sh for Libreboot build...'
./autogen.sh
- msg 'Run ./configure for Libreboot build'
+ echo 'Run ./configure for Libreboot build...'
./configure \
- FREETYPE="pkg-config freetype2" \
BUILD_FREETYPE="pkg-config freetype2" \
--with-platform='coreboot' \
--target='i386' \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg 'Run make for Libreboot build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for Libreboot build...'
make
}
_build_grub-multiboot() {
- msg 'Copy the source for building the Multiboot part'
+ echo 'Copy the source for building the Multiboot part...'
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-multiboot"
cd "${srcdir}/grub-${pkgver}-multiboot"
- msg 'Unset all compiler FLAGS for Multiboot build'
+ echo 'Unset all compiler FLAGS for Multiboot build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg 'Run autogen.sh for Multiboot build'
+ echo 'Run autogen.sh for Multiboot build...'
./autogen.sh
- msg 'Run ./configure for Multiboot build'
+ echo 'Run ./configure for Multiboot build...'
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform='multiboot' \
--target='i386' \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg 'Run make for Multiboot build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for Multiboot build...'
make
}
_build_grub-emu() {
- msg 'Copy the source for building the emu part'
+ echo 'Copy the source for building the emu part...'
cp -r "${srcdir}/grub-${pkgver}/" "${srcdir}/grub-${pkgver}-emu/"
cd "${srcdir}/grub-${pkgver}-emu"
- msg 'Unset all compiler FLAGS for emu build'
+ echo 'Unset all compiler FLAGS for emu build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- msg 'Run autogen.sh for emu build'
+ echo 'Run autogen.sh for emu build...'
./autogen.sh
- msg 'Run ./configure for emu build'
+ echo 'Run ./configure for emu build...'
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform='emu' \
--target="${_EMU_ARCH}" \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
- --enable-grub-mkfont \
- --enable-grub-mount \
--enable-grub-emu-usb=no \
--enable-grub-emu-sdl=no \
--disable-grub-emu-pci \
- --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
-
- msg 'Run make for emu build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for emu build...'
make
}
_build_grub-uboot() {
- msg "Copy the source for building the U-Boot part"
+ echo "Copy the source for building the U-Boot part..."
cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-uboot"
cd "${srcdir}/grub-${pkgver}-uboot"
- msg 'Unset all compiler FLAGS for U-Boot build'
+ echo 'Unset all compiler FLAGS for U-Boot build...'
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
@@ -550,36 +433,18 @@ _build_grub-uboot() {
#sed -i '\|grub_arm_disable_caches_mmu|,+4 d
# ' grub-core/loader/arm/linux.c
- msg 'Run autogen.sh for U-Boot build'
+ echo 'Run autogen.sh for U-Boot build...'
./autogen.sh
- msg 'Run ./configure for U-Boot build'
+ echo 'Run ./configure for U-Boot build...'
./configure \
- FREETYPE="pkg-config freetype2" \
--with-platform='uboot' \
--target='arm' \
--disable-efiemu \
- --enable-mm-debug \
- --enable-nls \
- --enable-device-mapper \
- --enable-cache-stats \
--enable-boot-time \
- --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
-
- msg 'Run make for U-Boot build'
+ "${_configure_options[@]}"
+
+ echo 'Run make for U-Boot build...'
make
}
@@ -587,47 +452,47 @@ build() {
cd "${srcdir}/grub-${pkgver}/"
if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then
- msg "Build grub ${_EFI_ARCH} EFI stuff"
+ echo "Build grub ${_EFI_ARCH} EFI stuff..."
_build_grub-efi
if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then
- msg 'Build grub i386 EFI stuff'
+ echo 'Build grub i386 EFI stuff...'
_EFI_ARCH='i386' _build_grub-efi
fi
fi
if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
if [[ "${_XEN}" = '1' ]]; then
- msg "Build grub ${_XEN_ARCH} XEN stuff"
+ echo "Build grub ${_XEN_ARCH} XEN stuff..."
_build_grub-xen
if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
- msg 'Build grub i386 XEN stuff'
+ echo 'Build grub i386 XEN stuff...'
_XEN_ARCH='i386' _build_grub-xen
fi
fi
- msg 'Build grub BIOS stuff'
+ echo 'Build grub BIOS stuff...'
_build_grub-bios
- msg 'Build grub QEMU stuff'
+ echo 'Build grub QEMU stuff...'
_build_grub-qemu
- msg 'Build grub IEEE1275 (OpenFirmware) stuff'
+ echo 'Build grub IEEE1275 (OpenFirmware) stuff...'
_build_grub-ieee1275
- msg 'Build grub Libreboot stuff'
+ echo 'Build grub Libreboot stuff...'
_build_grub-libreboot
- msg 'Build grub Multiboot stuff'
+ echo 'Build grub Multiboot stuff...'
_build_grub-multiboot
elif [[ "${CARCH}" = 'armv7h' ]]; then
- msg 'Build grub U-Boot stuff'
+ echo 'Build grub U-Boot stuff...'
_build_grub-uboot
fi
if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
- msg 'Build grub emu stuff'
+ echo 'Build grub emu stuff...'
_build_grub-emu
fi
}
@@ -635,10 +500,10 @@ build() {
_package_grub-efi() {
cd "${srcdir}/grub-${pkgver}-efi-${_EFI_ARCH}/"
- msg "Run make install for ${_EFI_ARCH} EFI build"
+ echo "Run make install for ${_EFI_ARCH} EFI build..."
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg "Remove gdb debugging related files for ${_EFI_ARCH} EFI build"
+ 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
@@ -647,10 +512,10 @@ _package_grub-efi() {
_package_grub-xen() {
cd "${srcdir}/grub-${pkgver}-xen-${_XEN_ARCH}/"
- msg "Run make install for ${_XEN_ARCH} XEN build"
+ echo "Run make install for ${_XEN_ARCH} XEN build..."
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg "Remove gdb debugging related files for ${_XEN_ARCH} XEN build"
+ echo "Remove gdb debugging related files for ${_XEN_ARCH} XEN build..."
rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/${_XEN_ARCH}-xen"/{kernel.exec,gdb_grub,gmodule.pl} || true
@@ -659,10 +524,10 @@ _package_grub-xen() {
_package_grub-bios() {
cd "${srcdir}/grub-${pkgver}-bios/"
- msg 'Run make install for BIOS build'
+ echo 'Run make install for BIOS build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for BIOS build'
+ 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
@@ -671,10 +536,10 @@ _package_grub-bios() {
_package_grub-qemu() {
cd "${srcdir}/grub-${pkgver}-qemu/"
- msg 'Run make install for QEMU build'
+ echo 'Run make install for QEMU build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for QEMU build'
+ echo 'Remove gdb debugging related files for QEMU build...'
rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-qemu"/{kernel.exec,gdb_grub,gmodule.pl} || true
@@ -683,10 +548,10 @@ _package_grub-qemu() {
_package_grub-ieee1275() {
cd "${srcdir}/grub-${pkgver}-ieee1275/"
- msg 'Run make install for IEEE1275 (OpenFirmware) build'
+ echo 'Run make install for IEEE1275 (OpenFirmware) build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for IEEE1275 (OpenFirmware) build'
+ echo 'Remove gdb debugging related files for IEEE1275 (OpenFirmware) build...'
rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-ieee1275"/{kernel.exec,gdb_grub,gmodule.pl} || true
@@ -695,10 +560,10 @@ _package_grub-ieee1275() {
_package_grub-libreboot() {
cd "${srcdir}/grub-${pkgver}-libreboot/"
- msg 'Run make install for Libreboot build'
+ echo 'Run make install for Libreboot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for Libreboot build'
+ echo 'Remove gdb debugging related files for Libreboot build...'
rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-coreboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
@@ -707,10 +572,10 @@ _package_grub-libreboot() {
_package_grub-multiboot() {
cd "${srcdir}/grub-${pkgver}-multiboot/"
- msg 'Run make install for Multiboot build'
+ echo 'Run make install for Multiboot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for Multiboot build'
+ echo 'Remove gdb debugging related files for Multiboot build...'
rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-multiboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
@@ -719,10 +584,10 @@ _package_grub-multiboot() {
_package_grub-emu() {
cd "${srcdir}/grub-${pkgver}-emu/"
- msg 'Run make install for emu build'
+ echo 'Run make install for emu build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for emu build'
+ 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
@@ -731,10 +596,10 @@ _package_grub-emu() {
_package_grub-uboot() {
cd "${srcdir}/grub-${pkgver}-uboot/"
- msg 'Run make install for U-Boot build'
+ echo 'Run make install for U-Boot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for U-Boot build'
+ echo 'Remove gdb debugging related files for U-Boot build...'
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
@@ -755,51 +620,51 @@ package_grub() {
cd "${srcdir}/grub-${pkgver}/"
if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]] || [[ "${CARCH}" = 'armv7h' ]]; then
- msg "Package grub ${_EFI_ARCH} EFI stuff"
+ echo "Package grub ${_EFI_ARCH} EFI stuff..."
_package_grub-efi
if [[ "${CARCH}" = 'x86_64' ]] && [[ "${_IA32_EFI_IN_ARCH_X64}" = '1' ]]; then
- msg 'Package grub i386 EFI stuff'
+ echo 'Package grub i386 EFI stuff...'
_EFI_ARCH='i386' _package_grub-efi
fi
fi
if [[ "${CARCH}" = 'x86_64' ]] || [[ "${CARCH}" = 'i686' ]]; then
if [[ "${_XEN}" = '1' ]]; then
- msg "Package grub ${_XEN_ARCH} XEN stuff"
+ echo "Package grub ${_XEN_ARCH} XEN stuff..."
_package_grub-xen
if [[ "${_IA32_XEN_IN_ARCH_X64}" = '1' ]]; then
- msg 'Package grub i386 XEN stuff'
+ echo 'Package grub i386 XEN stuff...'
_XEN_ARCH='i386' _package_grub-xen
fi
fi
- msg 'Package grub BIOS stuff'
+ echo 'Package grub BIOS stuff...'
_package_grub-bios
- msg 'Package grub QEMU stuff'
+ echo 'Package grub QEMU stuff...'
_package_grub-qemu
- msg 'Package grub IEEE1275 (OpenFirmware) stuff'
+ echo 'Package grub IEEE1275 (OpenFirmware) stuff...'
_package_grub-ieee1275
- msg 'Package grub Libreboot stuff'
+ echo 'Package grub Libreboot stuff...'
_package_grub-libreboot
- msg 'Package grub Multiboot stuff'
+ echo 'Package grub Multiboot stuff...'
_package_grub-multiboot
elif [[ "${CARCH}" = 'armv7h' ]]; then
- msg 'Package grub U-Boot stuff'
+ echo 'Package grub U-Boot stuff...'
_package_grub-uboot
fi
if [[ "${_GRUB_EMU_BUILD}" = '1' ]]; then
- msg 'Package grub emu stuff'
+ echo 'Package grub emu stuff...'
_package_grub-emu
fi
- msg 'Install /etc/default/grub (used by grub-mkconfig)'
+ echo 'Install /etc/default/grub (used by grub-mkconfig)...'
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
}
@@ -809,29 +674,29 @@ package_grub-am335x_bone() {
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
'mtools: For grub-mkrescue FAT FS support')
- msg "Copy the source for packaging the U-Boot (am335x-bone) part"
+ echo "Copy the source for packaging the U-Boot (am335x-bone) part..."
cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_am335x-bone"
cd "${srcdir}/grub-${pkgver}-uboot_am335x-bone/"
- msg 'Patch to detect am335x-bone device tree blob file (dtb)'
+ echo 'Patch to detect am335x-bone device tree blob file (dtb)...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
- msg 'Package grub U-Boot stuff'
+ echo 'Package grub U-Boot stuff...'
## _package_grub-uboot
- msg 'Run make install for U-Boot build'
+ echo 'Run make install for U-Boot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for U-Boot build'
+ echo 'Remove gdb debugging related files for U-Boot build...'
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
- msg 'Install /etc/default/grub (used by grub-mkconfig)'
+ echo 'Install /etc/default/grub (used by grub-mkconfig)...'
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
- ## msg 'Patch to detect am335x-bone device tree blob file (dtb)'
+ ## echo 'Patch to detect am335x-bone device tree blob file (dtb)...'
## cd "${pkgdir}/etc/grub.d/"
## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch"
}
@@ -843,29 +708,29 @@ package_grub-omap3_beagle() {
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
'mtools: For grub-mkrescue FAT FS support')
- msg "Copy the source for packaging the U-Boot (omap3_beagle) part"
+ echo "Copy the source for packaging the U-Boot (omap3_beagle) part..."
cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_omap3_beagle"
cd "${srcdir}/grub-${pkgver}-uboot_omap3_beagle/"
- msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
+ echo 'Patch to detect omap3_beagle device tree blob file (dtb)...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
- msg 'Package grub U-Boot stuff'
+ echo 'Package grub U-Boot stuff...'
## _package_grub-uboot
- msg 'Run make install for U-Boot build'
+ echo 'Run make install for U-Boot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for U-Boot build'
+ echo 'Remove gdb debugging related files for U-Boot build...'
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
- msg 'Install /etc/default/grub (used by grub-mkconfig)'
+ echo 'Install /etc/default/grub (used by grub-mkconfig)...'
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
- ## msg 'Patch to detect omap3_beagle device tree blob file (dtb)'
+ ## echo 'Patch to detect omap3_beagle device tree blob file (dtb)...'
## cd "${pkgdir}/etc/grub.d/"
## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch"
}
@@ -877,29 +742,29 @@ package_grub-omap3_beagle_xm() {
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
'mtools: For grub-mkrescue FAT FS support')
- msg "Copy the source for packaging the U-Boot (omap3_beagle_xm) part"
+ echo "Copy the source for packaging the U-Boot (omap3_beagle_xm) part..."
cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_omap3_beagle_xm"
cd "${srcdir}/grub-${pkgver}-uboot_omap3_beagle_xm/"
- msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
+ echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
- msg 'Package grub U-Boot stuff'
+ echo 'Package grub U-Boot stuff...'
## _package_grub-uboot
- msg 'Run make install for U-Boot build'
+ echo 'Run make install for U-Boot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for U-Boot build'
+ echo 'Remove gdb debugging related files for U-Boot build...'
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
- msg 'Install /etc/default/grub (used by grub-mkconfig)'
+ echo 'Install /etc/default/grub (used by grub-mkconfig)...'
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
- ## msg 'Patch to detect omap3_beagle_xm device tree blob file (dtb)'
+ ## echo 'Patch to detect omap3_beagle_xm device tree blob file (dtb)...'
## cd "${pkgdir}/etc/grub.d/"
## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch"
}
@@ -911,29 +776,29 @@ package_grub-omap3_beagle_xm_ab() {
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
'mtools: For grub-mkrescue FAT FS support')
- msg "Copy the source for packaging the U-Boot (omap3_beagle_xm_ab) part"
+ echo "Copy the source for packaging the U-Boot (omap3_beagle_xm_ab) part..."
cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_omap3_beagle_xm_ab"
cd "${srcdir}/grub-${pkgver}-uboot_omap3_beagle_xm_ab/"
- msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
+ echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
- msg 'Package grub U-Boot stuff'
+ echo 'Package grub U-Boot stuff...'
## _package_grub-uboot
- msg 'Run make install for U-Boot build'
+ echo 'Run make install for U-Boot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for U-Boot build'
+ echo 'Remove gdb debugging related files for U-Boot build...'
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
- msg 'Install /etc/default/grub (used by grub-mkconfig)'
+ echo 'Install /etc/default/grub (used by grub-mkconfig)...'
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
- ## msg 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)'
+ ## echo 'Patch to detect omap3_beagle_xm_ab device tree blob file (dtb)...'
## cd "${pkgdir}/etc/grub.d/"
## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch"
}
@@ -944,29 +809,29 @@ package_grub-udoo() {
'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
'mtools: For grub-mkrescue FAT FS support')
- msg "Copy the source for packaging the U-Boot (udoo) part"
+ echo "Copy the source for packaging the U-Boot (udoo) part..."
cp -r "${srcdir}/grub-${pkgver}-uboot" "${srcdir}/grub-${pkgver}-uboot_udoo"
cd "${srcdir}/grub-${pkgver}-uboot_udoo/"
- msg 'Patch to detect udoo device tree blob file (dtb)'
+ echo 'Patch to detect udoo device tree blob file (dtb)...'
patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
- msg 'Package grub U-Boot stuff'
+ echo 'Package grub U-Boot stuff...'
## _package_grub-uboot
- msg 'Run make install for U-Boot build'
+ echo 'Run make install for U-Boot build...'
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
- msg 'Remove gdb debugging related files for U-Boot build'
+ echo 'Remove gdb debugging related files for U-Boot build...'
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/arm-uboot"/{kernel.exec,gdb_grub,gmodule.pl} || true
- msg 'Install /etc/default/grub (used by grub-mkconfig)'
+ echo 'Install /etc/default/grub (used by grub-mkconfig)...'
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
- ## msg 'Patch to detect udoo device tree blob file (dtb)'
+ ## echo 'Patch to detect udoo device tree blob file (dtb)...'
## cd "${pkgdir}/etc/grub.d/"
## patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch"
}
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
index af67b89ce..c13ef99c7 100644
--- a/libre/grub/grub.install
+++ b/libre/grub/grub.install
@@ -1,14 +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."
}
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 02:45:41 +0000