From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 31 May 2006 20:14:08 +0000 (+0000)
Subject: fix root filesystem path
X-Git-Tag: reboot~30718^2~643
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c417ce482d2124ae5ec462e1fbccb1222a64f447;p=oweals%2Fopenwrt.git

fix root filesystem path

SVN-Revision: 3871
---

diff --git a/openwrt/target/linux/image/Makefile b/openwrt/target/linux/image/Makefile
index ce807b3027..3b82343398 100644
--- a/openwrt/target/linux/image/Makefile
+++ b/openwrt/target/linux/image/Makefile
@@ -33,11 +33,11 @@ install-ib:
 	$(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/	
 
 install-prepare:
-	find $(KDIR)/root -type f -not -perm +0100 | xargs chmod 0644
-	find $(KDIR)/root -type f -perm +0100 | xargs chmod 0755
-	find $(KDIR)/root -type d | xargs chmod 0755
-	mkdir -p $(KDIR)/root/tmp
-	chmod 0777 $(KDIR)/root/tmp
+	find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644
+	find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755
+	find $(BUILD_DIR)/root -type d | xargs chmod 0755
+	mkdir -p $(BUILD_DIR)/root/tmp
+	chmod 0777 $(BUILD_DIR)/root/tmp
 
 rebuild: clean prepare compile install
 clean:
diff --git a/openwrt/target/linux/image/jffs2.mk b/openwrt/target/linux/image/jffs2.mk
index 432df3e2b1..44d892415e 100644
--- a/openwrt/target/linux/image/jffs2.mk
+++ b/openwrt/target/linux/image/jffs2.mk
@@ -17,12 +17,12 @@ jffs2-clean:
 	rm -f $(KDIR)/root.jffs2*
 
 $(KDIR)/root.jffs2-4MB: install-prepare
-	@rm -rf $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(KDIR)/root
+	@rm -rf $(BUILD_DIR)/root/jffs
+	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $@ -d $(BUILD_DIR)/root
 
 $(KDIR)/root.jffs2-8MB: install-prepare
-	@rm -rf $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(KDIR)/root
+	@rm -rf $(BUILD_DIR)/root/jffs
+	$(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $@ -d $(BUILD_DIR)/root
 
 ifeq ($(IB),)
 jffs2-install: compile-targets $(BOARD)-compile
diff --git a/openwrt/target/linux/image/squashfs.mk b/openwrt/target/linux/image/squashfs.mk
index abc58da1e4..abe21563ec 100644
--- a/openwrt/target/linux/image/squashfs.mk
+++ b/openwrt/target/linux/image/squashfs.mk
@@ -15,8 +15,8 @@ squashfs-clean:
 	rm -f $(KDIR)/root.squashfs
 
 $(KDIR)/root.squashfs: install-prepare
-	@mkdir -p $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -$(endian)
+	@mkdir -p $(BUILD_DIR)/root/jffs
+	$(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $@ -nopad -noappend -root-owned -$(endian)
 	
 ifeq ($(IB),)
 squashfs-install: compile-targets $(BOARD)-compile
diff --git a/openwrt/target/linux/image/tgz.mk b/openwrt/target/linux/image/tgz.mk
index 3839eb6b47..4ea84ebd47 100644
--- a/openwrt/target/linux/image/tgz.mk
+++ b/openwrt/target/linux/image/tgz.mk
@@ -1,5 +1,5 @@
 $(KDIR)/root.tar.gz:
-	tar -zcf $@ --owner=root --group=root -C $(KDIR)/root/ .
+	tar -zcf $@ --owner=root --group=root -C $(BUILD_DIR)/root/ .
 
 ifeq ($(BOARD),x86)
 install: tgz-install