[source] uboot-mvebu: make hidden and be m for clearfog to fix IB failing to add it
LEDE Commits
lede-commits at lists.infradead.org
Mon Sep 26 04:29:17 PDT 2016
jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/d8075b15d09acdd02cd874f8969eeab0ecbe3f23
commit d8075b15d09acdd02cd874f8969eeab0ecbe3f23
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Fri Sep 23 13:53:27 2016 +0200
uboot-mvebu: make hidden and be m for clearfog to fix IB failing to add it
Uboot-mvebu isn't a real package, which will break the image builder
when it tries to install it during the packing step. Instead of cleafog
selecting it through its default packages, make it default to m if the
clearfog profile is selected.
This will ensure it is always build, but never added to the rootfs. This
fixes creating images for clearfog with IB.
Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
Acked-by: Felix Fietkau <nbd at nbd.name>
---
package/boot/uboot-mvebu/Makefile | 8 +++++---
target/linux/mvebu/image/Makefile | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile
index 3cf6358..2d01f86 100644
--- a/package/boot/uboot-mvebu/Makefile
+++ b/package/boot/uboot-mvebu/Makefile
@@ -21,7 +21,6 @@ PKG_MD5SUM:=973c1d896be751321cc3aafa564f64b2
PKG_LICENSE:=GPL-2.0 GPL-2.0+
PKG_LICENSE_FILES:=Licenses/README
-PKG_TARGETS:=bin
PKG_BUILD_PARALLEL:=1
@@ -33,6 +32,7 @@ endef
define uboot/clearfog
TITLE:=U-Boot for SolidRun ClearFog A1
+ DEVICE:=armada-388-clearfog
endef
UBOOTS:= \
@@ -42,7 +42,9 @@ define Package/uboot/template
define Package/uboot-mvebu-$(1)
SECTION:=boot
CATEGORY:=Boot Loaders
- DEPENDS:=@TARGET_mvebu
+ DEPENDS:=@(TARGET_DEVICE_mvebu_DEVICE_$(3)||TARGET_mvebu_DEVICE_$(3))
+ DEFAULT:=m
+ HIDDEN:=1
TITLE:=$(2)
URL:=http://www.denx.de/wiki/U-Boot
VARIANT:=$(1)
@@ -53,7 +55,7 @@ endef
define BuildUBootPackage
$(eval $(uboot/Default))
$(eval $(uboot/$(1)))
- $(call Package/uboot/template,$(1),$(TITLE))
+ $(call Package/uboot/template,$(1),$(TITLE),$(DEVICE))
endef
define Build/Configure
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index cf9d3c0..7d58ed7 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -175,7 +175,7 @@ define Device/armada-388-clearfog
KERNEL_INSTALL := 1
KERNEL := dtb | kernel-bin
DEVICE_TITLE := SolidRun ClearFog
- DEVICE_PACKAGES := uboot-mvebu-clearfog mkf2fs e2fsprogs
+ DEVICE_PACKAGES := mkf2fs e2fsprogs
IMAGES := bundle.tar.gz sdcard.img.gz
IMAGE/bundle.tar.gz := clearfog-bundle
IMAGE/sdcard.img.gz := boot-scr | boot-img | sdcard-img | gzip
More information about the lede-commits
mailing list