diff options
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/libarchive/libarchive/0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch | 66 | ||||
| -rw-r--r-- | meta/recipes-extended/libarchive/libarchive_3.2.1.bb (renamed from meta/recipes-extended/libarchive/libarchive_3.2.0.bb) | 5 |
2 files changed, 2 insertions, 69 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch b/meta/recipes-extended/libarchive/libarchive/0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch deleted file mode 100644 index 4b41d62a99..0000000000 --- a/meta/recipes-extended/libarchive/libarchive/0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b30c530aaf5068a652a479f3e46c74eb1716861a Mon Sep 17 00:00:00 2001 -From: "Maxin B. John" <maxin.john@intel.com> -Date: Thu, 2 Jun 2016 16:08:02 +0300 -Subject: [PATCH] configure.ac: check acl/libacl.h and sys/acl.h based on - requirement - -acl/libacl.h and sys/acl.h check should not happen when we explicitly -disable it with --disable-acl. - -Similarly, update attr/xattr.h for --disable-xattr option. - -Update the help texts to reflect what it really does. - -Upstream-Status: Accepted - -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - configure.ac | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cb6943f..0638182 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -252,7 +252,7 @@ esac - # Checks for header files. - AC_HEADER_DIRENT - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS([acl/libacl.h attr/xattr.h copyfile.h ctype.h]) -+AC_CHECK_HEADERS([copyfile.h ctype.h]) - AC_CHECK_HEADERS([errno.h ext2fs/ext2_fs.h fcntl.h grp.h]) - - AC_CACHE_CHECK([whether EXT2_IOC_GETFLAGS is usable], -@@ -272,7 +272,7 @@ AC_CHECK_HEADERS([linux/fiemap.h linux/fs.h linux/magic.h linux/types.h]) - AC_CHECK_HEADERS([locale.h paths.h poll.h pthread.h pwd.h]) - AC_CHECK_HEADERS([readpassphrase.h signal.h spawn.h]) - AC_CHECK_HEADERS([stdarg.h stdint.h stdlib.h string.h]) --AC_CHECK_HEADERS([sys/acl.h sys/cdefs.h sys/extattr.h]) -+AC_CHECK_HEADERS([sys/cdefs.h sys/extattr.h]) - AC_CHECK_HEADERS([sys/ioctl.h sys/mkdev.h sys/mount.h]) - AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/select.h sys/statfs.h sys/statvfs.h]) - AC_CHECK_HEADERS([sys/time.h sys/utime.h sys/utsname.h sys/vfs.h]) -@@ -644,7 +644,7 @@ AC_CHECK_MEMBER(struct dirent.d_namlen,,, - # Check for Extended Attributes support - AC_ARG_ENABLE([xattr], - AS_HELP_STRING([--disable-xattr], -- [Enable Extended Attributes support (default: check)])) -+ [Disable Extended Attributes support (default: check)])) - - if test "x$enable_xattr" != "xno"; then - AC_CHECK_HEADERS([attr/xattr.h]) -@@ -670,9 +670,10 @@ fi - # - AC_ARG_ENABLE([acl], - AS_HELP_STRING([--disable-acl], -- [Enable ACL support (default: check)])) -+ [Disable ACL support (default: check)])) - - if test "x$enable_acl" != "xno"; then -+ AC_CHECK_HEADERS([acl/libacl.h]) - AC_CHECK_HEADERS([sys/acl.h]) - AC_CHECK_LIB([acl],[acl_get_file]) - AC_CHECK_FUNCS([acl_create_entry acl_init acl_set_fd acl_set_fd_np acl_set_file]) --- -2.4.0 - diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.0.bb b/meta/recipes-extended/libarchive/libarchive_3.2.1.bb index f183b74e29..b65b5df01c 100644 --- a/meta/recipes-extended/libarchive/libarchive_3.2.0.bb +++ b/meta/recipes-extended/libarchive/libarchive_3.2.1.bb @@ -32,11 +32,10 @@ PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ - file://0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch \ " -SRC_URI[md5sum] = "596210b5a9c2ff74a0f7ca34838d655f" -SRC_URI[sha256sum] = "7bce45fd71ff01dc20d19edd78322d4965583d81b8bed8e26cacb65d6f5baa87" +SRC_URI[md5sum] = "afa257047d1941a565216edbf0171e72" +SRC_URI[sha256sum] = "72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2" inherit autotools update-alternatives pkgconfig |