Commit 5cfb2f79 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- fix some whitespace damage.. 

- add COPYTO settings for cpio and tar and remove that ugly hardcoded DATE from that was added by Ulf
parent 0c16c17f

package/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUF 


# Quotes are needed for spaces et al in path components.

TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"

IMAGE:=$(BINARIES_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX)-$(DATE)

IMAGE:=$(BINARIES_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX)

GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux

REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)

TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-

target/cpio/Config.in

+9 −0
Original line number Diff line number Diff line
@@ -40,3 +40,12 @@ config BR2_TARGET_ROOTFS_CPIO_LZMA 


endchoice



config BR2_TARGET_ROOTFS_CPIO_COPYTO

	string "also copy the image to..."

	depends on BR2_TARGET_ROOTFS_CPIO

	default ""

	help

	  Copies the resulting image to a secondary location

	  like a tftp server's root directory.

	  

	  Example: $(IMAGE)-$(DATE).cpio$(CPIO_ROOTFS_COMPRESSOR_EXT)

target/cpio/cpioroot.mk

+11 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ else 
CPIO_TARGET := $(CPIO_BASE)

endif



ROOTFS_CPIO_COPYTO:=$(strip $(subst ",,$(BR2_TARGET_ROOTFS_CPIO_COPYTO)))

# "))

#



cpioroot-init:

	rm -f $(TARGET_DIR)/init
@@ -61,10 +64,18 @@ endif 
	chmod a+x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))

	$(STAGING_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),)

	$(Q)cp -f $(CPIO_BASE) $(ROOTFS_CPIO_COPYTO)

endif

endif



ifneq ($(CPIO_ROOTFS_COMPRESSOR),)

$(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT): $(CPIO_ROOTFS_COMPRESSOR_PREREQ) $(CPIO_BASE)

	$(CPIO_ROOTFS_COMPRESSOR) $(CPIO_BASE) > $(CPIO_TARGET)

ifneq ($(ROOTFS_CPIO_COPYTO),)

	$(Q)cp -f $(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT) $(ROOTFS_CPIO_COPYTO).$(CPIO_ROOTFS_COMPRESSOR_EXT)

endif

endif



cpioroot: $(CPIO_TARGET)

target/ext2/Config.in

+28 −27
Original line number Diff line number Diff line
@@ -72,3 +72,4 @@ config BR2_TARGET_ROOTFS_EXT2_COPYTO 
	help

	  Copies the resulting image to a secondary location

	  like a tftp server's root directory.

target/tar/Config.in

+10 −0
Original line number Diff line number Diff line
@@ -48,3 +48,13 @@ config BR2_TARGET_ROOTFS_TAR_OPTIONS 
	  Any other flags you want to pass to tar

	  Refer to tar --help for details



config BR2_TARGET_ROOTFS_TAR_COPYTO

	string "also copy the image to..."

	depends on BR2_TARGET_ROOTFS_TAR

	default ""

	help

	  Copies the resulting image to a secondary location

	  like a tftp server's root directory.



	  Example: $(IMAGE)-$(DATE).tar