summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2020-07-09 22:19:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-10 19:07:40 +0100
commitb118808d5cd7d60c302ad00d22984934f5e810c1 (patch)
tree64de47da646ba2e03a3da509ed49a87a5fe1fa44 /meta
parentbda47d47dfffeac2549de749aa09758bb0be8ff8 (diff)
downloadpoky-b118808d5cd7d60c302ad00d22984934f5e810c1.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: b0fb7f18f9091db50204ef1ebd5248739ddcd6c2) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cml1.bbclass10
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc10
-rw-r--r--meta/recipes-core/busybox/busybox.inc10
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
2def 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
1cml1_do_configure() { 11cml1_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 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"
70UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" 70UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf"
71UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" 71UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}"
72 72
73# returns all the elements from the src uri that are .cfg files
74def 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
83do_configure () { 73do_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
137def 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
146do_configure () { 136do_configure () {
147 set -x 137 set -x
148 do_prepare_config 138 do_prepare_config