From 047ad2c81a7ec0d59d5fb1ddf52668c29a1119c9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Jan 2016 23:43:13 +0000 Subject: grub: Backport fix for largefile detection/use This is inspired by musl porting, where grub's configure is enabling largefile support based on glibc versions, instead an upstream patch turns it into autoconf check Update git version recipe arm platforms use this recipe to provide grub and it needed fixes from upstream so upgrade to latest tip of git and forward port patches as well as drop the ones already applied upstream (From OE-Core rev: a290429c8415042cb8c2f4258e76a3cc6815a172) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-bsp/grub/grub_git.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'meta/recipes-bsp/grub/grub_git.bb') diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 6a0e3ee036..3ebab7f2f8 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -5,13 +5,14 @@ DEPENDS += "autogen-native" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_arm = "1" +FILESEXTRAPATHS =. "${FILE_DIRNAME}/grub-git:" + PV = "2.00+${SRCPV}" -SRCREV = "87de66d9d83446ecddb29cfbdf7369102c8e209e" +SRCREV = "b95e92678882f56056c64ae29092bc9cf129905f" SRC_URI = "git://git.savannah.gnu.org/grub.git \ - file://grub-2.00-fpmath-sse-387-fix.patch \ + file://0001-Disable-mfpmath-sse-as-well-when-SSE-is-disabled.patch \ file://autogen.sh-exclude-pc.patch \ - file://grub-2.00-add-oe-kernel.patch \ - file://0001-Fix-build-with-glibc-2.20.patch \ + file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ " S = "${WORKDIR}/git" @@ -30,6 +31,8 @@ GRUBPLATFORM ??= "pc" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" + do_configure_prepend() { ( cd ${S} ${S}/autogen.sh ) @@ -37,7 +40,7 @@ do_configure_prepend() { do_install_append () { install -d ${D}${sysconfdir}/grub.d - + rm -rf ${D}${libdir}/charset.alias } # debugedit chokes on bare metal binaries -- cgit v1.2.3-54-g00ecf