On 2017-04-12 08:48, Paulo Neves wrote:
Hello,
I thought it would be consistent to have the multiconfig samples to
also be populated just like the local.conf.
I produced a patch accordingly:
From 6091978f666463c46093203b74f28b82a9bf4d47 Mon Sep 17 00:00:00 2001
From: Paulo Neves <paulo.de_sousa_ne...@nokia.com>
Date: Mon, 3 Apr 2017 11:23:12 +0200
Subject: [PATCH 1/2] multiconfig samples are now put in the build dir.
The users of multiconfig which use the templateconf
mechanism may also want the multiconfig samples to
be retrieved from the template configuration
directories. This patch allows for that.
It only copies the .conf.sample files. It does not
create the multiconfig directory if the templateconf
directory does not exist or have any sample files.
---
scripts/oe-setup-builddir | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index
ef495517aaafd8150313ac1f8f5eb5079c90d09b..783ed20dd49d23fe38fa28d6a105918200a54610
100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -77,11 +77,11 @@ if [ -n "$TEMPLATECONF" ]; then
OECORELOCALCONF="$TEMPLATECONF/local.conf.sample"
OECORENOTESCONF="$TEMPLATECONF/conf-notes.txt"
fi
-
unset SHOWYPDOC
if [ -z "$OECORELOCALCONF" ]; then
OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample"
fi
+
if [ ! -r "$BUILDDIR/conf/local.conf" ]; then
cat <<EOM
You had no conf/local.conf file. This configuration file has therefore been
@@ -91,12 +91,20 @@ for more information as common configuration
options are commented.
EOM
cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf"
+ if ( find "$TEMPLATECONF/multiconfig/" -iname '*.conf.sample'
2>&1 > /dev/null ); then
+ mkdir -p "$BUILDDIR/conf/multiconfig/"
+ cp -fa "$TEMPLATECONF/multiconfig" "$BUILDDIR/conf/"
+ (cd "$BUILDDIR/conf/multiconfig/" &&
+ rename .conf.sample .conf *.conf.sample)
This doesn't look right to me - what are you expecting the 'rename' command to
do?
+ echo "Multiconfig samples detected copying them also.\n"
+ fi
SHOWYPDOC=yes
fi
if [ -z "$OECORELAYERCONF" ]; then
OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
fi
+
if [ ! -r "$BUILDDIR/conf/bblayers.conf" ]; then
cat <<EOM
You had no conf/bblayers.conf file. This configuration file has therefore been
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
