Commit d290edad authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

fakeroot: install into HOST_DIR

parent 512d08af

package/busybox/initramfs.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 $@

package/fakeroot/fakeroot.mk

+4 −10
Original line number Diff line number Diff line
@@ -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

target/cpio/cpioroot.mk

+1 −1
Original line number Diff line number Diff line
@@ -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),)

target/cramfs/cramfs.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/device/Atmel/u-boot/u-boot.mk

+1 −1
Original line number Diff line number Diff line
@@ -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