[source] ar71xx: enable nand-utils in the mikrotik subtarget to ensure it makes it to initramfs

LEDE Commits lede-commits at lists.infradead.org
Fri May 12 04:30:24 PDT 2017


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/c536c50171b534d575ffc4e789bd44f4e78e8d5e

commit c536c50171b534d575ffc4e789bd44f4e78e8d5e
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri May 12 13:28:56 2017 +0200

    ar71xx: enable nand-utils in the mikrotik subtarget to ensure it makes it to initramfs
    
    Without it, sysupgrade from initramfs to nand fails
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 target/linux/ar71xx/image/mikrotik.mk  | 4 ++--
 target/linux/ar71xx/mikrotik/target.mk | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/ar71xx/image/mikrotik.mk b/target/linux/ar71xx/image/mikrotik.mk
index 0631c1d..4047b72 100644
--- a/target/linux/ar71xx/image/mikrotik.mk
+++ b/target/linux/ar71xx/image/mikrotik.mk
@@ -1,6 +1,6 @@
 define Device/mikrotik
   PROFILES := Default
-  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport nand-utils
+  DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport
   BOARD_NAME := routerboard
   KERNEL_INITRAMFS :=
   KERNEL_NAME := loader-generic.elf
@@ -26,7 +26,7 @@ TARGET_DEVICES += nand-64m nand-large
 
 define Device/rb-nor-flash-16M
   DEVICE_TITLE := MikroTik RouterBoard with 16 MB SPI NOR flash
-  DEVICE_PACKAGES := rbcfg rssileds
+  DEVICE_PACKAGES := rbcfg rssileds -nand-utils
   IMAGE_SIZE := 16000k
   LOADER_TYPE := elf
   KERNEL_INSTALL := 1
diff --git a/target/linux/ar71xx/mikrotik/target.mk b/target/linux/ar71xx/mikrotik/target.mk
index 90ef51e..ff2bbbf 100644
--- a/target/linux/ar71xx/mikrotik/target.mk
+++ b/target/linux/ar71xx/mikrotik/target.mk
@@ -1,6 +1,8 @@
 BOARDNAME:=Mikrotik devices with NAND/NOR flash
 FEATURES += squashfs ramdisk minor nand
 
+DEFAULT_PACKAGES += nand-utils
+
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based Mikrotik boards.
 	e.g. MikroTik RB-4xx or RB-750



More information about the lede-commits mailing list