* [Buildroot] svn commit: trunk/buildroot/package/mtd: mtd-utils.git
@ 2008-04-08 4:18 hamish at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: hamish at uclibc.org @ 2008-04-08 4:18 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-04-07 21:18:11 -0700 (Mon, 07 Apr 2008)
New Revision: 21667
Log:
Remove configuration item for git commit ID, as our patches are version-specific.
Upgrade to a newer version than the previous default.
Fix parallel compile issue.
Fix issue with quoting of URL.
Removed:
trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch
Modified:
trunk/buildroot/package/mtd/Config.in
trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk
Changeset:
Modified: trunk/buildroot/package/mtd/Config.in
===================================================================
--- trunk/buildroot/package/mtd/Config.in 2008-04-07 21:11:23 UTC (rev 21666)
+++ trunk/buildroot/package/mtd/Config.in 2008-04-08 04:18:11 UTC (rev 21667)
@@ -37,18 +37,6 @@
endchoice
-config BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID
- string "Commit ID to use"
- default "e6088d987c545d60a86e1f44836ab8ba072fffd9"
- depends on BR2_PACKAGE_MTD_UTILS_GIT
- help
- If you wish to use the mtd-utils.git tree as of a specific
- commit, you can enter the commit ID here (for example,
- e6088d987c545d60a86e1f44836ab8ba072fffd9).
-
- Alternatively you can specify HEAD. Note that the current
- HEAD will be downloaded but won't be tracked when it changes.
-
comment "MTD tools selection"
depends BR2_PACKAGE_MTD
Deleted: trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch
===================================================================
--- trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch 2008-04-07 21:11:23 UTC (rev 21666)
+++ trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch 2008-04-08 04:18:11 UTC (rev 21667)
@@ -1,10 +0,0 @@
---- mtd-utils-e6088d987c545d60a86e1f44836ab8ba072fffd9/ubi-utils/new-utils/src/ubicrc32.c.orig 2008-03-26 16:08:13.000000000 +1100
-+++ mtd-utils-e6088d987c545d60a86e1f44836ab8ba072fffd9/ubi-utils/new-utils/src/ubicrc32.c 2008-03-26 16:08:20.000000000 +1100
-@@ -26,7 +26,6 @@
- #include <stdint.h>
- #include <stdlib.h>
- #include <getopt.h>
--#include <argp.h>
- #include <unistd.h>
- #include <mtd/ubi-header.h>
-
Modified: trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk
===================================================================
--- trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk 2008-04-07 21:11:23 UTC (rev 21666)
+++ trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk 2008-04-08 04:18:11 UTC (rev 21667)
@@ -3,8 +3,7 @@
# mtd provides jffs2 utilities
#
#############################################################
-MTD_VERSION:=$(strip $(subst ",, $(BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID)))
-#"))
+MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
@@ -22,7 +21,7 @@
SUMTOOL := $(MTD_HOST_DIR)/sumtool
$(DL_DIR)/$(MTD_SOURCE):
- $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) $(MTD_URL)
+ $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) "$(MTD_URL)"
$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -64,6 +63,7 @@
#############################################################
$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ rm -rf $(MTD_DIR)
mv $(BUILD_DIR)/$(MTD_NAME) $(MTD_DIR)
toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-all\*.patch
toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-target\*.patch
@@ -108,7 +108,7 @@
$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
mkdir -p $(TARGET_DIR)/usr/sbin
- $(MAKE) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
BUILDDIR=$(MTD_DIR) \
CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mtd: mtd-utils.git
@ 2008-04-24 13:26 ninevoltz at uclibc.org
2008-04-24 13:54 ` Peter Korsgaard
0 siblings, 1 reply; 5+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 13:26 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 06:26:25 -0700 (Thu, 24 Apr 2008)
New Revision: 21840
Log:
add selectable commit id to mtd-utils
Added:
trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch
Modified:
trunk/buildroot/package/mtd/Config.in
trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk
Changeset:
Modified: trunk/buildroot/package/mtd/Config.in
===================================================================
--- trunk/buildroot/package/mtd/Config.in 2008-04-24 13:25:02 UTC (rev 21839)
+++ trunk/buildroot/package/mtd/Config.in 2008-04-24 13:26:25 UTC (rev 21840)
@@ -37,6 +37,18 @@
endchoice
+config BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID
+ string "Commit ID to use"
+ default "e6088d987c545d60a86e1f44836ab8ba072fffd9"
+ depends on BR2_PACKAGE_MTD_UTILS_GIT
+ help
+ If you wish to use the mtd-utils.git tree as of a specific
+ commit, you can enter the commit ID here (for example,
+ e6088d987c545d60a86e1f44836ab8ba072fffd9).
+
+ Alternatively you can specify HEAD. Note that the current
+ HEAD will be downloaded but won't be tracked when it changes.
+
comment "MTD tools selection"
depends BR2_PACKAGE_MTD
Added: trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch
===================================================================
--- trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch (rev 0)
+++ trunk/buildroot/package/mtd/mtd-utils.git/mtd-utils-all-argp.patch 2008-04-24 13:26:25 UTC (rev 21840)
@@ -0,0 +1,10 @@
+--- mtd-utils-e6088d987c545d60a86e1f44836ab8ba072fffd9/ubi-utils/new-utils/src/ubicrc32.c.orig 2008-03-26 16:08:13.000000000 +1100
++++ mtd-utils-e6088d987c545d60a86e1f44836ab8ba072fffd9/ubi-utils/new-utils/src/ubicrc32.c 2008-03-26 16:08:20.000000000 +1100
+@@ -26,7 +26,6 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <getopt.h>
+-#include <argp.h>
+ #include <unistd.h>
+ #include <mtd/ubi-header.h>
+
Modified: trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk
===================================================================
--- trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk 2008-04-24 13:25:02 UTC (rev 21839)
+++ trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk 2008-04-24 13:26:25 UTC (rev 21840)
@@ -3,7 +3,8 @@
# mtd provides jffs2 utilities
#
#############################################################
-MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
+MTD_VERSION:=$(strip $(subst ",, $(BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID)))
+#"))
MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
@@ -21,7 +22,7 @@
SUMTOOL := $(MTD_HOST_DIR)/sumtool
$(DL_DIR)/$(MTD_SOURCE):
- $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) "$(MTD_URL)"
+ $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) $(MTD_URL)
$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -63,7 +64,6 @@
#############################################################
$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- rm -rf $(MTD_DIR)
mv $(BUILD_DIR)/$(MTD_NAME) $(MTD_DIR)
toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-all\*.patch
toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-target\*.patch
@@ -108,7 +108,7 @@
$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
mkdir -p $(TARGET_DIR)/usr/sbin
- $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ $(MAKE) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
BUILDDIR=$(MTD_DIR) \
CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mtd: mtd-utils.git
@ 2008-04-24 14:24 ninevoltz at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 14:24 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 07:24:02 -0700 (Thu, 24 Apr 2008)
New Revision: 21842
Log:
revert 21840
Modified:
trunk/buildroot/package/mtd/Config.in
trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk
Changeset:
Modified: trunk/buildroot/package/mtd/Config.in
===================================================================
--- trunk/buildroot/package/mtd/Config.in 2008-04-24 14:04:23 UTC (rev 21841)
+++ trunk/buildroot/package/mtd/Config.in 2008-04-24 14:24:02 UTC (rev 21842)
@@ -37,18 +37,6 @@
endchoice
-config BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID
- string "Commit ID to use"
- default "e6088d987c545d60a86e1f44836ab8ba072fffd9"
- depends on BR2_PACKAGE_MTD_UTILS_GIT
- help
- If you wish to use the mtd-utils.git tree as of a specific
- commit, you can enter the commit ID here (for example,
- e6088d987c545d60a86e1f44836ab8ba072fffd9).
-
- Alternatively you can specify HEAD. Note that the current
- HEAD will be downloaded but won't be tracked when it changes.
-
comment "MTD tools selection"
depends BR2_PACKAGE_MTD
Modified: trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk
===================================================================
--- trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk 2008-04-24 14:04:23 UTC (rev 21841)
+++ trunk/buildroot/package/mtd/mtd-utils.git/mtd.mk 2008-04-24 14:24:02 UTC (rev 21842)
@@ -3,8 +3,7 @@
# mtd provides jffs2 utilities
#
#############################################################
-MTD_VERSION:=$(strip $(subst ",, $(BR2_PACKAGE_MTD_UTILS_GIT_COMMIT_ID)))
-#"))
+MTD_VERSION:=fcb52ccc99679460640386c297023f852b108f68
MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.gz
MTD_URL:=http://git.infradead.org/mtd-utils.git?a=snapshot;h=$(MTD_VERSION);sf=tgz
MTD_HOST_DIR:= $(TOOL_BUILD_DIR)/mtd-utils-$(MTD_VERSION)
@@ -22,7 +21,7 @@
SUMTOOL := $(MTD_HOST_DIR)/sumtool
$(DL_DIR)/$(MTD_SOURCE):
- $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) $(MTD_URL)
+ $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) "$(MTD_URL)"
$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -64,6 +63,7 @@
#############################################################
$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ rm -rf $(MTD_DIR)
mv $(BUILD_DIR)/$(MTD_NAME) $(MTD_DIR)
toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-all\*.patch
toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/mtd-utils.git mtd-utils-target\*.patch
@@ -108,7 +108,7 @@
$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
mkdir -p $(TARGET_DIR)/usr/sbin
- $(MAKE) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
+ $(MAKE1) OPTFLAGS="-DNEED_BCOPY -Dbcmp=memcmp -I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
BUILDDIR=$(MTD_DIR) \
CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) WITHOUT_XATTR=1 -C $(MTD_DIR)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-04-24 14:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-08 4:18 [Buildroot] svn commit: trunk/buildroot/package/mtd: mtd-utils.git hamish at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-04-24 13:26 ninevoltz at uclibc.org
2008-04-24 13:54 ` Peter Korsgaard
2008-04-24 14:05 ` John Voltz
2008-04-24 14:24 ninevoltz at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox