diff options
| author | Huangbin Zhan <zhanhb88@gmail.com> | 2020-06-23 22:43:40 +0800 |
|---|---|---|
| committer | Huangbin Zhan <zhanhb88@gmail.com> | 2020-06-23 22:43:40 +0800 |
| commit | 48ef683087632f0b7d4c1abdf17de1e853ac648c (patch) | |
| tree | 1e1af29ef3056a39eaa3ccf25cd1257400a12312 /utils/tar | |
| parent | 4dfb0645e98d9396b57c15b79a5180644f6b991b (diff) | |
tar: alternatives instead of postinst
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
Diffstat (limited to 'utils/tar')
| -rw-r--r-- | utils/tar/Makefile | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/utils/tar/Makefile b/utils/tar/Makefile index 36ebd2c2a..f124f9819 100644 --- a/utils/tar/Makefile +++ b/utils/tar/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tar PKG_VERSION:=1.32 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@GNU/$(PKG_NAME) +PKG_SOURCE_URL:=@GNU/tar PKG_HASH:=d0d3ae07f103323be809bc3eac0dcc386d52c5262499fe05511ac4788af1fdd8 PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com> @@ -33,6 +33,7 @@ define Package/tar TITLE:=GNU tar URL:=https://www.gnu.org/software/tar/ MENU:=1 + ALTERNATIVES:=300:/bin/tar:/usr/libexec/tar-gnu endef define Package/tar/config @@ -73,22 +74,6 @@ define Package/tar/description single archive in tar format. endef -define Package/tar/postinst -#!/bin/sh -if [ -e $${IPKG_INSTROOT}/bin/tar ]; then - rm -r $${IPKG_INSTROOT}/bin/tar; -fi -ln -sf /usr/bin/tar $${IPKG_INSTROOT}/bin/tar -endef - -define Package/tar/postrm -#!/bin/sh -rm $${IPKG_INSTROOT}/bin/tar -ln -s busybox $${IPKG_INSTROOT}/bin/tar -$${IPKG_INSTROOT}/bin/tar 2>&1 | grep 'applet not found' > /dev/null 2>&1 && rm $${IPKG_INSTROOT}/bin/tar -exit 0 -endef - CONFIGURE_ARGS += \ $(if $(CONFIG_PACKAGE_TAR_POSIX_ACL),--with,--without)-posix-acls \ $(if $(CONFIG_PACKAGE_TAR_XATTR),--with,--without)-xattrs \ @@ -108,8 +93,8 @@ MAKE_FLAGS += \ LDFLAGS="$(TARGET_LDLAGS)" define Package/tar/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/libexec + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tar $(1)/usr/libexec/tar-gnu endef $(eval $(call BuildPackage,tar)) |