mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-31 15:07:43 +00:00
- fix some whitespace damage..
- add COPYTO settings for cpio and tar and remove that ugly hardcoded DATE from that was added by Ulf
This commit is contained in:
parent
0c16c17f53
commit
5cfb2f794f
@ -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.
|
# Quotes are needed for spaces et al in path components.
|
||||||
TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
|
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
|
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
|
||||||
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
|
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
|
||||||
TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
|
TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
|
||||||
|
@ -40,3 +40,12 @@ config BR2_TARGET_ROOTFS_CPIO_LZMA
|
|||||||
|
|
||||||
endchoice
|
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)
|
||||||
|
@ -31,6 +31,9 @@ else
|
|||||||
CPIO_TARGET := $(CPIO_BASE)
|
CPIO_TARGET := $(CPIO_BASE)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ROOTFS_CPIO_COPYTO:=$(strip $(subst ",,$(BR2_TARGET_ROOTFS_CPIO_COPYTO)))
|
||||||
|
# "))
|
||||||
|
#
|
||||||
|
|
||||||
cpioroot-init:
|
cpioroot-init:
|
||||||
rm -f $(TARGET_DIR)/init
|
rm -f $(TARGET_DIR)/init
|
||||||
@ -61,10 +64,18 @@ endif
|
|||||||
chmod a+x $(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))
|
$(STAGING_DIR)/usr/bin/fakeroot -- $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
|
||||||
#-@rm -f $(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),)
|
ifneq ($(CPIO_ROOTFS_COMPRESSOR),)
|
||||||
$(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT): $(CPIO_ROOTFS_COMPRESSOR_PREREQ) $(CPIO_BASE)
|
$(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT): $(CPIO_ROOTFS_COMPRESSOR_PREREQ) $(CPIO_BASE)
|
||||||
$(CPIO_ROOTFS_COMPRESSOR) $(CPIO_BASE) > $(CPIO_TARGET)
|
$(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
|
endif
|
||||||
|
|
||||||
cpioroot: $(CPIO_TARGET)
|
cpioroot: $(CPIO_TARGET)
|
||||||
|
@ -72,3 +72,4 @@ config BR2_TARGET_ROOTFS_EXT2_COPYTO
|
|||||||
help
|
help
|
||||||
Copies the resulting image to a secondary location
|
Copies the resulting image to a secondary location
|
||||||
like a tftp server's root directory.
|
like a tftp server's root directory.
|
||||||
|
|
||||||
|
@ -48,3 +48,13 @@ config BR2_TARGET_ROOTFS_TAR_OPTIONS
|
|||||||
Any other flags you want to pass to tar
|
Any other flags you want to pass to tar
|
||||||
Refer to tar --help for details
|
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
|
||||||
|
|
||||||
|
@ -21,6 +21,8 @@ ifeq ($(BR2_TARGET_ROOTFS_TAR_LZMA),y)
|
|||||||
TAR_COMPRESSOR:=lzma -9 -c
|
TAR_COMPRESSOR:=lzma -9 -c
|
||||||
TAR_COMPRESSOR_EXT:=lzma
|
TAR_COMPRESSOR_EXT:=lzma
|
||||||
endif
|
endif
|
||||||
|
ROOTFS_TAR_COPYTO:=$(strip $(subst ",,$(BR2_TARGET_ROOTFS_TAR_COPYTO)))
|
||||||
|
# "))
|
||||||
|
|
||||||
tarroot: host-fakeroot makedevs
|
tarroot: host-fakeroot makedevs
|
||||||
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
|
-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
|
||||||
@ -49,9 +51,16 @@ endif
|
|||||||
ifneq ($(TAR_COMPRESSOR),)
|
ifneq ($(TAR_COMPRESSOR),)
|
||||||
-rm -f $(TAR_TARGET).$()
|
-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)
|
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
|
endif
|
||||||
-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
|
-@rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
|
||||||
|
|
||||||
|
EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))
|
||||||
|
# "))
|
||||||
|
|
||||||
|
|
||||||
tarroot-source:
|
tarroot-source:
|
||||||
|
|
||||||
tarroot-clean:
|
tarroot-clean:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user