diff options
| author | Daniel Dickinson <openwrt@daniel.thecshore.com> | 2015-12-20 03:16:08 -0500 |
|---|---|---|
| committer | Daniel Dickinson <lede@daniel.thecshore.com> | 2016-05-16 04:23:30 -0400 |
| commit | 488be8407563ebbd9965820121d6eefe4bd09958 (patch) | |
| tree | 5f0d49c1f396cd367851fbfba2ac1c1f244c6b72 | |
| parent | 2edb2e36ec662ecd950ebc9fb8e7b8931d9bbb10 (diff) | |
utils/tar: Make compression, acl, and xattr support configuration options
This patch make building tar with POSIX ACL and XATTR
support configuration options. It also makes building
seamless (e.g. -z -J -j) compression support a configuration
option for each compression program available in OpenWrt.
It also makes POSIX ACL support disabled by default
(by default OpenWrt doesn't build POSIX ACL support
into the kernel, never mind allowing to mount with it
enabled). Also XATTR support is disabled by
default as this seems to be the standard default for packages
in OpenWrt.
Finally Bzip2, Gzip, and XZ seamless support are made
available by default and appropriate dependencies
are added based on the configuration choice.
Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
| -rw-r--r-- | utils/tar/Makefile | 44 |
1 files changed, 42 insertions, 2 deletions
diff --git a/utils/tar/Makefile b/utils/tar/Makefile index 02d796b32..8d9fb88f4 100644 --- a/utils/tar/Makefile +++ b/utils/tar/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tar PKG_VERSION:=1.28 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -21,14 +21,42 @@ PKG_LICENSE_FILES:=COPYING PKG_INSTALL:=1 +BUILD_DEPENDS:=xz + include $(INCLUDE_DIR)/package.mk define Package/tar SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+bzip2 +libacl +libattr + DEPENDS:=+PACKAGE_TAR_POSIX_ACL:libacl +PACKAGE_TAR_XATTR:libattr +PACKAGE_TAR_BZIP2:bzip2 + EXTRA_DEPENDS:=$(if $(CONFIG_PACKAGE_TAR_XZ),xz) TITLE:=GNU tar URL:=http://www.gnu.org/software/tar/ + MENU:=1 +endef + +define Package/tar/config + config PACKAGE_TAR_POSIX_ACL + bool "tar: Enable POSIX ACL support" if PACKAGE_tar + default n + + config PACKAGE_TAR_XATTR + bool "tar: Enable extended attribute (xattr) support" if PACKAGE_tar + default n + + config PACKAGE_TAR_GZIP + bool "tar: Enable seamless gzip support" if PACKAGE_tar + default y + + config PACKAGE_TAR_BZIP2 + bool "tar: Enable seamless bzip2 support" if PACKAGE_tar + default y + + config PACKAGE_TAR_XZ + bool "tar: Enable seamless xz support" if PACKAGE_tar + select PACKAGE_xz-utils + select PACKAGE_xz + default y endef define Package/tar/description @@ -52,6 +80,18 @@ $${IPKG_INSTROOT}/bin/tar 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm exit 0 endef +CONFIGURE_ARGS += \ + $(if $(CONFIG_PACKAGE_TAR_POSIX_ACL),--with,--without)-posix-acls \ + $(if $(CONFIG_PACKAGE_TAR_XATTR),--with,--without)-xattrs \ + $(if $(CONFIG_PACKAGE_TAR_GZIP),--with-gzip=gzip,--without-gzip) \ + $(if $(CONFIG_PACKAGE_TAR_BZIP2),--with-bzip2=bzip2,--without-bzip2) \ + $(if $(CONFIG_PACKAGE_TAR_XZ),--with-xz=xz,--without-xz) \ + --without-compress \ + --without-lzip \ + --without-lzma \ + --without-lzop \ + --without-selinux + MAKE_FLAGS += \ CFLAGS="$(TARGET_CFLAGS)" \ LDFLAGS="$(TARGET_LDLAGS)" |