KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mvebu: rework ClearFog bundle.tar.gz generation

Browse source 
Instead of introducing a fake filesystem type, move the tar generation step
directly into the image build step.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-08-14 19:24:56 +02:00
parent 5b1c00e4fa
commit 7347c14cd7
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/mvebu/image/Makefile
View file

@ -14,22 +14,18 @@ KERNEL_LOADADDR := 0x00008000
DEVICE_VARS += KERNEL_SIZE DEVICE_VARS += KERNEL_SIZE
define Image/mkfs/bundle
$(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
-C $(call mkfs_target_dir,$(1))/ . > $@
endef
TARGET_FILESYSTEMS += bundle
define Build/dtb define Build/dtb
$(call Image/BuildDTB,$(DTS_DIR)/$(DEVICE_DTS).dts,$@.dtb) $(call Image/BuildDTB,$(DTS_DIR)/$(DEVICE_DTS).dts,$@.dtb)
endef endef
define Build/clearfog-bundle define Build/clearfog-bundle
cp $(IMAGE_ROOTFS) $@.new rm -f $@.new
$(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
--file=$@.new -C $(TARGET_DIR)/ .
$(TAR) -rp --numeric-owner --owner=0 --group=0 --sort=name \ $(TAR) -rp --numeric-owner --owner=0 --group=0 --sort=name \
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
--file=$@.new -C $(dir $(IMAGE_KERNEL))/ $(notdir $(IMAGE_KERNEL)) $(notdir $(IMAGE_KERNEL).dtb) --file=$@.new -C $(dir $(IMAGE_KERNEL)) $(notdir $(IMAGE_KERNEL)) $(notdir $(IMAGE_KERNEL).dtb)
gzip -9n -c $@.new > $@ gzip -9n -c $@.new > $@
endef endef
@ -40,7 +36,6 @@ define Device/Default
BOARD_NAME = $$(DEVICE_DTS) BOARD_NAME = $$(DEVICE_DTS)
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL := kernel-bin | append-dtb | uImage none KERNEL := kernel-bin | append-dtb | uImage none
FILESYSTEMS = $(filter-out bundle,$(TARGET_FILESYSTEMS))
endef endef
define Device/UBI define Device/UBI
@ -155,9 +150,8 @@ define Device/armada-388-clearfog
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL := dtb | kernel-bin KERNEL := dtb | kernel-bin
DEVICE_TITLE := SolidRun ClearFog DEVICE_TITLE := SolidRun ClearFog
FILESYSTEMS := bundle
IMAGES := bundle.tar.gz IMAGES := bundle.tar.gz
IMAGE/bundle.tar.gz := append-rootfs | clearfog-bundle IMAGE/bundle.tar.gz := clearfog-bundle
IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2)
endef endef
TARGET_DEVICES += armada-388-clearfog TARGET_DEVICES += armada-388-clearfog