All of lore.kernel.org
 help / color / mirror / Atom feed
* multiconfig samples not put in the build dir.
@ 2017-04-12  6:48 Paulo Neves
  2017-04-12  6:54 ` Gary Thomas
  0 siblings, 1 reply; 6+ messages in thread
From: Paulo Neves @ 2017-04-12  6:48 UTC (permalink / raw)
  To: Yocto list discussion

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_neves@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)
+        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
-- 
2.6.2


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: multiconfig samples not put in the build dir.
  2017-04-12  6:48 multiconfig samples not put in the build dir Paulo Neves
@ 2017-04-12  6:54 ` Gary Thomas
  2017-04-12  7:02   ` Paulo Neves
  0 siblings, 1 reply; 6+ messages in thread
From: Gary Thomas @ 2017-04-12  6:54 UTC (permalink / raw)
  To: Paulo Neves, Yocto list discussion

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_neves@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
------------------------------------------------------------


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: multiconfig samples not put in the build dir.
  2017-04-12  6:54 ` Gary Thomas
@ 2017-04-12  7:02   ` Paulo Neves
  2017-04-12  7:10     ` Gary Thomas
  0 siblings, 1 reply; 6+ messages in thread
From: Paulo Neves @ 2017-04-12  7:02 UTC (permalink / raw)
  To: Gary Thomas; +Cc: Yocto list discussion

I expect it to rename all the .conf.sample files from .conf.sample to
.conf. Give it a try ;)

On Wed, Apr 12, 2017 at 8:54 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> 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_neves@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
> ------------------------------------------------------------


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: multiconfig samples not put in the build dir.
  2017-04-12  7:02   ` Paulo Neves
@ 2017-04-12  7:10     ` Gary Thomas
       [not found]       ` <CAJO0J4haGc9ML63FgXSDrmSsyxe7NFCZ2ZErW=_U1Kigsobdcw@mail.gmail.com>
  0 siblings, 1 reply; 6+ messages in thread
From: Gary Thomas @ 2017-04-12  7:10 UTC (permalink / raw)
  To: Paulo Neves; +Cc: Yocto list discussion

On 2017-04-12 09:02, Paulo Neves wrote:
> I expect it to rename all the .conf.sample files from .conf.sample to
> .conf. Give it a try ;)

This introduces a new dependency for the rename tool/program which is
a Perl script.  It seems to me that much effort has been made recently
to minimize these scripts, removing bash-isms, etc, and adding this
dependency would drift from that path.

Just my 2c

>
> On Wed, Apr 12, 2017 at 8:54 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>> 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_neves@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
------------------------------------------------------------


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: multiconfig samples not put in the build dir.
       [not found]       ` <CAJO0J4haGc9ML63FgXSDrmSsyxe7NFCZ2ZErW=_U1Kigsobdcw@mail.gmail.com>
@ 2017-04-12  7:28         ` Gary Thomas
  2017-04-12  7:38           ` Paulo Neves
  0 siblings, 1 reply; 6+ messages in thread
From: Gary Thomas @ 2017-04-12  7:28 UTC (permalink / raw)
  To: Paulo Neves; +Cc: yocto

On 2017-04-12 09:15, Paulo Neves wrote:
> Hello Gary.
>
> I didn't know it was not a coreutil. To do it in another way i think
> this simple code will grow. Before refactoring could I have other
> opinions?
>
> We have a very limited environment and even so the rename exists. It
> is part of the util-linux-ng from the kernel...

Not really my call to make.  Also, please keep this discussion on the
mailing list so that everyone benefits.

> On Wed, Apr 12, 2017 at 9:10 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>> On 2017-04-12 09:02, Paulo Neves wrote:
>>>
>>> I expect it to rename all the .conf.sample files from .conf.sample to
>>> .conf. Give it a try ;)
>>
>>
>> This introduces a new dependency for the rename tool/program which is
>> a Perl script.  It seems to me that much effort has been made recently
>> to minimize these scripts, removing bash-isms, etc, and adding this
>> dependency would drift from that path.
>>
>> Just my 2c
>>
>>>
>>> On Wed, Apr 12, 2017 at 8:54 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>>
>>>> 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_neves@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
------------------------------------------------------------


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: multiconfig samples not put in the build dir.
  2017-04-12  7:28         ` Gary Thomas
@ 2017-04-12  7:38           ` Paulo Neves
  0 siblings, 0 replies; 6+ messages in thread
From: Paulo Neves @ 2017-04-12  7:38 UTC (permalink / raw)
  To: Gary Thomas; +Cc: yocto

>Not really my call to make.  Also, please keep this discussion on the
>mailing list so that everyone benefits.

Sorry forgot to hit the reply all. Thanks for the suggestion I am now
waiting input from the rest of the community regarding the
applicability of rename command.

On Wed, Apr 12, 2017 at 9:28 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> On 2017-04-12 09:15, Paulo Neves wrote:
>>
>> Hello Gary.
>>
>> I didn't know it was not a coreutil. To do it in another way i think
>> this simple code will grow. Before refactoring could I have other
>> opinions?
>>
>> We have a very limited environment and even so the rename exists. It
>> is part of the util-linux-ng from the kernel...
>
>
> Not really my call to make.  Also, please keep this discussion on the
> mailing list so that everyone benefits.
>
>> On Wed, Apr 12, 2017 at 9:10 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>
>>> On 2017-04-12 09:02, Paulo Neves wrote:
>>>>
>>>>
>>>> I expect it to rename all the .conf.sample files from .conf.sample to
>>>> .conf. Give it a try ;)
>>>
>>>
>>>
>>> This introduces a new dependency for the rename tool/program which is
>>> a Perl script.  It seems to me that much effort has been made recently
>>> to minimize these scripts, removing bash-isms, etc, and adding this
>>> dependency would drift from that path.
>>>
>>> Just my 2c
>>>
>>>>
>>>> On Wed, Apr 12, 2017 at 8:54 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>>>
>>>>>
>>>>> 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_neves@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
> ------------------------------------------------------------


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2017-04-12  7:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12  6:48 multiconfig samples not put in the build dir Paulo Neves
2017-04-12  6:54 ` Gary Thomas
2017-04-12  7:02   ` Paulo Neves
2017-04-12  7:10     ` Gary Thomas
     [not found]       ` <CAJO0J4haGc9ML63FgXSDrmSsyxe7NFCZ2ZErW=_U1Kigsobdcw@mail.gmail.com>
2017-04-12  7:28         ` Gary Thomas
2017-04-12  7:38           ` Paulo Neves

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.