diff --git a/kas.yml b/kas.yml index 61770bf..03b1a2c 100644 --- a/kas.yml +++ b/kas.yml @@ -27,6 +27,14 @@ repos: url: https://github.com/linux-sunxi/meta-sunxi refspec: 8f5b915749709f21c2af543fdcde0898aff60154 +meta-dasharo: + url: https://github.com/Dasharo/meta-dasharo + refspec: 9883d91f5cf0ed07b119b3bcf8e877e5f958ff2f + +meta-coreboot: + url: https://github.com/zarhus/meta-coreboot + refspec: 0cac162d0ce90161a7941b65eb8c4fc6eb1d3706 + meta-arm: url: https://git.yoctoproject.org/git/meta-arm refspec: 58268ddccbe2780de28513273e15193ee949987b diff --git a/recipes-coreboot/coreboot-utils/coreboot-utils/0001-utils-do-not-override-compiler-variables.patch b/recipes-coreboot/coreboot-utils/coreboot-utils/0001-utils-do-not-override-compiler-variables.patch deleted file mode 100644 index b499ba3..0000000 --- a/recipes-coreboot/coreboot-utils/coreboot-utils/0001-utils-do-not-override-compiler-variables.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8f8e70702ff375ef4b4e583011d233fae69db3bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= -Date: Mon, 4 Jun 2018 08:51:42 +0200 -Subject: [PATCH] utils: do not override compiler variables -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Żygowski ---- - util/cbfstool/Makefile | 1 + - util/ifdtool/Makefile | 10 +++++----- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile -index ba8fdffb89..ae9f6dfada 100644 ---- a/util/cbfstool/Makefile -+++ b/util/cbfstool/Makefile -@@ -8,6 +8,7 @@ PREFIX ?= /usr/local - BINDIR ?= $(PREFIX)/bin - INSTALL ?= /usr/bin/install - OBJCOPY ?= objcopy -+LDFLAGS ?= $(LDFLAGS) --hash-style=gnu - - VBOOT_SOURCE ?= $(top)/3rdparty/vboot - -diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile -index 936aa50f90..74fd4dcef8 100644 ---- a/util/ifdtool/Makefile -+++ b/util/ifdtool/Makefile -@@ -15,11 +15,11 @@ - - PROGRAM = ifdtool - --CC = gcc --INSTALL = /usr/bin/install --PREFIX = /usr/local --CFLAGS = -O2 -g -Wall -W -Werror -I../../src/commonlib/include --LDFLAGS = -+CC ?= $(CC) -+INSTALL ?= /usr/bin/install -+PREFIX ?= /usr/local -+CFLAGS += -O2 -g -Wall -W -Werror -I../../src/commonlib/include -+LDFLAGS ?= $(LDFLAGS) - - OBJS = ifdtool.o - --- -2.17.0 - diff --git a/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb b/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb deleted file mode 100644 index dab13dd..0000000 --- a/recipes-coreboot/coreboot-utils/coreboot-utils_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "coreboot tools" -HOMEPAGE = "https://github.com/coreboot/coreboot/README.md" -SECTION = "coreboot" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -# checkout 4.8.1 tag -PV = "0.1+${SRCREV}" -SRC_URI = " \ - gitsm://github.com/coreboot/coreboot.git;protocol=https;branch=4.8_branch \ - file://0001-utils-do-not-override-compiler-variables.patch \ - " -SRCREV = "6794ce02d45273427c1c6675950c8468380c040a" - -# this indicates the folder to run do_compile from. -S = "${WORKDIR}/git" - -PACKAGES =+ "cbfstool ifdtool" - -FILES:cbfstool += "${bindir}/cbfstool" -FILES:ifdtool += "${bindir}/ifdtool" - -INSANE_SKIP:cbfstool = "ldflags" -INSANE_SKIP:ifdtool = "ldflags" - -# this command will be run to compile your source code. it assumes you are in the -# directory indicated by S. i'm just going to use make and rely on my Makefile -do_compile () { - oe_runmake -C util/cbfstool - oe_runmake -C util/ifdtool -} - -# this will copy the compiled file and place it in ${bindir}, which is /usr/bin -do_install () { - install -d ${D}${bindir} - install -m 0755 ${S}/util/cbfstool/cbfstool ${D}${bindir} - install -m 0755 ${S}/util/ifdtool/ifdtool ${D}${bindir} -} diff --git a/recipes-extended/packagegroups/packagegroup-rte.bb b/recipes-extended/packagegroups/packagegroup-rte.bb index c25be54..7fd04c3 100644 --- a/recipes-extended/packagegroups/packagegroup-rte.bb +++ b/recipes-extended/packagegroups/packagegroup-rte.bb @@ -38,6 +38,7 @@ RDEPENDS:packagegroup-rte-core = " \ openvpn \ xradio-firmware \ xradio \ + dcu \ " RDEPENDS:packagegroup-rte-utils = " \