From 4d65a93d3e705cfb9b4cfe102e9d0cabaffe7a52 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 28 Jun 2016 11:06:13 +0300 Subject: libarchive: update to 3.2.1 Drop merged 0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...c-check-acl-libacl.h-and-sys-acl.h-based-.patch | 66 --------------------- .../libarchive/libarchive_3.2.0.bb | 68 ---------------------- .../libarchive/libarchive_3.2.1.bb | 67 +++++++++++++++++++++ 3 files changed, 67 insertions(+), 134 deletions(-) delete mode 100644 meta/recipes-extended/libarchive/libarchive/0001-configure.ac-check-acl-libacl.h-and-sys-acl.h-based-.patch delete mode 100644 meta/recipes-extended/libarchive/libarchive_3.2.0.bb create mode 100644 meta/recipes-extended/libarchive/libarchive_3.2.1.bb (limited to 'meta/recipes-extended/libarchive') 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" -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 ---- - 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.0.bb deleted file mode 100644 index f183b74e29..0000000000 --- a/meta/recipes-extended/libarchive/libarchive_3.2.0.bb +++ /dev/null @@ -1,68 +0,0 @@ -SUMMARY = "Support for reading various archive formats" -DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats" -HOMEPAGE = "http://www.libarchive.org/" -SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=ed99aca006bc346974bb745a35336425" - -DEPENDS = "e2fsprogs-native" - -PACKAGECONFIG ?= "zlib bz2" - -PACKAGECONFIG_append_class-target = "\ - libxml2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ -" - -PACKAGECONFIG_append_class-nativesdk = " largefile" - -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," -PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," -PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,bzip2," -PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," -PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," -PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," -PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," -PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," -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" - -inherit autotools update-alternatives pkgconfig - -CPPFLAGS += "-I${WORKDIR}/extra-includes" - -do_configure[cleandirs] += "${WORKDIR}/extra-includes" -do_configure_prepend() { - # We just need the headers for some type constants, so no need to - # build all of e2fsprogs for the target - cp -R ${STAGING_INCDIR_NATIVE}/ext2fs ${WORKDIR}/extra-includes/ -} - -ALTERNATIVE_PRIORITY = "100" - -PACKAGES =+ "bsdtar" -FILES_bsdtar = "${bindir}/bsdtar" - -ALTERNATIVE_bsdtar = "tar" -ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" -ALTERNATIVE_TARGET[tar] = "${bindir}/bsdtar" - -PACKAGES =+ "bsdcpio" -FILES_bsdcpio = "${bindir}/bsdcpio" - -ALTERNATIVE_bsdcpio = "cpio" -ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" -ALTERNATIVE_TARGET[cpio] = "${bindir}/bsdcpio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libarchive/libarchive_3.2.1.bb b/meta/recipes-extended/libarchive/libarchive_3.2.1.bb new file mode 100644 index 0000000000..b65b5df01c --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive_3.2.1.bb @@ -0,0 +1,67 @@ +SUMMARY = "Support for reading various archive formats" +DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats" +HOMEPAGE = "http://www.libarchive.org/" +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=ed99aca006bc346974bb745a35336425" + +DEPENDS = "e2fsprogs-native" + +PACKAGECONFIG ?= "zlib bz2" + +PACKAGECONFIG_append_class-target = "\ + libxml2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ +" + +PACKAGECONFIG_append_class-nativesdk = " largefile" + +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," +PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib," +PACKAGECONFIG[bz2] = "--with-bz2lib,--without-bz2lib,bzip2," +PACKAGECONFIG[xz] = "--with-lzmadec --with-lzma,--without-lzmadec --without-lzma,xz," +PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," +PACKAGECONFIG[libxml2] = "--with-xml2,--without-xml2,libxml2," +PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat," +PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo," +PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," + +SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \ + " + +SRC_URI[md5sum] = "afa257047d1941a565216edbf0171e72" +SRC_URI[sha256sum] = "72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2" + +inherit autotools update-alternatives pkgconfig + +CPPFLAGS += "-I${WORKDIR}/extra-includes" + +do_configure[cleandirs] += "${WORKDIR}/extra-includes" +do_configure_prepend() { + # We just need the headers for some type constants, so no need to + # build all of e2fsprogs for the target + cp -R ${STAGING_INCDIR_NATIVE}/ext2fs ${WORKDIR}/extra-includes/ +} + +ALTERNATIVE_PRIORITY = "100" + +PACKAGES =+ "bsdtar" +FILES_bsdtar = "${bindir}/bsdtar" + +ALTERNATIVE_bsdtar = "tar" +ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" +ALTERNATIVE_TARGET[tar] = "${bindir}/bsdtar" + +PACKAGES =+ "bsdcpio" +FILES_bsdcpio = "${bindir}/bsdcpio" + +ALTERNATIVE_bsdcpio = "cpio" +ALTERNATIVE_LINK_NAME[cpio] = "${base_bindir}/cpio" +ALTERNATIVE_TARGET[cpio] = "${bindir}/bsdcpio" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg