Skip to contentSkip to conversation

added infozip package

PATCH New Jan Pedersen 2 participants 3 messages Jan 10, 2013

lore
Share & tools
lore

Jan Pedersen

author
#0 lore raw

PATCH 1/2 added infozip package

Signed-off-by Jan Pedersen <[email protected]>
---
 package/Config.in          |    1 +
 package/infozip/Config.in  |   10 ++++++++++
 package/infozip/infozip.mk |   43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/infozip/Config.in
 create mode 100644 package/infozip/infozip.mk
package/Config.in +1 -0
index bd1db6b..1c2b228 100644
@@ -14,6 +14,7 @@ endif
 source "package/lzop/Config.in"
 source "package/lzma/Config.in"
 source "package/xz/Config.in"
+source "package/infozip/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
package/infozip/Config.in new file +10 -0
new file mode 100644
index 0000000..1a4b756
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_INFOZIP
+	bool "infozip"
+	help
+	  Zip is a compression and file packaging/archive utility. 
+	  Although highly compatible both with PKWARE's PKZIP and 
+	  PKUNZIP utilities for MS-DOS and with Info-ZIP's own UnZip, 
+ 	  our primary objectives have been portability and other-than-MSDOS 
+	  functionality. 
+
+	  http://infozip.sourceforge.net/Zip.html
package/infozip/infozip.mk new file +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 2/2 now using generic-package

Signed-off-by Jan Pedersen <[email protected]>
---
 package/infozip/infozip.mk |   46 ++++++++++++--------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)
package/infozip/infozip.mk +12 -34
index 996a709..ce6e88f 100644
@@ -3,41 +3,19 @@
 # infozip
 #
 #############################################################
-INFOZIP_VERSION:=30
-INFOZIP_SOURCE:=zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE:=ftp://ftp.info-zip.org/pub/infozip/src/
-INFOZIP_DIR = $(BUILD_DIR)/zip$(INFOZIP_VERSION)
+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 = LICENCE
 
-$(DL_DIR)/$(INFOZIP_SOURCE):
-	$(call DOWNLOAD,$(INFOZIP_SITE)/$(INFOZIP_SOURCE))
+define INFOZIP_BUILD_CMDS
+	$(MAKE) -C $(@D) -f unix/Makefile generic CC=$(TARGET_CC)
+endef
 
-$(INFOZIP_DIR)/.source: $(DL_DIR)/$(INFOZIP_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(INFOZIP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $@
+define INFOZIP_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) -f unix/Makefile install prefix=$(TARGET_DIR)/usr CC=$(TARGET_CC)
+endef
 
-$(INFOZIP_DIR)/.build: $(INFOZIP_DIR)/.source
-	make -C $(INFOZIP_DIR) -f unix/Makefile generic CC=$(TARGET_CC)
-	touch $@
+$(eval $(generic-package))
 
-$(INFOZIP_DIR)/.install: $(INFOZIP_DIR)/.build
-	make -C $(INFOZIP_DIR) -f unix/Makefile install prefix=$(TARGET_DIR)/usr CC=$(TARGET_CC)
-	touch $@
-
-infozip: $(INFOZIP_DIR)/.install
-
-infozip-source: $(DL_DIR)/$(INFOZIP_SOURCE)
-
-infozip-clean:
-	rm -rf $(INFOZIP_DIR)
-
-infozip-dirclean:
-	rm -rf $(INFOZIP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_INFOZIP),y)
-TARGETS += infozip
-endif
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 1/2 added infozip package

In reply to Jan Pedersen

Dear Jan Pedersen,

Quoted 9 lines · Jan Pedersen
Signed-off-by Jan Pedersen <[email protected]>
---
 package/Config.in          |    1 +
 package/infozip/Config.in  |   10 ++++++++++
 package/infozip/infozip.mk |   43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 package/infozip/Config.in
 create mode 100644 package/infozip/infozip.mk

Thanks, but your patches 1/2 and 2/2 should be only one patch. Please merge them together.

In order to do that, you'll have to do an interactive git rebase:

1. Tell git to rebase the last two patches

git rebase -i HEAD~2

2. A text editor will open, which will show two lines

pick <some SHA1> added infozip package pick <some SHA1> now using generic-package

Change the "pick" word on the second line to "squash", and exit your text editor.

3. A new text editor will open, which allows you to edit the commit message. Change the commit message to be:

===
infozip: new package

This commit adds a package for infozip, compression and file packaging/archive utility.

Signed-off-by Jan Pedersen <[email protected]>

===

And exit your text editor.

And voil?, you have only one commit combining your two changes.

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com