aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-08-14 19:24:56 +0200
committerJo-Philipp Wich <jo@mein.io>2016-08-14 19:47:51 +0200
commit7347c14cd72bda93a9656a43430e2fe25306fddd (patch)
treea7110c975ae8ee0a7404877cc1d6be0c86c4608e
parent5b1c00e4fa97d2c424edc16f8521065298eee56c (diff)
downloadupstream-7347c14cd72bda93a9656a43430e2fe25306fddd.tar.gz
upstream-7347c14cd72bda93a9656a43430e2fe25306fddd.tar.bz2
upstream-7347c14cd72bda93a9656a43430e2fe25306fddd.zip
mvebu: rework ClearFog bundle.tar.gz generation
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>
-rw-r--r--target/linux/mvebu/image/Makefile18
1 files changed, 6 insertions, 12 deletions
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index 7d87e5cc8f..deab33c9c9 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -14,22 +14,18 @@ KERNEL_LOADADDR := 0x00008000
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
$(call Image/BuildDTB,$(DTS_DIR)/$(DEVICE_DTS).dts,$@.dtb)
endef
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 \
$(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 > $@
endef
@@ -40,7 +36,6 @@ define Device/Default
BOARD_NAME = $$(DEVICE_DTS)
KERNEL_NAME := zImage
KERNEL := kernel-bin | append-dtb | uImage none
- FILESYSTEMS = $(filter-out bundle,$(TARGET_FILESYSTEMS))
endef
define Device/UBI
@@ -155,9 +150,8 @@ define Device/armada-388-clearfog
KERNEL_INSTALL := 1
KERNEL := dtb | kernel-bin
DEVICE_TITLE := SolidRun ClearFog
- FILESYSTEMS := bundle
IMAGES := bundle.tar.gz
- IMAGE/bundle.tar.gz := append-rootfs | clearfog-bundle
+ IMAGE/bundle.tar.gz := clearfog-bundle
IMAGE_NAME = $$(IMAGE_PREFIX)-$$(2)
endef
TARGET_DEVICES += armada-388-clearfog