[buildroot] small fix to mtd

Giuseppe Ciotta giuseppe at telvia.it
Thu Mar 16 11:09:06 UTC 2006


fixes the download directory of the mtd package.
-- 
Giuseppe Ciotta
(string 99 105 97 111)
-------------- next part --------------
diff -Nru buildroot-old/package/mtd/Config.in buildroot/package/mtd/Config.in
--- buildroot-old/package/mtd/Config.in	2006-02-28 09:15:32.000000000 +0100
+++ buildroot/package/mtd/Config.in	2006-03-01 10:10:55.000000000 +0100
@@ -38,6 +38,14 @@
 	  use a specific and private MTD package.
 	  Default is mtd_20050122.orig.tar.gz
 
+config BR2_PACKAGE_MTD_DEST_STRING
+	string "MTD destination directory on target"
+	depends on BR2_PACKAGE_MTD
+	default "/sbin"
+	help
+	  Target directory for mtd tools
+
+
 endmenu
 
 menu "MTD tools selection"
diff -Nru buildroot-old/package/mtd/mtd.mk buildroot/package/mtd/mtd.mk
--- buildroot-old/package/mtd/mtd.mk	2006-02-28 09:15:32.000000000 +0100
+++ buildroot/package/mtd/mtd.mk	2006-02-28 13:03:12.000000000 +0100
@@ -37,7 +37,7 @@
 
 $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE_GENERIC)
 	$(MTD_UNZIP) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	mv $(TOOL_BUILD_DIR)/$(shell tar tjf dl/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_HOST_DIR)
+	mv $(TOOL_BUILD_DIR)/$(shell tar tjf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_HOST_DIR)
 	touch $(MTD_HOST_DIR)/.unpacked
 else
 ifneq ($(MTD_SOURCE),)
@@ -47,7 +47,7 @@
 
 $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
 	$(MTD_UNZIP) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	mv $(TOOL_BUILD_DIR)/$(shell tar tzf dl/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_HOST_DIR)
+	mv $(TOOL_BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_HOST_DIR)
 	toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
 		package/mtd \*.patch
 	touch $(MTD_HOST_DIR)/.unpacked
@@ -75,10 +75,10 @@
 $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
 	$(MTD_UNZIP) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifeq ($(strip $(BR2_PACKAGE_MTD_SNAPSHOT)),y)
-	mv $(BUILD_DIR)/$(shell tar tjf dl/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_DIR)
+	mv $(BUILD_DIR)/$(shell tar tjf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_DIR)
 	touch $(MTD_DIR)/.unpacked
 else
-	mv $(BUILD_DIR)/$(shell tar tzf dl/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_DIR)
+	mv $(BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 | xargs basename) $(MTD_DIR)
 	toolchain/patch-kernel.sh $(MTD_DIR) \
 		package/mtd \*.patch
 	touch $(MTD_DIR)/.unpacked
@@ -114,9 +114,9 @@
 	CFLAGS="-I$(LINUX_HEADERS_DIR)/include $(TARGET_CFLAGS)" \
 	$(MAKE)	CC=$(TARGET_CC) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util
 
-MTD_TARGETS := $(addprefix $(TARGET_DIR)/usr/sbin/, $(MTD_TARGETS_y))
+MTD_TARGETS := $(addprefix $(TARGET_DIR)/$(BR2_PACKAGE_MTD_DEST_STRING)/, $(MTD_TARGETS_y))
 
-$(MTD_TARGETS): $(TARGET_DIR)/usr/sbin/% : $(MTD_DIR)/util/%
+$(MTD_TARGETS): $(TARGET_DIR)/$(BR2_PACKAGE_MTD_DEST_STRING)/% : $(MTD_DIR)/util/%
 	cp -f $< $@
 	$(STRIP) $@
 


More information about the uClibc mailing list