* [Buildroot] [PATCH 1/2] added infozip package
@ 2013-01-10 10:13 Jan Pedersen
2013-01-10 10:13 ` [Buildroot] [PATCH 2/2] now using generic-package Jan Pedersen
2013-01-10 10:22 ` [Buildroot] [PATCH 1/2] added infozip package Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Jan Pedersen @ 2013-01-10 10:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jan Pedersen <jp@jp-embedded.com>
---
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
diff --git a/package/Config.in b/package/Config.in
index bd1db6b..1c2b228 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/infozip/Config.in b/package/infozip/Config.in
new file mode 100644
index 0000000..1a4b756
--- /dev/null
+++ b/package/infozip/Config.in
@@ -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
diff --git a/package/infozip/infozip.mk b/package/infozip/infozip.mk
new file mode 100644
index 0000000..996a709
--- /dev/null
+++ b/package/infozip/infozip.mk
@@ -0,0 +1,43 @@
+#############################################################
+#
+# 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)
+
+$(DL_DIR)/$(INFOZIP_SOURCE):
+ $(call DOWNLOAD,$(INFOZIP_SITE)/$(INFOZIP_SOURCE))
+
+$(INFOZIP_DIR)/.source: $(DL_DIR)/$(INFOZIP_SOURCE)
+ $(ZCAT) $(DL_DIR)/$(INFOZIP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
+$(INFOZIP_DIR)/.build: $(INFOZIP_DIR)/.source
+ make -C $(INFOZIP_DIR) -f unix/Makefile generic CC=$(TARGET_CC)
+ touch $@
+
+$(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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] now using generic-package
2013-01-10 10:13 [Buildroot] [PATCH 1/2] added infozip package Jan Pedersen
@ 2013-01-10 10:13 ` Jan Pedersen
2013-01-10 10:22 ` [Buildroot] [PATCH 1/2] added infozip package Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Jan Pedersen @ 2013-01-10 10:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jan Pedersen <jp@jp-embedded.com>
---
package/infozip/infozip.mk | 46 ++++++++++++--------------------------------
1 file changed, 12 insertions(+), 34 deletions(-)
diff --git a/package/infozip/infozip.mk b/package/infozip/infozip.mk
index 996a709..ce6e88f 100644
--- a/package/infozip/infozip.mk
+++ b/package/infozip/infozip.mk
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/2] added infozip package
2013-01-10 10:13 [Buildroot] [PATCH 1/2] added infozip package Jan Pedersen
2013-01-10 10:13 ` [Buildroot] [PATCH 2/2] now using generic-package Jan Pedersen
@ 2013-01-10 10:22 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2013-01-10 10:22 UTC (permalink / raw)
To: buildroot
Dear Jan Pedersen,
On Thu, 10 Jan 2013 11:13:27 +0100, Jan Pedersen wrote:
>
> Signed-off-by: Jan Pedersen <jp@jp-embedded.com>
> ---
> 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 <jp@jp-embedded.com>
===
And exit your text editor.
And voil?, you have only one commit combining your two changes.
Thanks!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-10 10:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-10 10:13 [Buildroot] [PATCH 1/2] added infozip package Jan Pedersen
2013-01-10 10:13 ` [Buildroot] [PATCH 2/2] now using generic-package Jan Pedersen
2013-01-10 10:22 ` [Buildroot] [PATCH 1/2] added infozip package Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox