Merge pull request #5091 from heitbaum/grub2

grub: use host:grub-mkimage to run grub - fix glibc host and target mismatched
This commit is contained in:
CvH 2022-03-19 10:22:36 +01:00 committed by GitHub
commit 3ac6036902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,11 +8,27 @@ PKG_ARCH="x86_64"
PKG_LICENSE="GPLv3"
PKG_SITE="https://www.gnu.org/software/grub/index.html"
PKG_URL="http://git.savannah.gnu.org/cgit/grub.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain flex freetype:host gettext:host"
PKG_DEPENDS_HOST="toolchain:host"
PKG_DEPENDS_TARGET="toolchain flex freetype:host gettext:host grub:host"
PKG_DEPENDS_UNPACK="gnulib"
PKG_LONGDESC="GRUB is a Multiboot boot loader."
PKG_TOOLCHAIN="configure"
pre_configure_host() {
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset CPP
cd ${PKG_BUILD}
# keep grub synced with gnulib
./bootstrap --gnulib-srcdir=$(get_build_dir gnulib) --copy --no-git --no-bootstrap-sync --skip-po
mkdir -p .${HOST_NAME}
cd .${HOST_NAME}
}
pre_configure_target() {
PKG_CONFIGURE_OPTS_TARGET="--target=i386-pc-linux \
--disable-nls \
@ -27,6 +43,9 @@ pre_configure_target() {
cd ${PKG_BUILD}
# keep grub synced with gnulib
./bootstrap --gnulib-srcdir=$(get_build_dir gnulib) --copy --no-git --no-bootstrap-sync --skip-po
mkdir -p .${TARGET_NAME}
cd .${TARGET_NAME}
}
make_target() {
@ -38,15 +57,13 @@ make_target() {
}
makeinstall_target() {
cd ${PKG_BUILD}/grub-core
${PKG_BUILD}/grub-mkimage -d . -o bootia32.efi -O i386-efi -p /EFI/BOOT \
boot chain configfile ext2 fat linux search \
efi_gop efi_uga part_gpt gzio \
gettext loadenv loadbios memrw
${PKG_BUILD}/.${HOST_NAME}/grub-mkimage -d grub-core -o bootia32.efi -O i386-efi -p /EFI/BOOT \
boot chain configfile ext2 fat linux search efi_gop \
efi_uga part_gpt gzio gettext loadenv loadbios memrw
mkdir -p ${INSTALL}/usr/share/grub
cp -P ${PKG_BUILD}/grub-core/bootia32.efi ${INSTALL}/usr/share/grub
cp -P bootia32.efi ${INSTALL}/usr/share/grub
mkdir -p ${TOOLCHAIN}/share/grub
cp -P ${PKG_BUILD}/grub-core/bootia32.efi ${TOOLCHAIN}/share/grub
cp -P bootia32.efi ${TOOLCHAIN}/share/grub
}