mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-23 05:23:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

package: replace mkdosfs with dosfstools

Browse Source 
Closes #451

Move from old unmaintained dosfstools-2.11 (packaged as mkdosfs) to
now maintained dosfstools-3.0.3.

Allow each binary to be installed independently.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Tested-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Mike Crowe 2009-06-18 13:29:02 +01:00 committed by Peter Korsgaard
parent 76dade1788
commit f26acf61eb
6 changed files with 99 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -39,6 +39,7 @@
#417: New package spawn-fcgi
#419: Bump lighttpd package to 1.4.23
#421: toolchain: Clean up toolchain locale support menu
#451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
#467: DirectFB 1.4.1
#473: memstat_0.5.tar.gz has install with -D and that fails "make"

2
package/Config.in
View File

@ -236,6 +236,7 @@ source "package/dbus-glib/Config.in"
source "package/dbus-python/Config.in"
source "package/devmem2/Config.in"
source "package/dmraid/Config.in"
source "package/dosfstools/Config.in"
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
source "package/fconfig/Config.in"
@ -258,7 +259,6 @@ source "package/lm-sensors/Config.in"
source "package/lvm2/Config.in"
source "package/mdadm/Config.in"
source "package/memtester/Config.in"
source "package/mkdosfs/Config.in"
source "package/mtd/Config.in"
source "package/ntfs-3g/Config.in"
source "package/pciutils/Config.in"

24
package/dosfstools/Config.in Normal file
View File

@ -0,0 +1,24 @@
config BR2_PACKAGE_DOSFSTOOLS
bool "dosfstools"
help
Tools for creating and checking DOS FAT filesystems.
http://www.daniel-baumann.ch/software/dosfstools/
config BR2_PACKAGE_DOSFSTOOLS_MKDOSFS
bool "mkdosfs"
depends on BR2_PACKAGE_DOSFSTOOLS
help
Creates a DOS FAT filesystem on a device.
config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK
bool "dosfsck"
depends on BR2_PACKAGE_DOSFSTOOLS
help
Checks a DOS FAT filesystem.
config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL
bool "dosfslabel"
depends on BR2_PACKAGE_DOSFSTOOLS
help
Get or set the DOS FAT filesystem label.

73
package/dosfstools/dosfstools.mk Normal file
View File

@ -0,0 +1,73 @@
#############################################################
#
# 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: uclibc $(TARGET_DIR)/$(DOSFSTOOLS_TARGET_BINARY) $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
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_MKDOSFS),y)
TARGETS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
endif
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y)
TARGETS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
endif
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y)
TARGETS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)
endif

6
package/mkdosfs/Config.in
View File

@ -1,6 +0,0 @@
config BR2_PACKAGE_MKDOSFS
bool "mkdosfs"
help
Creates a DOS FAT filesystem on a device.
ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/

48
package/mkdosfs/mkdosfs.mk
View File

@ -1,48 +0,0 @@
#############################################################
#
# mkdosfs
#
#############################################################
MKDOSFS_VERSION:=2.11
MKDOSFS_SOURCE:=dosfstools-$(MKDOSFS_VERSION).src.tar.gz
MKDOSFS_SITE:=http://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools
MKDOSFS_DIR:=$(BUILD_DIR)/dosfstools-$(MKDOSFS_VERSION)
MKDOSFS_CAT:=$(ZCAT)
MKDOSFS_BINARY:=mkdosfs/mkdosfs
MKDOSFS_TARGET_BINARY:=sbin/mkdosfs
$(DL_DIR)/$(MKDOSFS_SOURCE):
$(call DOWNLOAD,$(MKDOSFS_SITE),$(MKDOSFS_SOURCE))
mkdosfs-source: $(DL_DIR)/$(MKDOSFS_SOURCE)
$(MKDOSFS_DIR)/.unpacked: $(DL_DIR)/$(MKDOSFS_SOURCE)
$(MKDOSFS_CAT) $(DL_DIR)/$(MKDOSFS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(MKDOSFS_DIR)/.unpacked
$(MKDOSFS_DIR)/$(MKDOSFS_BINARY): $(MKDOSFS_DIR)/.unpacked
$(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" -C $(MKDOSFS_DIR)
$(STRIPCMD) $(MKDOSFS_DIR)/mkdosfs/mkdosfs
touch -c $(MKDOSFS_DIR)/mkdosfs/mkdosfs
$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(MKDOSFS_DIR)/$(MKDOSFS_BINARY)
cp -a $(MKDOSFS_DIR)/$(MKDOSFS_BINARY) $@
touch -c $@
mkdosfs: uclibc $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
mkdosfs-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKDOSFS_DIR) uninstall
-$(MAKE) -C $(MKDOSFS_DIR) clean
mkdosfs-dirclean:
rm -rf $(MKDOSFS_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_MKDOSFS),y)
TARGETS+=mkdosfs
endif