jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 22:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fix some whitespace damage..

Browse Source 
- add COPYTO settings for cpio and tar and remove that ugly hardcoded DATE from that was added by Ulf
This commit is contained in:
Bernhard Reutner-Fischer 2007-10-05 12:55:40 +00:00
parent 0c16c17f53
commit 5cfb2f794f
8 changed files with 74 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/Makefile.in
View File

@ -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)-

9
target/cpio/Config.in
View File

@ -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)

11
target/cpio/cpioroot.mk
View File

@ -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)

1
target/ext2/Config.in
View File

@ -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.

10
target/tar/Config.in
View File

@ -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

9
target/tar/tarroot.mk
View File

@ -21,6 +21,8 @@ ifeq ($(BR2_TARGET_ROOTFS_TAR_LZMA),y)
TAR_COMPRESSOR:=lzma -9 -c
TAR_COMPRESSOR_EXT:=lzma
endif
ROOTFS_TAR_COPYTO:=$(strip $(subst ",,$(BR2_TARGET_ROOTFS_TAR_COPYTO)))
# "))
tarroot: host-fakeroot makedevs
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
@ -49,9 +51,16 @@ endif
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)
endif
ifneq ($(ROOTFS_TAR_COPYTO),)
$(Q)cp -f $(TAR_TARGET) $(ROOTFS_TAR_COPYTO)
endif
-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))
# "))
tarroot-source:
tarroot-clean: