Skip to content

Commit ac7c25e

Browse files
committed
mvebu: cortex-a53: respect DEVICE_packages for Methode devices
Use the added support for generating per device targz rootfs so that images generated for Methode devices when CONFIG_TARGET_MULTI_PROFILE and CONFIG_TARGET_PER_DEVICE_ROOTFS are set, we actually get the targz rootfs that respects DEVICE_PACKAGES. Currently, buildbot generated images have no networking, LM75 nor I2C working, as the generated images do not include required kmods that are listed in DEVICE_PACKAGES. While at it, there is no need for tar to run in verbose mode. Fixes: 7dff6a8 ("mvebu: uDPU: add sysupgrade support") Signed-off-by: Robert Marko <robert.marko@sartura.hr> (cherry picked from commit ef92265)
1 parent b856372 commit ac7c25e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

target/linux/mvebu/image/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,12 @@ endef
139139
define Build/uDPU-firmware
140140
(rm -fR $@-fw; mkdir -p $@-fw)
141141
$(CP) $(BIN_DIR)/$(DEVICE_IMG_PREFIX)-initramfs.itb $@-fw/recovery.itb
142+
$(CP) $(IMAGE_ROOTFS) $@-fw/rootfs.tgz
142143
$(CP) $@-boot.scr $@-fw/boot.scr
143-
$(TAR) -cvzp --numeric-owner --owner=0 --group=0 --sort=name \
144-
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
145-
-f $@-fw/rootfs.tgz -C $(TARGET_DIR) .
146-
$(TAR) -cvzp --numeric-owner --owner=0 --group=0 --sort=name \
144+
$(TAR) -czp --numeric-owner --owner=0 --group=0 --sort=name \
147145
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
148146
-f $@-fw/boot.tgz -C $@.boot .
149-
$(TAR) -cvzp --numeric-owner --owner=0 --group=0 --sort=name \
147+
$(TAR) -czp --numeric-owner --owner=0 --group=0 --sort=name \
150148
$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
151149
-f $(KDIR_TMP)/$(DEVICE_IMG_PREFIX)-firmware.tgz -C $@-fw .
152150
endef

target/linux/mvebu/image/cortexa53.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ define Device/methode_udpu
103103
KERNEL_INITRAMFS_SUFFIX := .itb
104104
DEVICE_PACKAGES += f2fs-tools fdisk kmod-i2c-pxa kmod-hwmon-lm75 kmod-dsa-mv88e6xxx
105105
DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(2)
106+
FILESYSTEMS := targz
106107
IMAGES := firmware.tgz
107108
IMAGE/firmware.tgz := boot-scr | boot-img-ext4 | uDPU-firmware | append-metadata
108109
BOOT_SCRIPT := udpu

0 commit comments

Comments
 (0)