From: Martin Banky <martin.banky@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 07/18] dosfstools: convert to gentargets and bump to 3.0.10
Date: Sun, 26 Sep 2010 00:13:58 -0700 [thread overview]
Message-ID: <1285485249-29212-7-git-send-email-Martin.Banky@gmail.com> (raw)
In-Reply-To: <1285485249-29212-1-git-send-email-Martin.Banky@gmail.com>
Signed-off-by: Martin Banky <Martin.Banky@gmail.com>
---
package/dosfstools/dosfstools.mk | 104 +++++++++++--------------------------
1 files changed, 31 insertions(+), 73 deletions(-)
diff --git a/package/dosfstools/dosfstools.mk b/package/dosfstools/dosfstools.mk
index a7f59f0..d7ebc94 100644
--- a/package/dosfstools/dosfstools.mk
+++ b/package/dosfstools/dosfstools.mk
@@ -3,76 +3,34 @@
# dosfstools
#
#############################################################
-DOSFSTOOLS_VERSION:=3.0.3
-DOSFSTOOLS_SOURCE:=dosfstools-$(DOSFSTOOLS_VERSION).tar.gz
-DOSFSTOOLS_SITE:=http://www.daniel-baumann.ch/software/dosfstools
-DOSFSTOOLS_DIR:=$(BUILD_DIR)/dosfstools-$(DOSFSTOOLS_VERSION)
-DOSFSTOOLS_CAT:=$(ZCAT)
-MKDOSFS_BINARY:=mkdosfs
-MKDOSFS_TARGET_BINARY:=sbin/mkdosfs
-DOSFSCK_BINARY:=dosfsck
-DOSFSCK_TARGET_BINARY:=sbin/dosfsck
-DOSFSLABEL_BINARY:=dosfslabel
-DOSFSLABEL_TARGET_BINARY:=sbin/dosfslabel
-
-$(DL_DIR)/$(DOSFSTOOLS_SOURCE):
- $(call DOWNLOAD,$(DOSFSTOOLS_SITE),$(DOSFSTOOLS_SOURCE))
-
-dosfstools-source: $(DL_DIR)/$(DOSFSTOOLS_SOURCE)
-
-$(DOSFSTOOLS_DIR)/.unpacked: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) $(wildcard local/dosfstools/dosfstools*.patch)
- $(DOSFSTOOLS_CAT) $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(DOSFSTOOLS_DIR) package/dosfstools/ dosfstools\*.patch
- touch $(DOSFSTOOLS_DIR)/.unpacked
-
-$(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_DIR)/.unpacked
- $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(DOSFSTOOLS_DIR)
- $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY)
- $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSCK_BINARY)
- $(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY)
- touch $@
-
-$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built
- cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@
- touch -c $@
-
-$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built
- cp -a $(DOSFSTOOLS_DIR)/$(DOSFSCK_BINARY) $@
- touch -c $@
-
-$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built
- cp -a $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) $@
- touch -c $@
-
-DOSFSTOOLS=
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y)
-DOSFSTOOLS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
-endif
-
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y)
-DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
-endif
-
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y)
-DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)
-endif
-
-dosfstools: $(DOSFSTOOLS)
-
-dosfstools-clean:
- rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
- rm -f $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
- rm -f $(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)
- -$(MAKE) -C $(DOSFSTOOLS_DIR) clean
-
-dosfstools-dirclean:
- rm -rf $(DOSFSTOOLS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS),y)
-TARGETS+=dosfstools
-endif
\ No newline at end of file
+DOSFSTOOLS_VERSION = 3.0.10
+DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.gz
+DOSFSTOOLS_SITE = http://www.daniel-baumann.ch/software/dosfstools
+MKDOSFS_BINARY = mkdosfs
+DOSFSCK_BINARY = dosfsck
+DOSFSLABEL_BINARY = dosfslabel
+
+define DOSFSTOOLS_BUILD_CMDS
+ $(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(@D)
+ $(STRIPCMD) $(@D)/$(MKDOSFS_BINARY)
+ $(STRIPCMD) $(@D)/$(DOSFSCK_BINARY)
+ $(STRIPCMD) $(@D)/$(DOSFSLABEL_BINARY)
+endef
+
+DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS)+=$(MKDOSFS_BINARY)
+DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK)+=$(DOSFSCK_BINARY)
+DOSFSTOOLS_INSTALL_BIN_FILES_$(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL)+=$(DOSFSLABEL_BINARY)
+
+define DOSFSTOOLS_INSTALL_TARGET_CMDS
+ test -z "$(DOSFSTOOLS_INSTALL_BIN_FILES_y)" || \
+ install -m 755 $(addprefix $(@D)/,$(DOSFSTOOLS_INSTALL_BIN_FILES_y)) $(TARGET_DIR)/sbin/
+endef
+
+define DOSFSTOOLS_CLEAN_CMDS
+ rm -f $(TARGET_DIR)/sbin/$(MKDOSFS_BINARY)
+ rm -f $(TARGET_DIR)/sbin/$(DOSFSCK_BINARY)
+ rm -f $(TARGET_DIR)/sbin/$(DOSFSLABEL_BINARY)
+ -$(MAKE) -C $(@D) clean
+endef
+
+$(eval $(call GENTARGETS,package,dosfstools))
--
1.7.3
next prev parent reply other threads:[~2010-09-26 7:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-26 7:13 [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6 Martin Banky
2010-09-26 7:13 ` [Buildroot] [PATCH 02/18] axel: convert to gentargets and bump to 2.4 Martin Banky
2010-09-26 21:12 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 03/18] boa: convert to gentargets Martin Banky
2010-09-26 19:21 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 04/18] bsdiff: " Martin Banky
2010-09-26 19:54 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 05/18] boa: convert to autotargets Martin Banky
2010-09-26 19:55 ` Peter Korsgaard
2010-09-26 21:22 ` Martin Banky
2010-09-26 22:04 ` Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 06/18] cvs: " Martin Banky
2010-09-30 12:34 ` Peter Korsgaard
2010-09-26 7:13 ` Martin Banky [this message]
2010-09-26 20:26 ` [Buildroot] [PATCH 07/18] dosfstools: convert to gentargets and bump to 3.0.10 Peter Korsgaard
2010-09-26 7:13 ` [Buildroot] [PATCH 08/18] ezxml: convert to gentargets Martin Banky
2010-09-26 12:35 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 09/18] fbset: " Martin Banky
2010-09-26 18:55 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 10/18] fconfig: convert to gentargets and bump to 20080329 Martin Banky
2010-09-29 20:15 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 11/18] gadgets-test: convert to gentargets Martin Banky
2010-09-29 20:27 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 12/18] hotplug: " Martin Banky
2010-09-26 20:14 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 13/18] hdparm: convert to gentargets and bump to 9.32 Martin Banky
2010-09-27 21:20 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 14/18] hwdata: convert to gentargets and bump to 0.230 Martin Banky
2010-09-26 20:35 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 15/18] liberation: convert to gentargets and bump to 1.06.0.20100721 Martin Banky
2010-09-29 20:30 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 16/18] lm-sensors: convert to gentargets and bump to 3.1.2 Martin Banky
2010-09-27 20:48 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 17/18] lockfile-progs: convert to gentargets and bump to 0.1.15 Martin Banky
2010-09-29 20:41 ` Peter Korsgaard
2010-09-26 7:14 ` [Buildroot] [PATCH 18/18] logrotate: convert to gentargets and bump to 3.7.9 Martin Banky
2010-09-26 20:54 ` Peter Korsgaard
2010-09-29 20:55 ` [Buildroot] [PATCH 01/18] acpid: convert to gentargets and bump to 2.0.6 Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285485249-29212-7-git-send-email-Martin.Banky@gmail.com \
--to=martin.banky@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox