[openwrt/openwrt] ath79: image: allow changing kernel option in mkubntimage

LEDE Commits lede-commits at lists.infradead.org
Mon Nov 20 15:33:39 PST 2023


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/7901fec6b8faf56b59e123437146f73819a95034

commit 7901fec6b8faf56b59e123437146f73819a95034
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Wed Aug 16 20:28:01 2023 +0200

    ath79: image: allow changing kernel option in mkubntimage
    
    Backport didn't include changes to mkubntimage invocation, which allowed
    to pass arguments. This in result produces broken routerstation factory
    images, which have kernel embedded as kernel partition instead of LZMA
    loader.
    
    Fixes: #13260
    Fixes: 8e09f9ffc3cc ("ath79: switch some RedBoot based devices to OKLI loader")
    Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
---
 target/linux/ath79/image/common-ubnt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/ath79/image/common-ubnt.mk b/target/linux/ath79/image/common-ubnt.mk
index 625f0b4f3f..76d6de000b 100644
--- a/target/linux/ath79/image/common-ubnt.mk
+++ b/target/linux/ath79/image/common-ubnt.mk
@@ -10,7 +10,7 @@ UBNT_REVISION := $(VERSION_DIST)-$(REVISION)
 define Build/mkubntimage
 	-$(STAGING_DIR_HOST)/bin/mkfwimage -B $(UBNT_BOARD) \
 		-v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-$(VERSION_DIST)-$(REVISION) \
-		-k $(IMAGE_KERNEL) -r $@ -o $@
+		-k $(if $(1),$(1),$(IMAGE_KERNEL)) -r $@ -o $@
 endef
 
 define Build/mkubntimage2




More information about the lede-commits mailing list