Skip to contentSkip to conversation

infozip: rename to zip

PATCH New Luca Ceresoli 5 participants 12 messages Nov 27, 2015 – Dec 6, 2015

lore
Share & tools
lore

Luca Ceresoli

author
#0 lore raw

PATCH 1/2 infozip: rename to zip

We currently have a package named "infozip" for Info-Zip's Zip.

With the upcoming addition of a package the Info-Zip's UnZip the name is becoming ambiguous. Rename it to the more specific name "zip".

Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
---
 Config.in.legacy                                   | 12 ++++++++
 package/Config.in                                  |  2 +-
 ...emove-Check-C-compiler-type-optimization-.patch |  0
 .../0002-configure-Don-t-use-host-CPP.patch        |  0
 ...003-Makefile-Use-CFLAGS-from-command-line.patch |  0
 ...4-configure-use-LDFLAGS-from-command-line.patch |  0
 ...-unix-configure-remove-GID-UID-size-check.patch |  0
 ...figure-borrow-the-LFS-test-from-autotools.patch |  0
 package/{infozip => zip}/Config.in                 |  4 +--
 package/{infozip/infozip.hash => zip/zip.hash}     |  0
 package/{infozip/infozip.mk => zip/zip.mk}         | 32 +++++++++++-----------
 11 files changed, 31 insertions(+), 19 deletions(-)
 rename package/{infozip => zip}/0001-configure-Remove-Check-C-compiler-type-optimization-.patch (100%)
 rename package/{infozip => zip}/0002-configure-Don-t-use-host-CPP.patch (100%)
 rename package/{infozip => zip}/0003-Makefile-Use-CFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0004-configure-use-LDFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0005-unix-configure-remove-GID-UID-size-check.patch (100%)
 rename package/{infozip => zip}/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch (100%)
 rename package/{infozip => zip}/Config.in (88%)
 rename package/{infozip/infozip.hash => zip/zip.hash} (100%)
 rename package/{infozip/infozip.mk => zip/zip.mk} (66%)
Config.in.legacy +12 -0
index c5b8223..2bbf2ed 100644
@@ -105,6 +105,18 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2016.02"
+
+config BR2_PACKAGE_INFOZIP
+	bool "infozip option has been renamed to zip"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ZIP
+	help
+	  Info-Zip's Zip package has been renamed from infozip to zip,
+	  to avoid ambiguities with Info-Zip's UnZip which has been added
+	  in the unzip package.
+
+###############################################################################
 comment "Legacy options removed in 2015.11"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL
package/Config.in +1 -1
index 988fe84..9e3494a 100644
@@ -51,11 +51,11 @@ menu "Compressors and decompressors"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/gzip/Config.in"
 endif
-	source "package/infozip/Config.in"
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
 	source "package/xz/Config.in"
+	source "package/zip/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch renamed from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch +0 -0
similarity index 100%
rename from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
rename to package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
package/zip/0002-configure-Don-t-use-host-CPP.patch renamed from package/infozip/0002-configure-Don-t-use-host-CPP.patch +0 -0
similarity index 100%
rename from package/infozip/0002-configure-Don-t-use-host-CPP.patch
rename to package/zip/0002-configure-Don-t-use-host-CPP.patch
package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch renamed from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch
rename to package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
package/zip/0004-configure-use-LDFLAGS-from-command-line.patch renamed from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch
rename to package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
package/zip/0005-unix-configure-remove-GID-UID-size-check.patch renamed from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch +0 -0
similarity index 100%
rename from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch
rename to package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch renamed from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch +0 -0
similarity index 100%
rename from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
rename to package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
package/zip/Config.in renamed from package/infozip/Config.in +2 -2
similarity index 88%
rename from package/infozip/Config.in
rename to package/zip/Config.in
index cfd7533..4b6360a 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_INFOZIP
-	bool "infozip"
+config BR2_PACKAGE_ZIP
+	bool "zip"
 	help
 	  Zip is a compression and file packaging/archive utility.
 	  Although highly compatible both with PKWARE's PKZIP and
package/zip/zip.hash renamed from package/infozip/infozip.hash +0 -0
similarity index 100%
rename from package/infozip/infozip.hash
rename to package/zip/zip.hash
package/zip/zip.mk renamed from package/infozip/infozip.mk +16 -16
similarity index 66%
rename from package/infozip/infozip.mk
rename to package/zip/zip.mk
index e57f7e1..5338f88 100644
@@ -1,51 +1,51 @@
 ################################################################################
 #
-# infozip
+# zip
 #
 ################################################################################
 
-INFOZIP_VERSION = 30
-INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-INFOZIP_LICENSE = Info-ZIP
-INFOZIP_LICENSE_FILES = LICENSE
+ZIP_VERSION = 30
+ZIP_SOURCE = zip$(ZIP_VERSION).tgz
+ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+ZIP_LICENSE = Info-ZIP
+ZIP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-INFOZIP_DEPENDENCIES += bzip2
+ZIP_DEPENDENCIES += bzip2
 endif
 
 # Infozip's default CFLAGS.
-INFOZIP_CFLAGS = -I. -DUNIX
+ZIP_CFLAGS = -I. -DUNIX
 
 # Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was
 # removed since it can't work for cross-compilation.
-INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT
+ZIP_CFLAGS += -DUIDGID_NOT_16BIT
 
 # infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
 # necessary, redefining it on the command line causes some warnings.
-INFOZIP_TARGET_CFLAGS = \
+ZIP_TARGET_CFLAGS = \
 	$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 
-define INFOZIP_BUILD_CMDS
+define ZIP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(TARGET_CC) -c" \
 		-f unix/Makefile generic
 endef
 
-define INFOZIP_INSTALL_TARGET_CMDS
+define ZIP_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(TARGET_DIR)/usr
 endef
 
-define HOST_INFOZIP_BUILD_CMDS
+define HOST_ZIP_BUILD_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(HOSTCC) -c" \
 		-f unix/Makefile generic
 endef
 
-define HOST_INFOZIP_INSTALL_CMDS
+define HOST_ZIP_INSTALL_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(HOST_DIR)/usr
 endef
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 unzip: new package

Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
---
 package/Config.in                                  |  1 +
 ...a-CMakeFile.txt-to-ease-cross-compilation.patch | 53 ++++++++++++++++++++++
 package/unzip/Config.in                            | 11 +++++
 package/unzip/unzip.hash                           |  2 +
 package/unzip/unzip.mk                             | 13 ++++++
 5 files changed, 80 insertions(+)
 create mode 100644 package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch
 create mode 100644 package/unzip/Config.in
 create mode 100644 package/unzip/unzip.hash
 create mode 100644 package/unzip/unzip.mk
package/Config.in +1 -0
index 9e3494a..311d744 100644
@@ -54,6 +54,7 @@ endif
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
+	source "package/unzip/Config.in"
 	source "package/xz/Config.in"
 	source "package/zip/Config.in"
 endmenu
package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch new file +53 -0

53 lines not on this page · raw message

package/unzip/Config.in new file +11 -0
new file mode 100644
index 0000000..0d98d28
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UNZIP
+	bool "unzip"
+	help
+	  UnZip is an extraction utility for archives compressed in
+	  .zip format (also called "zipfiles"). Although highly
+	  compatible both with PKWARE's PKZIP and PKUNZIP utilities
+	  for MS-DOS and with Info-ZIP's own Zip program, our primary
+	  objectives have been portability and non-MSDOS
+	  functionality.
+
+	  http://www.info-zip.org/UnZip.html
package/unzip/unzip.hash new file +2 -0
new file mode 100644
index 0000000..a138cc2
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz
package/unzip/unzip.mk new file +13 -0
new file mode 100644
index 0000000..cff5951
@@ -0,0 +1,13 @@
+################################################################################
+#
+# unzip
+#
+################################################################################
+
+UNZIP_VERSION = 60
+UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz
+UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+UNZIP_LICENSE = Info-ZIP
+UNZIP_LICENSE_FILES = LICENSE
+
+$(eval $(cmake-package))
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/2 unzip: new package

Quoted 3 lines · Luca Ceresoli
Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Quoted 38 lines
---
 package/Config.in                                  |  1 +
 ...a-CMakeFile.txt-to-ease-cross-compilation.patch | 53 ++++++++++++++++++++++
 package/unzip/Config.in                            | 11 +++++
 package/unzip/unzip.hash                           |  2 +
 package/unzip/unzip.mk                             | 13 ++++++
 5 files changed, 80 insertions(+)
 create mode 100644 package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch
 create mode 100644 package/unzip/Config.in
 create mode 100644 package/unzip/unzip.hash
 create mode 100644 package/unzip/unzip.mk
package/Config.in +1 -0
index 9e3494a..311d744 100644
@@ -54,6 +54,7 @@ endif
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
+	source "package/unzip/Config.in"
 	source "package/xz/Config.in"
 	source "package/zip/Config.in"
 endmenu
package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch new file +8 -0
new file mode 100644
index 0000000..cbc58e4
@@ -0,0 +1,53 @@
+From 992a497e9c5c421d3931e02a01e9d7c159f27135 Mon Sep 17 00:00:00 2001
+From: Luca Ceresoli <[email protected]>
+Date: Thu, 26 Nov 2015 12:49:10 +0100
+Subject: [PATCH] Add a CMakeFile.txt to ease cross-compilation
+
+Info-ZIP's UnZip 6.0 has a complex, hand-crafted Makefile with a
+companion configure script which try to support an extremely wide
+range of UNIX-like operating systems. The result is an overly complex

package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch line 18

Quoted 10 lines
package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch new file +10 -0
+mass of code that does not support cross-compilation in several ways.
+
+Zip 3.0 has a similar build system, and has as many as 6 patches in
+Buildroot to cross-compile [0]. UnZip fails at building even with
+these patches adapted and a few more on top of them.
+
+Instead of tweaking and fixing a huge and complex build system, skip
+it entirely and add a pretty simple CMakeLists.txt that cross-compiles
+smoothly using CMake. It also preserves all of the Buildroot-provided
+build options and flags as the original Makefile does.

Great idea!

Quoted 18 lines
package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch new file +18 -0
+
+[0] http://git.buildroot.net/buildroot/tree/package/infozip?id=2015.11-rc3
+
+Signed-off-by: Luca Ceresoli <[email protected]>
+---
+ CMakeLists.txt | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+ create mode 100644 CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..27951b4
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,17 @@
++cmake_minimum_required(VERSION 2.8)
++INCLUDE(CheckFunctionExists)
++

package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch line 46

Quoted 10 lines
package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch new file +10 -0
++project(unzip C)
++
++CHECK_FUNCTION_EXISTS(lchmod HAVE_LCHMOD)
++if(NOT HAVE_LCHMOD)
++add_definitions("-DNO_LCHMOD")
++endif()
++
++set(UNZIP_SOURCES unzip.c crc32.c crypt.c envargs.c explode.c
++  extract.c fileio.c globals.c inflate.c list.c match.c process.c
++  ttyio.c ubz2err.c unreduce.c unshrink.c zipinfo.c unix/unix.c)

To be upstreamable this should of course be made more generic to non-unix
systems, but since upstream is quite dead...

Regards,
Arnout

Quoted 52 lines
package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch new file +7 -0
++
++include_directories(.)
++add_executable(unzip ${UNZIP_SOURCES})
++install(TARGETS unzip DESTINATION bin)
+-- 
+1.9.1
+
package/unzip/Config.in new file +11 -0
new file mode 100644
index 0000000..0d98d28
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UNZIP
+	bool "unzip"
+	help
+	  UnZip is an extraction utility for archives compressed in
+	  .zip format (also called "zipfiles"). Although highly
+	  compatible both with PKWARE's PKZIP and PKUNZIP utilities
+	  for MS-DOS and with Info-ZIP's own Zip program, our primary
+	  objectives have been portability and non-MSDOS
+	  functionality.
+
+	  http://www.info-zip.org/UnZip.html
package/unzip/unzip.hash new file +2 -0
new file mode 100644
index 0000000..a138cc2
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz
package/unzip/unzip.mk new file +13 -0
new file mode 100644
index 0000000..cff5951
@@ -0,0 +1,13 @@
+################################################################################
+#
+# unzip
+#
+################################################################################
+
+UNZIP_VERSION = 60
+UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz
+UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+UNZIP_LICENSE = Info-ZIP
+UNZIP_LICENSE_FILES = LICENSE
+
+$(eval $(cmake-package))
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author
#3 lore raw

PATCH 2/2 unzip: new package

Dear Arnout,

Quoted 6 lines · Arnout Vandecappelle
Quoted 3 lines · Luca Ceresoli
Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Thanks Arnout. However I have to Nack my own patch... I realized it misses an if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS: busybox has unzip, but it's less featured than the InfoZip's one.

I'll respin with that fixed.

Mmh, weird, busybox has 'unzip', but no 'zip'.

Signature · 1 line
Luca
#4 lore raw

PATCH 2/2 unzip: new package

Quoted 8 lines · Luca Ceresoli

Dear Arnout,

Quoted 5 lines · Arnout Vandecappelle
Quoted 3 lines · Luca Ceresoli
Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
Quoted 7 lines
Quoted 1 line
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Thanks Arnout. However I have to Nack my own patch... I realized it misses an if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS: busybox has unzip, but it's less featured than the InfoZip's one.

I'll respin with that fixed.

Don't forget to add a dependency on busybox as well.

Regards,
Arnout

Quoted 3 lines

Mmh, weird, busybox has 'unzip', but no 'zip'.

Signature · 6 lines
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#5 lore raw

PATCH 2/2 unzip: new package

In reply to Luca Ceresoli

Hi Luca, all

Le 27/11/2015 18:38, Luca Ceresoli a ?crit :

Quoted 15 lines
Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
---
 package/Config.in                                  |  1 +
 ...a-CMakeFile.txt-to-ease-cross-compilation.patch | 53 ++++++++++++++++++++++
 package/unzip/Config.in                            | 11 +++++
 package/unzip/unzip.hash                           |  2 +
 package/unzip/unzip.mk                             | 13 ++++++
 5 files changed, 80 insertions(+)
 create mode 100644 package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch
 create mode 100644 package/unzip/Config.in
 create mode 100644 package/unzip/unzip.hash
 create mode 100644 package/unzip/unzip.mk

[snip]

package/unzip/Config.in line 2

Quoted 8 lines
package/unzip/Config.in new file +2 -0
new file mode 100644
index 0000000..0d98d28
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UNZIP
+	bool "unzip"

Have you checked some toolchain dependencies ?
It seems that process.c use wchar_t so "depends on BR2_USE_WCHAR" is needed.

Also, I checked if unzip build correctly with a musl and uClibc-ng toolchains.

Best regards,
Romain

Quoted 37 lines
package/unzip/Config.in new file +9 -0
+	help
+	  UnZip is an extraction utility for archives compressed in
+	  .zip format (also called "zipfiles"). Although highly
+	  compatible both with PKWARE's PKZIP and PKUNZIP utilities
+	  for MS-DOS and with Info-ZIP's own Zip program, our primary
+	  objectives have been portability and non-MSDOS
+	  functionality.
+
+	  http://www.info-zip.org/UnZip.html
package/unzip/unzip.hash new file +2 -0
new file mode 100644
index 0000000..a138cc2
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz
package/unzip/unzip.mk new file +13 -0
new file mode 100644
index 0000000..cff5951
@@ -0,0 +1,13 @@
+################################################################################
+#
+# unzip
+#
+################################################################################
+
+UNZIP_VERSION = 60
+UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz
+UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+UNZIP_LICENSE = Info-ZIP
+UNZIP_LICENSE_FILES = LICENSE
+
+$(eval $(cmake-package))
Signature · 8 lines
Romain Naour

OPEN WIDE Ing?nierie - Paris
23/25, rue Daviel| 75013 PARIS
http://ingenierie.openwide.fr

Le blog des technologies libres et embarqu?es :
http://www.linuxembedded.fr
author
#6 lore raw

PATCH 2/2 unzip: new package

Dear Romain,

Romain Naour wrote:
[...]

Quoted 11 lines

package/unzip/Config.in line 2

Quoted 8 lines
package/unzip/Config.in new file +2 -0
new file mode 100644
index 0000000..0d98d28
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UNZIP
+	bool "unzip"

Have you checked some toolchain dependencies ?
It seems that process.c use wchar_t so "depends on BR2_USE_WCHAR" is needed.

The CMakeLists.txt that I wrote does never define UNICODE_SUPPORT nor UNICODE_WCHAR. So it builds both with and without wchar support, but never uses it. I would like to have a basic package working, conditional support can be added later at any time.

Signature · 1 line
Luca
#7 lore raw

PATCH 2/2 unzip: new package

Hi Luca,

Le 29/11/2015 13:10, Luca Ceresoli a ?crit :

Quoted 16 lines

Dear Romain,

Romain Naour wrote:
[...]

Quoted 11 lines

package/unzip/Config.in line 2

Quoted 8 lines
package/unzip/Config.in new file +2 -0
new file mode 100644
index 0000000..0d98d28
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UNZIP
+    bool "unzip"

Have you checked some toolchain dependencies ?
It seems that process.c use wchar_t so "depends on BR2_USE_WCHAR" is needed.

Quoted 5 lines

The CMakeLists.txt that I wrote does never define UNICODE_SUPPORT nor UNICODE_WCHAR. So it builds both with and without wchar support, but never uses it. I would like to have a basic package working, conditional support can be added later at any time.

Thanks for the answer, I only grepped for wchar_t, fork etc (usual build issues) and I missed the UNICODE_SUPPORT/UNICODE_WCHAR conditional... my bad. So your initial patch looks good except for the Busybox dependency as you noticed ;-)

Best regards,
Romain

#8 lore raw

PATCH 1/2 infozip: rename to zip

In reply to Luca Ceresoli
Quoted 8 lines · Luca Ceresoli

We currently have a package named "infozip" for Info-Zip's Zip.

With the upcoming addition of a package the Info-Zip's UnZip the name is becoming ambiguous. Rename it to the more specific name "zip".

Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

I was a bit worried that 'zip' is not a very distinctive name, but I couldn't
find anything like that so I guess it's OK.

Regards,
Arnout

Quoted 182 lines
---
 Config.in.legacy                                   | 12 ++++++++
 package/Config.in                                  |  2 +-
 ...emove-Check-C-compiler-type-optimization-.patch |  0
 .../0002-configure-Don-t-use-host-CPP.patch        |  0
 ...003-Makefile-Use-CFLAGS-from-command-line.patch |  0
 ...4-configure-use-LDFLAGS-from-command-line.patch |  0
 ...-unix-configure-remove-GID-UID-size-check.patch |  0
 ...figure-borrow-the-LFS-test-from-autotools.patch |  0
 package/{infozip => zip}/Config.in                 |  4 +--
 package/{infozip/infozip.hash => zip/zip.hash}     |  0
 package/{infozip/infozip.mk => zip/zip.mk}         | 32 +++++++++++-----------
 11 files changed, 31 insertions(+), 19 deletions(-)
 rename package/{infozip => zip}/0001-configure-Remove-Check-C-compiler-type-optimization-.patch (100%)
 rename package/{infozip => zip}/0002-configure-Don-t-use-host-CPP.patch (100%)
 rename package/{infozip => zip}/0003-Makefile-Use-CFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0004-configure-use-LDFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0005-unix-configure-remove-GID-UID-size-check.patch (100%)
 rename package/{infozip => zip}/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch (100%)
 rename package/{infozip => zip}/Config.in (88%)
 rename package/{infozip/infozip.hash => zip/zip.hash} (100%)
 rename package/{infozip/infozip.mk => zip/zip.mk} (66%)
