linux-yocto: explicitly export KMETA to scripts
The kern-tools scripts can support a meta branch and directory of a name that isn't "meta", but they need the name passed through the environment variable KMETA. ensuring that KMETA is exported in the shell environment sets the stage to support flexible meta branch name. (From OE-Core rev: 9b90c8ace04c88ac6105f0bf686f9abc70fe8074) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d78662e6d4
commit
a9f11849d8
|
@ -45,6 +45,7 @@ def find_urls(d):
|
||||||
|
|
||||||
do_patch() {
|
do_patch() {
|
||||||
cd ${S}
|
cd ${S}
|
||||||
|
export KMETA=${KMETA}
|
||||||
|
|
||||||
# if kernel tools are available in-tree, they are preferred
|
# if kernel tools are available in-tree, they are preferred
|
||||||
# and are placed on the path before any external tools. Unless
|
# and are placed on the path before any external tools. Unless
|
||||||
|
@ -62,7 +63,7 @@ do_patch() {
|
||||||
if [ -n "${KMETA}" ]; then
|
if [ -n "${KMETA}" ]; then
|
||||||
createme_flags="--disable-meta-gen"
|
createme_flags="--disable-meta-gen"
|
||||||
fi
|
fi
|
||||||
createme ${createme_flags} ${ARCH} ${kbranch}
|
createme ${createme_flags} --meta ${KMETA} ${ARCH} ${kbranch}
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "ERROR. Could not create ${kbranch}"
|
echo "ERROR. Could not create ${kbranch}"
|
||||||
exit 1
|
exit 1
|
||||||
|
@ -180,6 +181,7 @@ addtask kernel_checkout before do_patch after do_unpack
|
||||||
do_kernel_configme[dirs] = "${S} ${B}"
|
do_kernel_configme[dirs] = "${S} ${B}"
|
||||||
do_kernel_configme() {
|
do_kernel_configme() {
|
||||||
echo "[INFO] doing kernel configme"
|
echo "[INFO] doing kernel configme"
|
||||||
|
export KMETA=${KMETA}
|
||||||
|
|
||||||
if [ -n ${KCONFIG_MODE} ]; then
|
if [ -n ${KCONFIG_MODE} ]; then
|
||||||
configmeflags=${KCONFIG_MODE}
|
configmeflags=${KCONFIG_MODE}
|
||||||
|
@ -220,6 +222,7 @@ python do_kernel_configcheck() {
|
||||||
# are corrected to the proper commit.
|
# are corrected to the proper commit.
|
||||||
do_validate_branches() {
|
do_validate_branches() {
|
||||||
cd ${S}
|
cd ${S}
|
||||||
|
export KMETA=${KMETA}
|
||||||
|
|
||||||
set +e
|
set +e
|
||||||
# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
|
# if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
|
||||||
|
|
|
@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
|
||||||
|
|
||||||
DEPENDS = "git-native guilt-native"
|
DEPENDS = "git-native guilt-native"
|
||||||
|
|
||||||
SRCREV = "12c39b76eca4ed993b5ffb38cbe89e0608b216c3"
|
SRCREV = "579b1ba2169d053c1330854f54f605bb6929d6d8"
|
||||||
PR = "r12"
|
PR = "r12"
|
||||||
PV = "0.1+git${SRCPV}"
|
PV = "0.1+git${SRCPV}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue