diff mbox series

[kirkstone,19/31] u-boot: Remove duplicate inherit of cml1

Message ID	ac8a7a94315dda8bf4cb0c9a1ebf846414d02074.1667530733.git.steve@sakoman.com
State	New, archived
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.216.45, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/31] u-boot: Remove duplicate inherit of cml1 Date: Thu, 3 Nov 2022 17:00:54 -1000 Message-Id: <ac8a7a94315dda8bf4cb0c9a1ebf846414d02074.1667530733.git.steve@sakoman.com> In-Reply-To: <cover.1667530733.git.steve@sakoman.com> References: <cover.1667530733.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[kirkstone,01/31] openssl: export necessary env vars in SDK \| expand [kirkstone,01/31] openssl: export necessary env vars in SDK [kirkstone,02/31] openssl: Fix SSL_CERT_FILE to match ca-certs location [kirkstone,03/31] openssl: CVE-2022-3358 Using a Custom Cipher with NID_undef may lead to NULL encr… [kirkstone,04/31] openssl: Upgrade 3.0.5 -> 3.0.7 [kirkstone,05/31] lighttpd: fix CVE-2022-41556 [kirkstone,06/31] tiff: fix CVE-2022-2953 [kirkstone,07/31] expat: backport the fix for CVE-2022-43680 [kirkstone,08/31] wayland: fix CVE-2021-3782 [kirkstone,09/31] cve-update-db-native: add timeout to urlopen() calls [kirkstone,10/31] vim: Upgrade 9.0.0598 -> 9.0.0614 [kirkstone,11/31] vim: upgrade 9.0.0614 -> 9.0.0820 [kirkstone,12/31] ifupdown: upgrade 0.8.37 -> 0.8.39 [kirkstone,13/31] scripts/oe-check-sstate: cleanup [kirkstone,14/31] scripts/oe-check-sstate: force build to run for all targets, specifically populat… [kirkstone,15/31] psplash: add psplash-default in rdepends [kirkstone,16/31] opkg-utils: use a git clone, not a dynamic snapshot [kirkstone,17/31] insane.bbclass: Allow hashlib version that only accepts on parameter [kirkstone,18/31] oe/packagemanager/rpm: don't leak file objects [kirkstone,19/31] u-boot: Remove duplicate inherit of cml1 [kirkstone,20/31] bluez5: add dbus to RDEPENDS [kirkstone,21/31] glib-2.0: fix rare GFileInfo test case failure [kirkstone,22/31] gnutls: Unified package names to lower-case [kirkstone,23/31] meson: make wrapper options sub-command specific [kirkstone,24/31] buildtools-tarball: export certificates to python and curl [kirkstone,25/31] qemu-native: Add PACKAGECONFIG option for jack [kirkstone,26/31] runqemu: Do not perturb script environment [kirkstone,27/31] runqemu: Fix gl-es argument from causing other arguments to be ignored [kirkstone,28/31] overlayfs: Allow not used mount points [kirkstone,29/31] cmake-native: Fix host tool contamination (Bug: 14951) [kirkstone,30/31] ltp: backport clock_gettime04 fix from upstream [kirkstone,31/31] perf: Depend on native setuptools3

Commit Message

Steve Sakoman Nov. 4, 2022, 3 a.m. UTC

From: Alex Kiernan <alex.kiernan@gmail.com>

Splitting u-boot-configure.inc out of the base left duplicate
cml1.bbclass in the base include.

Fixes: fc9a17ad386c ("u-boot: Split do_configure logic into separate file")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 286f91f7659307bcdf0ba541b8d6b56db5604ceb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index f022aed732..b2f33e3826 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -5,7 +5,7 @@  PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 DEPENDS += "${@bb.utils.contains('UBOOT_ENV_SUFFIX', 'scr', 'u-boot-mkimage-native', '', d)}"
 
-inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native kernel-arch
+inherit uboot-config uboot-extlinux-config uboot-sign deploy python3native kernel-arch
 
 DEPENDS += "swig-native"