Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] target/ubifs: fix compilation
@ 2009-06-03 11:39 Daniel Mack
  2009-06-03 11:39 ` [Buildroot] [PATCH 2/2] mtd-utils.git: fix targets Daniel Mack
                   ` (3 more replies)
  0 siblings, 4 replies; 30+ messages in thread
From: Daniel Mack @ 2009-06-03 11:39 UTC (permalink / raw)
  To: buildroot

The ubifs rootfs target does not currently build because the repository
listed in ubifsroot.mk does not exist anymore. Consequently, the used
tag is also wrong.

As the code base for mtd utils seem to have been merged in the past,
there are dependencies between ubi-utils, mkfs.ubifs and the mtd core
now, so we have no other option than building the whole thing.

WITHOUT_XATTR was added to the make parameters because it did not build
on my system without that. Maybe that should become a auto* variable
dependency in the future.

BUILDDIR is needed by the mtd-utils Makefile, otherwise built object
files are put to $(PWD) which is the toplevel br2 path.

MKFS_UBIFS_BINARY was added to ease the path chaos a bit.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
---
 target/ubifs/ubifsroot.mk |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk
index 1707e46..d14bde1 100644
--- a/target/ubifs/ubifsroot.mk
+++ b/target/ubifs/ubifsroot.mk
@@ -5,12 +5,13 @@
 #############################################################
 #MKFS_UBIFS_VERSION=2582f128dad78591bc3adcc87c343c690bb82e61
 #MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=$(MKFS_UBIFS_VERSION);sf=tgz
-MKFS_UBIFS_VERSION=v0.4
-MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=refs/tags/mkfs.ubifs-$(MKFS_UBIFS_VERSION);sf=tgz
-MKFS_UBIFS_SOURCE:=mkfs.ubifs-$(MKFS_UBIFS_VERSION).tar.gz
-MKFS_UBIFS_DIR:= $(BUILD_DIR)/mkfs-ubifs-$(MKFS_UBIFS_VERSION)
-MKFS_UBIFS_CAT:=$(ZCAT)
-MKFS_UBIFS_NAME:=mkfs.ubifs
+MKFS_UBIFS_VERSION=HEAD
+MKFS_UBIFS_URL=http://git.infradead.org/mtd-utils.git?a=snapshot\;h=$(MKFS_UBIFS_VERSION)\;sf=tgz
+MKFS_UBIFS_SOURCE=mtd-utils-$(MKFS_UBIFS_VERSION).tar.gz
+MKFS_UBIFS_DIR=$(BUILD_DIR)/mkfs-utils-ubifs
+MKFS_UBIFS_CAT=$(ZCAT)
+MKFS_UBIFS_NAME=mtd-utils
+MKFS_UBIFS_BINARY=$(MKFS_UBIFS_DIR)/mkfs.ubifs/mkfs.ubifs
 
 $(DL_DIR)/$(MKFS_UBIFS_SOURCE):
 	$(WGET) -O $(DL_DIR)/$(MKFS_UBIFS_SOURCE) "$(MKFS_UBIFS_URL)"
@@ -21,14 +22,14 @@ $(MKFS_UBIFS_DIR)/.unpacked: $(DL_DIR)/$(MKFS_UBIFS_SOURCE)
 	toolchain/patch-kernel.sh $(MKFS_UBIFS_DIR) target/ubifs/ mkfs-ubifs-\*.patch
 	touch $@
 
-$(MKFS_UBIFS_DIR)/mkfs.ubifs: $(MKFS_UBIFS_DIR)/.unpacked
-	$(MAKE) -C $(MKFS_UBIFS_DIR)
+$(MKFS_UBIFS_BINARY): $(MKFS_UBIFS_DIR)/.unpacked
+	$(MAKE) -j1 -C $(MKFS_UBIFS_DIR) BUILDDIR=$(MKFS_UBIFS_DIR) WITHOUT_XATTR=1
 	touch -c $@
 
 mkfs.ubifs-dirclean:
 	rm -rf $(MKFS_UBIFS_DIR)
 
-mkfs.ubifs: $(MKFS_UBIFS_DIR)/mkfs.ubifs
+mkfs.ubifs: $(MKFS_UBIFS_BINARY)
 
 #############################################################
 #
@@ -88,7 +89,7 @@ ifneq ($(TARGET_DEVICE_TABLE),)
 		>> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
 endif
 	# Use fakeroot so mkfs.ubifs believes the previous fakery
-	echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -d $(TARGET_DIR) " \
+	echo "$(MKFS_UBIFS_BINARY) -d $(TARGET_DIR) " \
 		"$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
 	chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
 	$(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET))
-- 
1.6.3.1

^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2009-08-06 15:03 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-03 11:39 [Buildroot] [PATCH 1/2] target/ubifs: fix compilation Daniel Mack
2009-06-03 11:39 ` [Buildroot] [PATCH 2/2] mtd-utils.git: fix targets Daniel Mack
2009-07-19 14:12   ` Peter Korsgaard
2009-07-20 11:25     ` Daniel Mack
2009-07-20 20:35       ` Peter Korsgaard
2009-07-20 21:03         ` Daniel Mack
2009-07-21  7:20           ` Peter Korsgaard
2009-07-29 17:20             ` Daniel Mack
2009-07-29 17:21               ` [Buildroot] [PATCH 1/2] e2fsprogs: factor out libuuid support Daniel Mack
2009-07-29 17:21                 ` [Buildroot] [PATCH 2/2] mtd-utils.git: fix targets Daniel Mack
2009-08-05 19:47                   ` Peter Korsgaard
2009-08-06  6:36                     ` Daniel Mack
2009-08-06  7:58                       ` Peter Korsgaard
2009-08-06 14:18                         ` Daniel Mack
2009-08-06 15:03                           ` Peter Korsgaard
2009-08-03 14:36                 ` [Buildroot] [PATCH 1/2] e2fsprogs: factor out libuuid support Daniel Mack
2009-08-03 14:58                   ` Thomas Petazzoni
2009-08-03 15:09                     ` Daniel Mack
2009-08-03 20:48                       ` Peter Korsgaard
2009-08-04  8:28                         ` Daniel Mack
2009-08-05 11:47                           ` Peter Korsgaard
2009-08-05 11:55                             ` Daniel Mack
2009-08-05 13:52                               ` Peter Korsgaard
2009-06-04 18:05 ` [Buildroot] [PATCH 1/2] target/ubifs: fix compilation Daniel Mack
2009-07-09  2:36   ` Paul Archer
2009-07-08 13:36 ` Daniel Mack
2009-07-08 14:18   ` Peter Korsgaard
2009-07-19 14:06 ` Peter Korsgaard
2009-07-20 12:22   ` Daniel Mack
2009-07-20 20:41     ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox