summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch33
-rw-r--r--meta/recipes-bsp/grub/grub-efi-native_2.00.bb6
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb6
3 files changed, 41 insertions, 4 deletions
diff --git a/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch b/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch
new file mode 100644
index 0000000000..0eece082f8
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch
@@ -0,0 +1,33 @@
1Disable liblzma if --enable-liblzma=no
2
3Upstream-Status: Inappropriate [configuration]
4
5Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
6
7--- a/configure.ac
8+++ b/configure.ac
9@@ -1029,10 +1029,20 @@ fi
10
11 AC_SUBST([LIBGEOM])
12
13-AC_CHECK_LIB([lzma], [lzma_code],
14- [LIBLZMA="-llzma"
15- AC_DEFINE([HAVE_LIBLZMA], [1],
16- [Define to 1 if you have the LZMA library.])],)
17+AC_ARG_ENABLE([liblzma],
18+ [AS_HELP_STRING([--enable-liblzma],
19+ [enable liblzma integration (default=guessed)])])
20+if test x"$enable_liblzma" = xno ; then
21+ liblzma_excuse="explicitly disabled"
22+fi
23+
24+if test x"$liblzma_excuse" = x ; then
25+ AC_CHECK_LIB([lzma], [lzma_code],
26+ [LIBLZMA="-llzma"
27+ AC_DEFINE([HAVE_LIBLZMA], [1],
28+ [Define to 1 if you have the LZMA library.])],)
29+fi
30+
31 AC_SUBST([LIBLZMA])
32
33 AC_ARG_ENABLE([libzfs],
diff --git a/meta/recipes-bsp/grub/grub-efi-native_2.00.bb b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb
index 776bf23f2d..14ab9ea7b9 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_2.00.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
16# FIXME: We should be able to optionally drop freetype as a dependency 16# FIXME: We should be able to optionally drop freetype as a dependency
17DEPENDS = "autogen-native" 17DEPENDS = "autogen-native"
18RDEPENDS_${PN} = "diffutils freetype" 18RDEPENDS_${PN} = "diffutils freetype"
19PR = "r0" 19PR = "r1"
20 20
21# Native packages do not normally rebuild when the target changes. 21# Native packages do not normally rebuild when the target changes.
22# Ensure this is built once per HOST-TARGET pair. 22# Ensure this is built once per HOST-TARGET pair.
@@ -26,6 +26,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
26 file://grub-2.00-fpmath-sse-387-fix.patch \ 26 file://grub-2.00-fpmath-sse-387-fix.patch \
27 file://grub-2.00-fix-enable_execute_stack-check.patch \ 27 file://grub-2.00-fix-enable_execute_stack-check.patch \
28 file://grub-2.00-disable-help2man.patch \ 28 file://grub-2.00-disable-help2man.patch \
29 file://check-if-liblzma-is-disabled.patch \
29 file://grub-no-unused-result.patch \ 30 file://grub-no-unused-result.patch \
30 " 31 "
31SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 32SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
@@ -59,7 +60,8 @@ inherit native
59inherit deploy 60inherit deploy
60 61
61EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ 62EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
62 --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix=''" 63 --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix='' \
64 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"
63 65
64do_mkimage() { 66do_mkimage() {
65 ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \ 67 ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index 821d9ffe17..8d22424253 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -13,12 +13,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
13 13
14DEPENDS = "autogen-native flex-native" 14DEPENDS = "autogen-native flex-native"
15RDEPENDS_${PN} = "diffutils freetype" 15RDEPENDS_${PN} = "diffutils freetype"
16PR = "r0" 16PR = "r1"
17 17
18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
19 file://grub-install.in.patch \ 19 file://grub-install.in.patch \
20 file://grub-2.00-fpmath-sse-387-fix.patch \ 20 file://grub-2.00-fpmath-sse-387-fix.patch \
21 file://remove-gets.patch \ 21 file://remove-gets.patch \
22 file://check-if-liblzma-is-disabled.patch \
22 file://40_custom" 23 file://40_custom"
23 24
24SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 25SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
@@ -32,7 +33,8 @@ FILES_${PN}-dbg += "${libdir}/${BPN}/i386-pc/.debug"
32inherit autotools 33inherit autotools
33inherit gettext 34inherit gettext
34 35
35EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix=""" 36EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \
37 --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"
36 38
37do_install_append () { 39do_install_append () {
38 install -d ${D}${sysconfdir}/grub.d 40 install -d ${D}${sysconfdir}/grub.d