diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-21 20:36:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-23 17:45:36 +0100 |
commit | 67d7ea7c675910f4da548639cdee31073cdf59fa (patch) | |
tree | 906556c4b75c4d25ccf78c245f522e771e5f55cb /meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch | |
parent | f0ff93c2a5c709cada5fc34b328204a79a5d642f (diff) | |
download | poky-67d7ea7c675910f4da548639cdee31073cdf59fa.tar.gz |
grub: Update to 2.02
Drop git recipe, add arm bits to 2.02 itself
(From OE-Core rev: 4f27e4042dfb39caa71c7c6eb0a327de6af4d563)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch | 33 |
1 files changed, 0 insertions, 33 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 deleted file mode 100644 index 0eece082f8..0000000000 --- a/meta/recipes-bsp/grub/files/check-if-liblzma-is-disabled.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Disable liblzma if --enable-liblzma=no | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | Signed-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], | ||