summaryrefslogtreecommitdiff
path: root/meta/recipes-bsp/grub/files
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-09-14 12:48:27 +0300
committerSaul Wold <sgw@linux.intel.com>2012-09-18 07:44:13 -0700
commit1773a98b68dd223b016fe408b022c2c5475669c2 (patch)
treef6e97b50f47ed2c36b3a410fcb01fdcc41b16e52 /meta/recipes-bsp/grub/files
parent08dbc9790074fdb315d286849afbbda72d19cbd6 (diff)
downloadopenembedded-core-1773a98b68dd223b016fe408b022c2c5475669c2.tar.gz
openembedded-core-1773a98b68dd223b016fe408b022c2c5475669c2.tar.bz2
openembedded-core-1773a98b68dd223b016fe408b022c2c5475669c2.zip
grub: disable lzma, device-mapper, zfs and nvpair
check-if-liblzma-is-disabled.patch: added - add support for the --enable_liblzma option [YOCTO #2750] Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-bsp/grub/files')
-rw-r--r--meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch33
1 files changed, 33 insertions, 0 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 @@
+Disable liblzma if --enable-liblzma=no
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1029,10 +1029,20 @@ fi
+
+ AC_SUBST([LIBGEOM])
+
+-AC_CHECK_LIB([lzma], [lzma_code],
+- [LIBLZMA="-llzma"
+- AC_DEFINE([HAVE_LIBLZMA], [1],
+- [Define to 1 if you have the LZMA library.])],)
++AC_ARG_ENABLE([liblzma],
++ [AS_HELP_STRING([--enable-liblzma],
++ [enable liblzma integration (default=guessed)])])
++if test x"$enable_liblzma" = xno ; then
++ liblzma_excuse="explicitly disabled"
++fi
++
++if test x"$liblzma_excuse" = x ; then
++ AC_CHECK_LIB([lzma], [lzma_code],
++ [LIBLZMA="-llzma"
++ AC_DEFINE([HAVE_LIBLZMA], [1],
++ [Define to 1 if you have the LZMA library.])],)
++fi
++
+ AC_SUBST([LIBLZMA])
+
+ AC_ARG_ENABLE([libzfs],