diff options
| author |   Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2020-07-09 22:19:53 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-09-02 04:56:28 -1000 |
| commit | b0fb7f18f9091db50204ef1ebd5248739ddcd6c2 (patch) | |
| tree | 0a68bc3ed311bf19b70ece0c59540e26226d2d79 | |
| parent | d26c5882ee5dbdb41d5c8903b0e470f2291512a5 (diff) | |
| download | openembedded-core-contrib-b0fb7f18f9091db50204ef1ebd5248739ddcd6c2.tar.gz | |
cml1: Move find_cfgs() helper to cml1.bbclass
u-boot.inc and busybox.inc contain identical copies of this little
helper. They both inherit the cml1 class and use cml1_do_configure
right after having used this helper, and other recipes that want to
write similar logic for doing Kconfig via fragments will also need it
or something equivalent.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit af687c9137a3e8efe48afa6fd12866cf656ae913)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/cml1.bbclass | 10 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 10 |
3 files changed, 10 insertions, 20 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index c7f6723cb3..8ab240589a 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -1,3 +1,13 @@ +# returns all the elements from the src uri that are .cfg files +def find_cfgs(d): + sources=src_patches(d, True) + sources_list=[] + for s in sources: + if s.endswith('.cfg'): + sources_list.append(s) + + return sources_list + cml1_do_configure() { set -e unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 23cc795cab..a88a7a1120 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -70,16 +70,6 @@ UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" -# returns all the elements from the src uri that are .cfg files -def find_cfgs(d): - sources=src_patches(d, True) - sources_list=[] - for s in sources: - if s.endswith('.cfg'): - sources_list.append(s) - - return sources_list - do_configure () { if [ -n "${UBOOT_CONFIG}" ]; then unset i j diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 6cfdcd7344..45aaa2b41c 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -133,16 +133,6 @@ do_prepare_config () { fi } -# returns all the elements from the src uri that are .cfg files -def find_cfgs(d): - sources=src_patches(d, True) - sources_list=[] - for s in sources: - if s.endswith('.cfg'): - sources_list.append(s) - - return sources_list - do_configure () { set -x do_prepare_config |