Config.in.legacy +12 -0
index c5b8223..2bbf2ed 100644
@@ -105,6 +105,18 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2016.02"
+
+config BR2_PACKAGE_INFOZIP
+	bool "infozip option has been renamed to zip"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ZIP
+	help
+	  Info-Zip's Zip package has been renamed from infozip to zip,
+	  to avoid ambiguities with Info-Zip's UnZip which has been added
+	  in the unzip package.
+
+###############################################################################
 comment "Legacy options removed in 2015.11"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL
package/Config.in +1 -1
index 988fe84..9e3494a 100644
@@ -51,11 +51,11 @@ menu "Compressors and decompressors"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/gzip/Config.in"
 endif
-	source "package/infozip/Config.in"
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
 	source "package/xz/Config.in"
+	source "package/zip/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch renamed from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch +0 -0
similarity index 100%
rename from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
rename to package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
package/zip/0002-configure-Don-t-use-host-CPP.patch renamed from package/infozip/0002-configure-Don-t-use-host-CPP.patch +0 -0
similarity index 100%
rename from package/infozip/0002-configure-Don-t-use-host-CPP.patch
rename to package/zip/0002-configure-Don-t-use-host-CPP.patch
package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch renamed from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch
rename to package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
package/zip/0004-configure-use-LDFLAGS-from-command-line.patch renamed from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch
rename to package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
package/zip/0005-unix-configure-remove-GID-UID-size-check.patch renamed from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch +0 -0
similarity index 100%
rename from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch
rename to package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch renamed from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch +0 -0
similarity index 100%
rename from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
rename to package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
package/zip/Config.in renamed from package/infozip/Config.in +2 -2
similarity index 88%
rename from package/infozip/Config.in
rename to package/zip/Config.in
index cfd7533..4b6360a 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_INFOZIP
-	bool "infozip"
+config BR2_PACKAGE_ZIP
+	bool "zip"
 	help
 	  Zip is a compression and file packaging/archive utility.
 	  Although highly compatible both with PKWARE's PKZIP and
package/zip/zip.hash renamed from package/infozip/infozip.hash +0 -0
similarity index 100%
rename from package/infozip/infozip.hash
rename to package/zip/zip.hash
package/zip/zip.mk renamed from package/infozip/infozip.mk +16 -16
similarity index 66%
rename from package/infozip/infozip.mk
rename to package/zip/zip.mk
index e57f7e1..5338f88 100644
@@ -1,51 +1,51 @@
 ################################################################################
 #
-# infozip
+# zip
 #
 ################################################################################
 
-INFOZIP_VERSION = 30
-INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-INFOZIP_LICENSE = Info-ZIP
-INFOZIP_LICENSE_FILES = LICENSE
+ZIP_VERSION = 30
+ZIP_SOURCE = zip$(ZIP_VERSION).tgz
+ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+ZIP_LICENSE = Info-ZIP
+ZIP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-INFOZIP_DEPENDENCIES += bzip2
+ZIP_DEPENDENCIES += bzip2
 endif
 
 # Infozip's default CFLAGS.
-INFOZIP_CFLAGS = -I. -DUNIX
+ZIP_CFLAGS = -I. -DUNIX
 
 # Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was
 # removed since it can't work for cross-compilation.
-INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT
+ZIP_CFLAGS += -DUIDGID_NOT_16BIT
 
 # infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
 # necessary, redefining it on the command line causes some warnings.
-INFOZIP_TARGET_CFLAGS = \
+ZIP_TARGET_CFLAGS = \
 	$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 
-define INFOZIP_BUILD_CMDS
+define ZIP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(TARGET_CC) -c" \
 		-f unix/Makefile generic
 endef
 
-define INFOZIP_INSTALL_TARGET_CMDS
+define ZIP_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(TARGET_DIR)/usr
 endef
 
-define HOST_INFOZIP_BUILD_CMDS
+define HOST_ZIP_BUILD_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(HOSTCC) -c" \
 		-f unix/Makefile generic
 endef
 
-define HOST_INFOZIP_INSTALL_CMDS
+define HOST_ZIP_INSTALL_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(HOST_DIR)/usr
 endef
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#9 lore raw

PATCH 1/2 infozip: rename to zip

Hi Luca, Arnout,

Le 27/11/2015 22:38, Arnout Vandecappelle a ?crit :

Quoted 6 lines · Luca Ceresoli
Quoted 5 lines

We currently have a package named "infozip" for Info-Zip's Zip.

With the upcoming addition of a package the Info-Zip's UnZip the name is becoming ambiguous. Rename it to the more specific name "zip".

