zip: rename package to infozip to avoid name collision with tools

Rename "zip" to "infozip" to avoid name collision, as the same
zip package has been introduces to the build tools as zip.
Buildbot does not like that.

Reference to #10985 and #11089 as well as
ad8c2d6099

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2020-02-01 10:18:54 +02:00
parent a3b028b357
commit 07cef285bf
4 changed files with 6 additions and 6 deletions

View file

@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=zip
PKG_NAME:=infozip
PKG_REV:=30
PKG_VERSION:=3.0
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz
PKG_SOURCE:=zip$(PKG_REV).tar.gz
PKG_SOURCE_URL:=@SF/infozip
PKG_HASH:=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/zip$(PKG_REV)
@ -26,7 +26,7 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/zip
define Package/infozip
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Archiver for .zip files
@ -34,7 +34,7 @@ define Package/zip
SUBMENU:=Compression
endef
define Package/zip/description
define Package/infozip/description
This is InfoZIP's zip program. It produces files that are fully
compatible with the popular PKZIP program; however, the command line
options are not identical. In other words, the end result is the same,
@ -48,9 +48,9 @@ MAKE_FLAGS += \
LDFLAGS2="$(TARGET_LDFLAGS)" \
IZ_BZIP2="no"
define Package/zip/install
define Package/infozip/install
$(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
endef
$(eval $(call BuildPackage,zip))
$(eval $(call BuildPackage,infozip))