ipq807x: image: fix eMMC flashing/recovery from within initramfs

Having initramfs image built with same config as on buildbots:

 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_ALL_PROFILES=y
 CONFIG_TARGET_PER_DEVICE_ROOTFS=y

Its currently impossible to flash/recover the device using that image as
losetup is missing:

 root@OpenWrt:/# sysupgrade -v /tmp/openwrt-ipq807x-generic-prpl_haze-squashfs-sysupgrade.bin
 ...
 /lib/upgrade/do_stage2: line 38: losetup: not found
 Failed to detach all loop devices. Skip this try.

So lets fix it by including the needed utils for sysupgrade in
DEFAULT_PACKAGES set.

Signed-off-by: Petr Štetiar <ynezz@true.cz>

diff --git a/target/linux/ipq807x/Makefile b/target/linux/ipq807x/Makefile
index 2f076279b7a97202fd4343ca6f5aa30d0d4db6c0..e43428839571a18a31ef42fd2260e4c13d193892 100644 (file)
--- a/target/linux/ipq807x/Makefile
+++ b/target/linux/ipq807x/Makefile
@@ -16,6 +16,7 @@ DEFAULT_PACKAGES += \
        kmod-leds-gpio kmod-gpio-button-hotplug \
        kmod-phy-aquantia kmod-qca-nss-dp \
        ath11k-firmware-ipq8074 kmod-ath11k-ahb \
-       wpad-basic-mbedtls uboot-envtools
+       wpad-basic-mbedtls uboot-envtools \
+       e2fsprogs kmod-fs-ext4 losetup
 
 $(eval $(call BuildTarget))

diff --git a/target/linux/ipq807x/image/generic.mk b/target/linux/ipq807x/image/generic.mk
index 039fa3b1adc222ee35695cac2e2b28e82eacafac..6003f2a5c0e4823ce1ec758815ef0a24b0a08d7b 100644 (file)
--- a/target/linux/ipq807x/image/generic.mk
+++ b/target/linux/ipq807x/image/generic.mk
@@ -14,7 +14,6 @@ define Device/EmmcImage
        IMAGES += factory.bin sysupgrade.bin
        IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 64k
        IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to 64k | sysupgrade-tar rootfs=$$$$@ | append-metadata
-       DEVICE_PACKAGES := e2fsprogs kmod-fs-ext4 losetup
 endef
 
 define Device/UbiFit