diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2020-07-09 22:19:53 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-12 12:21:48 +0100 |
| commit | 329665d68b17479ccd11fa60479c9c7a8b2355a8 (patch) | |
| tree | b8516d1f44dd3dedd839715d152351667d54f425 | |
| parent | 2c53213a1b9571b6cca01e70ba4c3e3af4f4b418 (diff) | |
| download | poky-329665d68b17479ccd11fa60479c9c7a8b2355a8.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.
(From OE-Core rev: af687c9137a3e8efe48afa6fd12866cf656ae913)
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ | |||
| 1 | # returns all the elements from the src uri that are .cfg files | ||
| 2 | def find_cfgs(d): | ||
| 3 | sources=src_patches(d, True) | ||
| 4 | sources_list=[] | ||
| 5 | for s in sources: | ||
| 6 | if s.endswith('.cfg'): | ||
| 7 | sources_list.append(s) | ||
| 8 | |||
| 9 | return sources_list | ||
| 10 | |||
| 1 | cml1_do_configure() { | 11 | cml1_do_configure() { |
| 2 | set -e | 12 | set -e |
| 3 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 13 | 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 2666de647c..251178db33 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" | |||
| 70 | UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" | 70 | UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" |
| 71 | UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" | 71 | UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" |
| 72 | 72 | ||
| 73 | # returns all the elements from the src uri that are .cfg files | ||
| 74 | def find_cfgs(d): | ||
| 75 | sources=src_patches(d, True) | ||
| 76 | sources_list=[] | ||
| 77 | for s in sources: | ||
| 78 | if s.endswith('.cfg'): | ||
| 79 | sources_list.append(s) | ||
| 80 | |||
| 81 | return sources_list | ||
| 82 | |||
| 83 | do_configure () { | 73 | do_configure () { |
| 84 | if [ -n "${UBOOT_CONFIG}" ]; then | 74 | if [ -n "${UBOOT_CONFIG}" ]; then |
| 85 | unset i j | 75 | 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 () { | |||
| 133 | fi | 133 | fi |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | # returns all the elements from the src uri that are .cfg files | ||
| 137 | def find_cfgs(d): | ||
| 138 | sources=src_patches(d, True) | ||
| 139 | sources_list=[] | ||
| 140 | for s in sources: | ||
| 141 | if s.endswith('.cfg'): | ||
| 142 | sources_list.append(s) | ||
| 143 | |||
| 144 | return sources_list | ||
| 145 | |||
| 146 | do_configure () { | 136 | do_configure () { |
| 147 | set -x | 137 | set -x |
| 148 | do_prepare_config | 138 | do_prepare_config |