Quoted 8 lines
Quoted 3 lines
Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

I was a bit worried that 'zip' is not a very distinctive name, but I couldn't
find anything like that so I guess it's OK.

Maybe new user will find more likely zip package than infozip...

Reviewed-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 188 lines

Regards,
Arnout

Quoted 182 lines
---
 Config.in.legacy                                   | 12 ++++++++
 package/Config.in                                  |  2 +-
 ...emove-Check-C-compiler-type-optimization-.patch |  0
 .../0002-configure-Don-t-use-host-CPP.patch        |  0
 ...003-Makefile-Use-CFLAGS-from-command-line.patch |  0
 ...4-configure-use-LDFLAGS-from-command-line.patch |  0
 ...-unix-configure-remove-GID-UID-size-check.patch |  0
 ...figure-borrow-the-LFS-test-from-autotools.patch |  0
 package/{infozip => zip}/Config.in                 |  4 +--
 package/{infozip/infozip.hash => zip/zip.hash}     |  0
 package/{infozip/infozip.mk => zip/zip.mk}         | 32 +++++++++++-----------
 11 files changed, 31 insertions(+), 19 deletions(-)
 rename package/{infozip => zip}/0001-configure-Remove-Check-C-compiler-type-optimization-.patch (100%)
 rename package/{infozip => zip}/0002-configure-Don-t-use-host-CPP.patch (100%)
 rename package/{infozip => zip}/0003-Makefile-Use-CFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0004-configure-use-LDFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0005-unix-configure-remove-GID-UID-size-check.patch (100%)
 rename package/{infozip => zip}/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch (100%)
 rename package/{infozip => zip}/Config.in (88%)
 rename package/{infozip/infozip.hash => zip/zip.hash} (100%)
 rename package/{infozip/infozip.mk => zip/zip.mk} (66%)
Config.in.legacy +12 -0
index c5b8223..2bbf2ed 100644
@@ -105,6 +105,18 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2016.02"
+
+config BR2_PACKAGE_INFOZIP
+	bool "infozip option has been renamed to zip"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ZIP
+	help
+	  Info-Zip's Zip package has been renamed from infozip to zip,
+	  to avoid ambiguities with Info-Zip's UnZip which has been added
+	  in the unzip package.
+
+###############################################################################
 comment "Legacy options removed in 2015.11"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL
package/Config.in +1 -1
index 988fe84..9e3494a 100644
@@ -51,11 +51,11 @@ menu "Compressors and decompressors"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/gzip/Config.in"
 endif
-	source "package/infozip/Config.in"
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
 	source "package/xz/Config.in"
+	source "package/zip/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch renamed from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch +0 -0
similarity index 100%
rename from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
rename to package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
package/zip/0002-configure-Don-t-use-host-CPP.patch renamed from package/infozip/0002-configure-Don-t-use-host-CPP.patch +0 -0
similarity index 100%
rename from package/infozip/0002-configure-Don-t-use-host-CPP.patch
rename to package/zip/0002-configure-Don-t-use-host-CPP.patch
package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch renamed from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch
rename to package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
package/zip/0004-configure-use-LDFLAGS-from-command-line.patch renamed from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch
rename to package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
package/zip/0005-unix-configure-remove-GID-UID-size-check.patch renamed from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch +0 -0
similarity index 100%
rename from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch
rename to package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch renamed from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch +0 -0
similarity index 100%
rename from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
rename to package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
package/zip/Config.in renamed from package/infozip/Config.in +2 -2
similarity index 88%
rename from package/infozip/Config.in
rename to package/zip/Config.in
index cfd7533..4b6360a 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_INFOZIP
-	bool "infozip"
+config BR2_PACKAGE_ZIP
+	bool "zip"
 	help
 	  Zip is a compression and file packaging/archive utility.
 	  Although highly compatible both with PKWARE's PKZIP and
package/zip/zip.hash renamed from package/infozip/infozip.hash +0 -0
similarity index 100%
rename from package/infozip/infozip.hash
rename to package/zip/zip.hash
package/zip/zip.mk renamed from package/infozip/infozip.mk +16 -16
similarity index 66%
rename from package/infozip/infozip.mk
rename to package/zip/zip.mk
index e57f7e1..5338f88 100644
@@ -1,51 +1,51 @@
 ################################################################################
 #
-# infozip
+# zip
 #
 ################################################################################
 
-INFOZIP_VERSION = 30
-INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-INFOZIP_LICENSE = Info-ZIP
-INFOZIP_LICENSE_FILES = LICENSE
+ZIP_VERSION = 30
+ZIP_SOURCE = zip$(ZIP_VERSION).tgz
+ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+ZIP_LICENSE = Info-ZIP
+ZIP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-INFOZIP_DEPENDENCIES += bzip2
+ZIP_DEPENDENCIES += bzip2
 endif
 
 # Infozip's default CFLAGS.
