KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

uboot-mvebu: make hidden and be m for clearfog to fix IB failing to add it

Browse source 
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@gmail.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Jonas Gorski 2016-09-23 13:53:27 +02:00
parent bc1f006b4e
commit d8075b15d0
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/boot/uboot-mvebu/Makefile
View file

@ -21,7 +21,6 @@ PKG_MD5SUM:=973c1d896be751321cc3aafa564f64b2
PKG_LICENSE:=GPL-2.0 GPL-2.0+ PKG_LICENSE:=GPL-2.0 GPL-2.0+
PKG_LICENSE_FILES:=Licenses/README PKG_LICENSE_FILES:=Licenses/README
PKG_TARGETS:=bin
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -33,6 +32,7 @@ endef
define uboot/clearfog define uboot/clearfog
TITLE:=U-Boot for SolidRun ClearFog A1 TITLE:=U-Boot for SolidRun ClearFog A1
DEVICE:=armada-388-clearfog
endef endef
UBOOTS:= \ UBOOTS:= \
@ -42,7 +42,9 @@ define Package/uboot/template
define Package/uboot-mvebu-$(1) define Package/uboot-mvebu-$(1)
SECTION:=boot SECTION:=boot
CATEGORY:=Boot Loaders CATEGORY:=Boot Loaders
DEPENDS:=@TARGET_mvebu DEPENDS:=@(TARGET_DEVICE_mvebu_DEVICE_$(3)||TARGET_mvebu_DEVICE_$(3))
DEFAULT:=m
HIDDEN:=1
TITLE:=$(2) TITLE:=$(2)
URL:=http://www.denx.de/wiki/U-Boot URL:=http://www.denx.de/wiki/U-Boot
VARIANT:=$(1) VARIANT:=$(1)
@ -53,7 +55,7 @@ endef
define BuildUBootPackage define BuildUBootPackage
$(eval $(uboot/Default)) $(eval $(uboot/Default))
$(eval $(uboot/$(1))) $(eval $(uboot/$(1)))
$(call Package/uboot/template,$(1),$(TITLE)) $(call Package/uboot/template,$(1),$(TITLE),$(DEVICE))
endef endef
define Build/Configure define Build/Configure

2
target/linux/mvebu/image/Makefile
View file

@ -175,7 +175,7 @@ define Device/armada-388-clearfog
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL := dtb | kernel-bin KERNEL := dtb | kernel-bin
DEVICE_TITLE := SolidRun ClearFog DEVICE_TITLE := SolidRun ClearFog
DEVICE_PACKAGES := uboot-mvebu-clearfog mkf2fs e2fsprogs DEVICE_PACKAGES := mkf2fs e2fsprogs
IMAGES := bundle.tar.gz sdcard.img.gz IMAGES := bundle.tar.gz sdcard.img.gz
IMAGE/bundle.tar.gz := clearfog-bundle IMAGE/bundle.tar.gz := clearfog-bundle
IMAGE/sdcard.img.gz := boot-scr | boot-img | sdcard-img | gzip IMAGE/sdcard.img.gz := boot-scr | boot-img | sdcard-img | gzip