[Astlinux-commits] SF.net SVN: astlinux:[7937] branches/1.0/fs

[<abe...@us...>]

Revision: 7937
          http://sourceforge.net/p/astlinux/code/7937
Author:   abelbeck
Date:     2016-11-07 17:22:42 +0000 (Mon, 07 Nov 2016)
Log Message:
-----------
More upstream Buildroot fakeroot fixes, Bail out on errors in fakeroot script
Ref: https://git.buildroot.net/buildroot/commit/fs/common.mk?id=4ef7ec585c904f3c68af391e220534981ded2bab
Ref: https://git.buildroot.net/buildroot/commit/fs/common.mk?id=6b577b3c3adf7de2582985160ab2906c8dabf22c
Ref: https://git.buildroot.net/buildroot/commit/fs/common.mk?id=974e83a8f9a1c9054b0d702d63b85557388d4b7d

Modified Paths:
--------------
    branches/1.0/fs/common.mk
    branches/1.0/fs/iso9660/iso9660.mk

Modified: branches/1.0/fs/common.mk
===================================================================
--- branches/1.0/fs/common.mk	2016-11-07 16:42:21 UTC (rev 7936)
+++ branches/1.0/fs/common.mk	2016-11-07 17:22:42 UTC (rev 7937)
@@ -46,8 +46,8 @@
 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
 	rm -f $$@
 	rm -f $(FAKEROOT_SCRIPT)
-	touch $(BUILD_DIR)/.fakeroot.00000
-	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
+	echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
+	echo 'set -e' >> $$(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 ifneq ($(ROOTFS_DEVICE_TABLES),)
 	cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)

Modified: branches/1.0/fs/iso9660/iso9660.mk
===================================================================
--- branches/1.0/fs/iso9660/iso9660.mk	2016-11-07 16:42:21 UTC (rev 7936)
+++ branches/1.0/fs/iso9660/iso9660.mk	2016-11-07 17:22:42 UTC (rev 7937)
@@ -25,8 +25,8 @@
 	cp $(BINARIES_DIR)/rootfs.ext2 $(ISO9660_TARGET_DIR)/initrd
 	# Use fakeroot to pretend all target binaries are owned by root
 	rm -f $(FAKEROOT_SCRIPT)
-	touch $(BUILD_DIR)/.fakeroot.00000
-	cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT)
+	echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
+	echo 'set -e' >> $$(FAKEROOT_SCRIPT)
 	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)
 	# Use fakeroot so mkisofs believes the previous fakery
 	echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.