-INFOZIP_CFLAGS = -I. -DUNIX
+ZIP_CFLAGS = -I. -DUNIX
 
 # Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was
 # removed since it can't work for cross-compilation.
-INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT
+ZIP_CFLAGS += -DUIDGID_NOT_16BIT
 
 # infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
 # necessary, redefining it on the command line causes some warnings.
-INFOZIP_TARGET_CFLAGS = \
+ZIP_TARGET_CFLAGS = \
 	$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 
-define INFOZIP_BUILD_CMDS
+define ZIP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(TARGET_CC) -c" \
 		-f unix/Makefile generic
 endef
 
-define INFOZIP_INSTALL_TARGET_CMDS
+define ZIP_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(TARGET_DIR)/usr
 endef
 
-define HOST_INFOZIP_BUILD_CMDS
+define HOST_ZIP_BUILD_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(HOSTCC) -c" \
 		-f unix/Makefile generic
 endef
 
-define HOST_INFOZIP_INSTALL_CMDS
+define HOST_ZIP_INSTALL_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(HOST_DIR)/usr
 endef
Signature · 8 lines
Romain Naour

OPEN WIDE Ing?nierie - Paris
23/25, rue Daviel| 75013 PARIS
http://ingenierie.openwide.fr

Le blog des technologies libres et embarqu?es :
http://www.linuxembedded.fr
Applied
#10 lore raw

PATCH 1/2 infozip: rename to zip

In reply to Luca Ceresoli

Dear Luca Ceresoli,

Quoted 22 lines · Luca Ceresoli

We currently have a package named "infozip" for Info-Zip's Zip.

With the upcoming addition of a package the Info-Zip's UnZip the name is becoming ambiguous. Rename it to the more specific name "zip".

Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
---
 Config.in.legacy                                   | 12 ++++++++
 package/Config.in                                  |  2 +-
 ...emove-Check-C-compiler-type-optimization-.patch |  0
 .../0002-configure-Don-t-use-host-CPP.patch        |  0
 ...003-Makefile-Use-CFLAGS-from-command-line.patch |  0
 ...4-configure-use-LDFLAGS-from-command-line.patch |  0
 ...-unix-configure-remove-GID-UID-size-check.patch |  0
 ...figure-borrow-the-LFS-test-from-autotools.patch |  0
 package/{infozip => zip}/Config.in                 |  4 +--
 package/{infozip/infozip.hash => zip/zip.hash}     |  0
 package/{infozip/infozip.mk => zip/zip.mk}         | 32 +++++++++++-----------
 11 files changed, 31 insertions(+), 19 deletions(-)
 rename package/{infozip => zip}/0001-configure-Remove-Check-C-compiler-type-optimization-.patch (100%)
Quoted 8 lines
 rename package/{infozip => zip}/0002-configure-Don-t-use-host-CPP.patch (100%)
 rename package/{infozip => zip}/0003-Makefile-Use-CFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0004-configure-use-LDFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0005-unix-configure-remove-GID-UID-size-check.patch (100%)
 rename package/{infozip => zip}/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch (100%)
 rename package/{infozip => zip}/Config.in (88%)
 rename package/{infozip/infozip.hash => zip/zip.hash} (100%)
 rename package/{infozip/infozip.mk => zip/zip.mk} (66%)

Applied to next, thanks. Your second patch had some comments, so I will wait for an updated version.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#11 lore raw

PATCH 1/2 infozip: rename to zip

In reply to Luca Ceresoli

Luca, All,

On 2015-11-27 18:38 +0100, Luca Ceresoli spake thusly:

Quoted 4 lines

We currently have a package named "infozip" for Info-Zip's Zip.

With the upcoming addition of a package the Info-Zip's UnZip the name is becoming ambiguous. Rename it to the more specific name "zip".

You broke Kodi:

make[1]: *** No rule to make target host-infozip-all-source', needed by kodi-all-source'. Stop.

I'll fix. ;-)

Regards,
Yann E. MORIN.

Quoted 191 lines
Signed-off-by Luca Ceresoli <[email protected]>
Cc Romain Naour <[email protected]>
Cc Jan Pedersen <[email protected]>
---
 Config.in.legacy                                   | 12 ++++++++
 package/Config.in                                  |  2 +-
 ...emove-Check-C-compiler-type-optimization-.patch |  0
 .../0002-configure-Don-t-use-host-CPP.patch        |  0
 ...003-Makefile-Use-CFLAGS-from-command-line.patch |  0
 ...4-configure-use-LDFLAGS-from-command-line.patch |  0
 ...-unix-configure-remove-GID-UID-size-check.patch |  0
 ...figure-borrow-the-LFS-test-from-autotools.patch |  0
 package/{infozip => zip}/Config.in                 |  4 +--
 package/{infozip/infozip.hash => zip/zip.hash}     |  0
 package/{infozip/infozip.mk => zip/zip.mk}         | 32 +++++++++++-----------
 11 files changed, 31 insertions(+), 19 deletions(-)
 rename package/{infozip => zip}/0001-configure-Remove-Check-C-compiler-type-optimization-.patch (100%)
 rename package/{infozip => zip}/0002-configure-Don-t-use-host-CPP.patch (100%)
 rename package/{infozip => zip}/0003-Makefile-Use-CFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0004-configure-use-LDFLAGS-from-command-line.patch (100%)
 rename package/{infozip => zip}/0005-unix-configure-remove-GID-UID-size-check.patch (100%)
 rename package/{infozip => zip}/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch (100%)
 rename package/{infozip => zip}/Config.in (88%)
 rename package/{infozip/infozip.hash => zip/zip.hash} (100%)
 rename package/{infozip/infozip.mk => zip/zip.mk} (66%)
Config.in.legacy +12 -0
index c5b8223..2bbf2ed 100644
@@ -105,6 +105,18 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2016.02"
+
+config BR2_PACKAGE_INFOZIP
+	bool "infozip option has been renamed to zip"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ZIP
+	help
+	  Info-Zip's Zip package has been renamed from infozip to zip,
+	  to avoid ambiguities with Info-Zip's UnZip which has been added
+	  in the unzip package.
+
+###############################################################################
 comment "Legacy options removed in 2015.11"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL
package/Config.in +1 -1
index 988fe84..9e3494a 100644
@@ -51,11 +51,11 @@ menu "Compressors and decompressors"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/gzip/Config.in"
 endif
-	source "package/infozip/Config.in"
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
 	source "package/xz/Config.in"
+	source "package/zip/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch renamed from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch +0 -0
similarity index 100%
rename from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
rename to package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
package/zip/0002-configure-Don-t-use-host-CPP.patch renamed from package/infozip/0002-configure-Don-t-use-host-CPP.patch +0 -0
similarity index 100%
rename from package/infozip/0002-configure-Don-t-use-host-CPP.patch
rename to package/zip/0002-configure-Don-t-use-host-CPP.patch
package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch renamed from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch
rename to package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
package/zip/0004-configure-use-LDFLAGS-from-command-line.patch renamed from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch +0 -0
similarity index 100%
rename from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch
rename to package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
package/zip/0005-unix-configure-remove-GID-UID-size-check.patch renamed from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch +0 -0
similarity index 100%
rename from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch
rename to package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch renamed from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch +0 -0
similarity index 100%
rename from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
rename to package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
package/zip/Config.in renamed from package/infozip/Config.in +2 -2
similarity index 88%
rename from package/infozip/Config.in
rename to package/zip/Config.in
index cfd7533..4b6360a 100644
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_INFOZIP
-	bool "infozip"
+config BR2_PACKAGE_ZIP
+	bool "zip"
 	help
 	  Zip is a compression and file packaging/archive utility.
 	  Although highly compatible both with PKWARE's PKZIP and
package/zip/zip.hash renamed from package/infozip/infozip.hash +0 -0
similarity index 100%
rename from package/infozip/infozip.hash
rename to package/zip/zip.hash
package/zip/zip.mk renamed from package/infozip/infozip.mk +16 -16
similarity index 66%
rename from package/infozip/infozip.mk
rename to package/zip/zip.mk
index e57f7e1..5338f88 100644
@@ -1,51 +1,51 @@
 ################################################################################
 #
-# infozip
+# zip
 #
 ################################################################################
 
-INFOZIP_VERSION = 30
-INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-INFOZIP_LICENSE = Info-ZIP
-INFOZIP_LICENSE_FILES = LICENSE
+ZIP_VERSION = 30
+ZIP_SOURCE = zip$(ZIP_VERSION).tgz
+ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+ZIP_LICENSE = Info-ZIP
+ZIP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-INFOZIP_DEPENDENCIES += bzip2
+ZIP_DEPENDENCIES += bzip2
 endif
 
 # Infozip's default CFLAGS.
-INFOZIP_CFLAGS = -I. -DUNIX
+ZIP_CFLAGS = -I. -DUNIX
 
 # Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was
 # removed since it can't work for cross-compilation.
-INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT
+ZIP_CFLAGS += -DUIDGID_NOT_16BIT
 
 # infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
 # necessary, redefining it on the command line causes some warnings.
-INFOZIP_TARGET_CFLAGS = \
+ZIP_TARGET_CFLAGS = \
 	$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 
-define INFOZIP_BUILD_CMDS
+define ZIP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(TARGET_CC) -c" \
 		-f unix/Makefile generic
 endef
 
-define INFOZIP_INSTALL_TARGET_CMDS
+define ZIP_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(TARGET_DIR)/usr
 endef
 
-define HOST_INFOZIP_BUILD_CMDS
+define HOST_ZIP_BUILD_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(HOSTCC) -c" \
 		-f unix/Makefile generic
 endef
 
-define HOST_INFOZIP_INSTALL_CMDS
+define HOST_ZIP_INSTALL_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(HOST_DIR)/usr
 endef
Signature · 6 lines
1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'