From: hamish at uclibc.org <hamish@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/mtd: mtd-utils.git
Date: Mon, 7 Apr 2008 21:18:13 -0700 (PDT) [thread overview]
Message-ID: <20080408041813.237043C2FF@busybox.net> (raw)
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)
next reply other threads:[~2008-04-08 4:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-08 4:18 hamish at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-04-24 13:26 [Buildroot] svn commit: trunk/buildroot/package/mtd: mtd-utils.git 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
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=20080408041813.237043C2FF@busybox.net \
--to=hamish@uclibc.org \
--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