summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-31 20:14:08 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-31 20:14:08 +0000
commit43284ece33d7dbe5d8465fdd30e9ed37a5986ed3 (patch)
tree51a3331a48799f31c75dff460b4cd37a8de5287b
parentf2a0915886fd9ac1781f79efd90b63c0292e32e2 (diff)
fix root filesystem path
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3871 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/image/Makefile10
-rw-r--r--target/linux/image/jffs2.mk8
-rw-r--r--target/linux/image/squashfs.mk4
-rw-r--r--target/linux/image/tgz.mk2
4 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile
index ce807b302..3b8234339 100644
--- a/target/linux/image/Makefile
+++ b/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/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk
index 432df3e2b..44d892415 100644
--- a/target/linux/image/jffs2.mk
+++ b/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/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk
index abc58da1e..abe21563e 100644
--- a/target/linux/image/squashfs.mk
+++ b/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/target/linux/image/tgz.mk b/target/linux/image/tgz.mk
index 3839eb6b4..4ea84ebd4 100644
--- a/target/linux/image/tgz.mk
+++ b/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