From d290edadb96cbef93991338862a34ae246cb2e21 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 1 Apr 2009 14:15:19 +0000 Subject: [PATCH] fakeroot: install into HOST_DIR --- package/busybox/initramfs.mk | 2 +- package/fakeroot/fakeroot.mk | 14 ++++---------- target/cpio/cpioroot.mk | 2 +- target/cramfs/cramfs.mk | 2 +- target/device/Atmel/u-boot/u-boot.mk | 2 +- target/ext2/ext2root.mk | 2 +- target/initramfs/initramfs.mk | 2 +- target/iso9660/iso9660.mk | 2 +- target/jffs2/jffs2root.mk | 2 +- target/romfs/romfs.mk | 2 +- target/squashfs/squashfsroot.mk | 2 +- target/tar/tarroot.mk | 2 +- target/ubifs/ubifsroot.mk | 2 +- 13 files changed, 16 insertions(+), 22 deletions(-) diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index 1c10d0f5ba..dbec0520bb 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -115,7 +115,7 @@ $(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(PROJECT_BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \ ) > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) chmod +x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- \ + $(HOST_DIR)/usr/bin/fakeroot -- \ $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) touch -c $@ diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 2ebccc9393..0db6628c63 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -36,8 +36,7 @@ $(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked (cd $(FAKEROOT_DIR1); rm -rf config.cache; \ CC="$(HOSTCC)" \ $(FAKEROOT_SOURCE_DIR)/configure \ - --prefix=/usr \ - $(DISABLE_NLS) \ + --prefix=$(HOST_DIR)/usr \ ) touch $@ @@ -45,16 +44,11 @@ $(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured $(MAKE) -C $(FAKEROOT_DIR1) touch -c $@ -$(STAGING_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(FAKEROOT_DIR1) install - $(SED) 's,^PREFIX=.*,PREFIX=$(STAGING_DIR)/usr,g' $(STAGING_DIR)/usr/bin/fakeroot - $(SED) 's,^BINDIR=.*,BINDIR=$(STAGING_DIR)/usr/bin,g' $(STAGING_DIR)/usr/bin/fakeroot - $(SED) 's,^PATHS=.*,PATHS=$(FAKEROOT_DIR1)/.libs:/lib:/usr/lib,g' $(STAGING_DIR)/usr/bin/fakeroot - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/lib/libfakeroot.la +$(HOST_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked + $(MAKE) -C $(FAKEROOT_DIR1) install touch -c $@ -host-fakeroot: uclibc $(STAGING_DIR)/usr/bin/fakeroot +host-fakeroot: uclibc $(HOST_DIR)/usr/bin/fakeroot host-fakeroot-clean: -$(MAKE) -C $(FAKEROOT_DIR1) clean diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk index b851f3c8d8..c02d0209d6 100644 --- a/target/cpio/cpioroot.mk +++ b/target/cpio/cpioroot.mk @@ -62,7 +62,7 @@ endif echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_BASE)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) #-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) ifeq ($(CPIO_ROOTFS_COMPRESSOR),) ifneq ($(ROOTFS_CPIO_COPYTO),) diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index ecbfd8a50f..e35bd1f218 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -75,7 +75,7 @@ endif echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_OPTS) " \ "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) cramfsroot-source: cramfs-source diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index 60e18e42d9..1b9be5c843 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -231,7 +231,7 @@ ubootroot: host-fakeroot makedevs uboot "-noappend $(UBOOT_ENDIANNESS)" \ >> $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) -@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(UBOOT_TARGET)) ubootroot-source: uboot-source diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index bb7b0f016e..6ff51c8150 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -125,7 +125,7 @@ else "$(EXT2_OPTS) $(EXT2_BASE)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) endif chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) ifneq ($(EXT2_ROOTFS_COMPRESSOR),) diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk index 09340f09f8..bbeae980f6 100644 --- a/target/initramfs/initramfs.mk +++ b/target/initramfs/initramfs.mk @@ -37,7 +37,7 @@ endif echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) -rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) initramfs-source: diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 02fdccf249..151970ffde 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -71,7 +71,7 @@ $(ISO9660_TARGET): host-fakeroot $(LINUX_KERNEL) $(EXT2_TARGET) grub mkisofs "-boot-load-size 4 -boot-info-table -o $(ISO9660_TARGET) $(ISO9660_TARGET_DIR)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) iso9660root: $(ISO9660_TARGET) diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 743d2d7658..94c6c30390 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -81,7 +81,7 @@ else >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) endif chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) @ls -l $(JFFS2_TARGET) ifeq ($(BR2_JFFS2_TARGET_SREC),y) diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk index d287055037..1abb24829a 100644 --- a/target/romfs/romfs.mk +++ b/target/romfs/romfs.mk @@ -58,7 +58,7 @@ endif # Use fakeroot so genromfs believes the previous fakery echo "$(ROMFS_DIR)/genromfs -d $(TARGET_DIR) -f $(ROMFS_TARGET)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) romfsroot-source: romfs-source diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index ab701a540a..00bd960c77 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -68,7 +68,7 @@ endif "-noappend $(SQUASHFS_ENDIANNESS)" \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) chmod 0644 $(SQUASHFS_TARGET) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk index 2e1ab2cd18..274c4c6f8c 100644 --- a/target/tar/tarroot.mk +++ b/target/tar/tarroot.mk @@ -47,7 +47,7 @@ endif echo "tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) ." \ >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) ifneq ($(TAR_COMPRESSOR),) -rm -f $(TAR_TARGET).$() PATH="$(STAGING_DIR)/sbin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(PATH)" $(TAR_COMPRESSOR) $(TAR_TARGET) > $(TAR_TARGET).$(TAR_COMPRESSOR_EXT) diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk index 3412f5e3e5..cd330df010 100644 --- a/target/ubifs/ubifsroot.mk +++ b/target/ubifs/ubifsroot.mk @@ -105,7 +105,7 @@ endif echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -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)) - $(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) + $(HOST_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) -@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) ifneq ($(UBIFS_ROOTFS_COMPRESSOR),) -- 2.30.2