svn commit: trunk/buildroot/target: cramfs ext2 iso9660 jffs2 squashfs tar

andersen at uclibc.org andersen at uclibc.org
Mon Apr 10 17:48:55 UTC 2006 

Author: andersen
Date: 2006-04-10 10:48:53 -0700 (Mon, 10 Apr 2006)
New Revision: 14789

Log:
As noted by jacmet in bug 824:

svn 14777 seems to have broken cramfs/squashfs/tarroot.

The problem is that $(IMAGE) is the absolute path of the image including
directories, so the build tries to access
$(STAGING_DIR)/_fakeroot.</full/path/to/buildroot/directory> which doesn't
exist.

The fix is to define CRAMFS/SQUASHFS/TAR_TARGET as $(notdir
$(IMAGE).<extension>) instead.



Modified:
   trunk/buildroot/target/cramfs/cramfs.mk
   trunk/buildroot/target/ext2/ext2root.mk
   trunk/buildroot/target/iso9660/iso9660.mk
   trunk/buildroot/target/jffs2/jffs2root.mk
   trunk/buildroot/target/squashfs/squashfsroot.mk
   trunk/buildroot/target/tar/tarroot.mk


Changeset:
Modified: trunk/buildroot/target/cramfs/cramfs.mk
===================================================================
--- trunk/buildroot/target/cramfs/cramfs.mk	2006-04-10 17:34:12 UTC (rev 14788)
+++ trunk/buildroot/target/cramfs/cramfs.mk	2006-04-10 17:48:53 UTC (rev 14789)
@@ -67,25 +67,25 @@
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
-	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
 		chown -R root:root $(TARGET_DIR)
 	# Use fakeroot to pretend to create all needed device nodes
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
 		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so mkcramfs believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET) -- \
 	    $(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_ENDIANNESS) \
 		$(TARGET_DIR) $(CRAMFS_TARGET)
-	- at rm -f $(STAGING_DIR)/_fakeroot.$(CRAMFS_TARGET)
+	- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $CRAMFS_TARGET)
 
 cramfsroot-source: cramfs-source
 

Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk	2006-04-10 17:34:12 UTC (rev 14788)
+++ trunk/buildroot/target/ext2/ext2root.mk	2006-04-10 17:48:53 UTC (rev 14789)
@@ -72,17 +72,17 @@
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
-	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \
 		chown -R root:root $(TARGET_DIR)
 	# Use fakeroot to pretend to create all needed device nodes
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \
 		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so genext2fs believes the previous fakery
 ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
@@ -93,8 +93,8 @@
 	GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \
 	set -x; \
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \
 	    $(GENEXT2_DIR)/genext2fs \
 		-b $$GENEXT2_SIZE \
 		-i $$GENEXT2_INODES \
@@ -102,14 +102,14 @@
 		$(EXT2_OPTS) $(EXT2_BASE)
 else
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET) -- \
 	    $(GENEXT2_DIR)/genext2fs \
 		-d $(TARGET_DIR) \
 		$(EXT2_OPTS) \
 		$(EXT2_BASE)
 endif
-	- at rm -f $(STAGING_DIR)/_fakeroot.$(EXT2_TARGET)
+	- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $EXT2_TARGET)
 
 $(EXT2_BASE).gz: $(EXT2_BASE)
 	@gzip --best -fv $(EXT2_BASE)

Modified: trunk/buildroot/target/iso9660/iso9660.mk
===================================================================
--- trunk/buildroot/target/iso9660/iso9660.mk	2006-04-10 17:34:12 UTC (rev 14788)
+++ trunk/buildroot/target/iso9660/iso9660.mk	2006-04-10 17:48:53 UTC (rev 14789)
@@ -60,23 +60,23 @@
 	cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel
 	cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
-	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) -- \
 		chown -R root:root $(ISO9660_TARGET_DIR)
 	# Use fakeroot so mkisofs believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET) -- \
 	    $(MKISOFS_TARGET) \
 		-R -b boot/grub/stage2_eltorito -no-emul-boot \
 		-boot-load-size 4 -boot-info-table \
 		-o $(ISO9660_TARGET) \
 		$(ISO9660_TARGET_DIR)
-	- at rm -f $(STAGING_DIR)/_fakeroot.$(ISO9660_TARGET)
+	- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $ISO9660_TARGET)
 
 iso9660root: $(ISO9660_TARGET)
 	echo $(ISO9660_TARGET)

Modified: trunk/buildroot/target/jffs2/jffs2root.mk
===================================================================
--- trunk/buildroot/target/jffs2/jffs2root.mk	2006-04-10 17:34:12 UTC (rev 14788)
+++ trunk/buildroot/target/jffs2/jffs2root.mk	2006-04-10 17:48:53 UTC (rev 14789)
@@ -45,25 +45,25 @@
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
-	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) -- \
 		chown -R root:root $(TARGET_DIR)
 	# Use fakeroot to pretend to create all needed device nodes
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) -- \
 		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so mkfs.jffs2 believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET) -- \
 	    $(MKFS_JFFS2) $(JFFS2_OPTS) \
 			-d $(BUILD_DIR)/root -o $(JFFS2_TARGET)
-	- at rm -f $(STAGING_DIR)/_fakeroot.$(JFFS2_TARGET)
+	- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $JFFS2_TARGET)
 	@ls -l $(JFFS2_TARGET)
 
 JFFS2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO)))

Modified: trunk/buildroot/target/squashfs/squashfsroot.mk
===================================================================
--- trunk/buildroot/target/squashfs/squashfsroot.mk	2006-04-10 17:34:12 UTC (rev 14788)
+++ trunk/buildroot/target/squashfs/squashfsroot.mk	2006-04-10 17:48:53 UTC (rev 14789)
@@ -61,27 +61,27 @@
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
-	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -- \
 		chown -R root:root $(TARGET_DIR)
 	# Use fakeroot to pretend to create all needed device nodes
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -- \
 		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so mksquashfs believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET) -- \
 	    $(SQUASHFS_DIR)/squashfs-tools/mksquashfs \
 		    $(TARGET_DIR) \
 		    $(SQUASHFS_TARGET) \
 		    -noappend $(SQUASHFS_ENDIANNESS)
-	- at rm -f $(STAGING_DIR)/_fakeroot.$(SQUASHFS_TARGET)
+	- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $SQUASHFS_TARGET)
 
 squashfsroot-source: squashfs-source
 

Modified: trunk/buildroot/target/tar/tarroot.mk
===================================================================
--- trunk/buildroot/target/tar/tarroot.mk	2006-04-10 17:34:12 UTC (rev 14788)
+++ trunk/buildroot/target/tar/tarroot.mk	2006-04-10 17:48:53 UTC (rev 14789)
@@ -13,24 +13,24 @@
 	@rm -rf $(TARGET_DIR)/usr/info
 	-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
 	# Use fakeroot to pretend all target binaries are owned by root
-	rm -f $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 	touch $(STAGING_DIR)/.fakeroot.00000
-	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \
 		chown -R root:root $(TARGET_DIR)
 	# Use fakeroot to pretend to create all needed device nodes
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \
 		$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)
 	# Use fakeroot so tar believes the previous fakery
 	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) \
-		-s $(STAGING_DIR)/_fakeroot.$(TAR_TARGET) -- \
+		-i $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) \
+		-s $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET) -- \
 	    tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) .
-	- at rm -f $(STAGING_DIR)/_fakeroot.$(TAR_TARGET)
+	- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $TAR_TARGET)
 
 tarroot-source:

More information about the uClibc-cvs mailing list