* [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR
@ 2013-09-24 20:50 Chase Maupin
2013-09-24 20:10 ` Cooper Jr., Franklin
0 siblings, 1 reply; 8+ messages in thread
From: Chase Maupin @ 2013-09-24 20:50 UTC (permalink / raw)
To: meta-arago
* This script took a parameter using -d to set the DL_DIR but
ignored that setting. Now if that is set make it the DL_DIR
value in conf/local.conf
* When running this script to get updates changes that were made
to DL_DIR were lost because local.conf was copied over. Now
the script will use the old DL_DIR setting.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
* Updated in version 2
* Removed sh -x setting which was accidentally left over
* Fixed typo in commit message
---
oe-layertool-setup.sh | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
index 55cd174..72e36a2 100755
--- a/oe-layertool-setup.sh
+++ b/oe-layertool-setup.sh
@@ -732,6 +732,22 @@ EOM
threads=`cat /proc/cpuinfo | grep -c processor`
sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j ${threads}\"/" $confdir/local.conf
sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = \"${threads}\"/" $confdir/local.conf
+
+ # Find if old DL_DIR was set
+ if [ -e $confdir/local.conf.bak ]
+ then
+ old_dldir=`cat $confdir/local.conf.bak | grep -e "^DL_DIR =" | sed 's|DL_DIR = ||' | sed 's/"//g'`
+ else
+ old_dldir="$dldir"
+ fi
+
+ # If command line option was not set use the old dldir
+ if [ "x$dldir" == "x" ]
+ then
+ dldir=$old_dldir
+ fi
+
+ sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" $confdir/local.conf
}
@@ -838,7 +854,6 @@ cd -
sourcedir="$oebase/sources"
builddir="$oebase/build"
confdir="$builddir/conf"
-dldir="$oebase/downloads"
check_input
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-24 20:50 [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR Chase Maupin @ 2013-09-24 20:10 ` Cooper Jr., Franklin 2013-09-24 20:18 ` Dmytriyenko, Denys 0 siblings, 1 reply; 8+ messages in thread From: Cooper Jr., Franklin @ 2013-09-24 20:10 UTC (permalink / raw) To: Maupin, Chase, meta-arago@arago-project.org Acked-by: Franklin Cooper Jr. <fcooper@ti.com> > -----Original Message----- > From: meta-arago-bounces@arago-project.org [mailto:meta-arago- > bounces@arago-project.org] On Behalf Of Maupin, Chase > Sent: Tuesday, September 24, 2013 3:50 PM > To: meta-arago@arago-project.org > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR > > * This script took a parameter using -d to set the DL_DIR but > ignored that setting. Now if that is set make it the DL_DIR > value in conf/local.conf > * When running this script to get updates changes that were made > to DL_DIR were lost because local.conf was copied over. Now > the script will use the old DL_DIR setting. > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > --- > * Updated in version 2 > * Removed sh -x setting which was accidentally left over > * Fixed typo in commit message > --- > oe-layertool-setup.sh | 17 ++++++++++++++++- > 1 files changed, 16 insertions(+), 1 deletions(-) > > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh index > 55cd174..72e36a2 100755 > --- a/oe-layertool-setup.sh > +++ b/oe-layertool-setup.sh > @@ -732,6 +732,22 @@ EOM > threads=`cat /proc/cpuinfo | grep -c processor` > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j ${threads}\"/" > $confdir/local.conf > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = > \"${threads}\"/" $confdir/local.conf > + > + # Find if old DL_DIR was set > + if [ -e $confdir/local.conf.bak ] > + then > + old_dldir=`cat $confdir/local.conf.bak | grep -e "^DL_DIR =" | sed > 's|DL_DIR = ||' | sed 's/"//g'` > + else > + old_dldir="$dldir" > + fi > + > + # If command line option was not set use the old dldir > + if [ "x$dldir" == "x" ] > + then > + dldir=$old_dldir > + fi > + > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" $confdir/local.conf > } > > > @@ -838,7 +854,6 @@ cd - > sourcedir="$oebase/sources" > builddir="$oebase/build" > confdir="$builddir/conf" > -dldir="$oebase/downloads" > > check_input > > -- > 1.7.0.4 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-24 20:10 ` Cooper Jr., Franklin @ 2013-09-24 20:18 ` Dmytriyenko, Denys 2013-09-24 20:23 ` Maupin, Chase 2013-09-26 20:00 ` Denys Dmytriyenko 0 siblings, 2 replies; 8+ messages in thread From: Dmytriyenko, Denys @ 2013-09-24 20:18 UTC (permalink / raw) To: Maupin, Chase, meta-arago@arago-project.org, Cooper Jr., Franklin [-- Attachment #1: Type: text/plain, Size: 2806 bytes --] Ack Denys -----Original Message----- From: Cooper Jr., Franklin [fcooper@ti.com] Received: Tuesday, 24 Sep 2013, 16:10 To: Maupin, Chase [chase.maupin@ti.com]; meta-arago@arago-project.org [meta-arago@arago-project.org] Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR Acked-by: Franklin Cooper Jr. <fcooper@ti.com> > -----Original Message----- > From: meta-arago-bounces@arago-project.org [mailto:meta-arago- > bounces@arago-project.org] On Behalf Of Maupin, Chase > Sent: Tuesday, September 24, 2013 3:50 PM > To: meta-arago@arago-project.org > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR > > * This script took a parameter using -d to set the DL_DIR but > ignored that setting. Now if that is set make it the DL_DIR > value in conf/local.conf > * When running this script to get updates changes that were made > to DL_DIR were lost because local.conf was copied over. Now > the script will use the old DL_DIR setting. > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > --- > * Updated in version 2 > * Removed sh -x setting which was accidentally left over > * Fixed typo in commit message > --- > oe-layertool-setup.sh | 17 ++++++++++++++++- > 1 files changed, 16 insertions(+), 1 deletions(-) > > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh index > 55cd174..72e36a2 100755 > --- a/oe-layertool-setup.sh > +++ b/oe-layertool-setup.sh > @@ -732,6 +732,22 @@ EOM > threads=`cat /proc/cpuinfo | grep -c processor` > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j ${threads}\"/" > $confdir/local.conf > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = > \"${threads}\"/" $confdir/local.conf > + > + # Find if old DL_DIR was set > + if [ -e $confdir/local.conf.bak ] > + then > + old_dldir=`cat $confdir/local.conf.bak | grep -e "^DL_DIR =" | sed > 's|DL_DIR = ||' | sed 's/"//g'` > + else > + old_dldir="$dldir" > + fi > + > + # If command line option was not set use the old dldir > + if [ "x$dldir" == "x" ] > + then > + dldir=$old_dldir > + fi > + > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" $confdir/local.conf > } > > > @@ -838,7 +854,6 @@ cd - > sourcedir="$oebase/sources" > builddir="$oebase/build" > confdir="$builddir/conf" > -dldir="$oebase/downloads" > > check_input > > -- > 1.7.0.4 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago [-- Attachment #2: Type: text/html, Size: 4983 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-24 20:18 ` Dmytriyenko, Denys @ 2013-09-24 20:23 ` Maupin, Chase 2013-09-26 20:00 ` Denys Dmytriyenko 1 sibling, 0 replies; 8+ messages in thread From: Maupin, Chase @ 2013-09-24 20:23 UTC (permalink / raw) To: Dmytriyenko, Denys, meta-arago@arago-project.org, Cooper Jr., Franklin [-- Attachment #1: Type: text/plain, Size: 3547 bytes --] Pushed. Sincerely, Chase Maupin Integration Team Manager Linux Core Product Development e-mail: chase.maupin@ti.com phone: (214) 567-2950 For support: Forums - http://community.ti.com/forums/ Wiki - http://wiki.davincidsp.com/ From: Dmytriyenko, Denys Sent: Tuesday, September 24, 2013 3:18 PM To: Maupin, Chase; meta-arago@arago-project.org; Cooper Jr., Franklin Subject: RE: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR Ack Denys -----Original Message----- From: Cooper Jr., Franklin [fcooper@ti.com] Received: Tuesday, 24 Sep 2013, 16:10 To: Maupin, Chase [chase.maupin@ti.com]; meta-arago@arago-project.org<mailto:meta-arago@arago-project.org> [meta-arago@arago-project.org] Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR Acked-by: Franklin Cooper Jr. <fcooper@ti.com<mailto:fcooper@ti.com>> > -----Original Message----- > From: meta-arago-bounces@arago-project.org<mailto:meta-arago-bounces@arago-project.org> [mailto:meta-arago- > bounces@arago-project.org<mailto:bounces@arago-project.org>] On Behalf Of Maupin, Chase > Sent: Tuesday, September 24, 2013 3:50 PM > To: meta-arago@arago-project.org<mailto:meta-arago@arago-project.org> > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR > > * This script took a parameter using -d to set the DL_DIR but > ignored that setting. Now if that is set make it the DL_DIR > value in conf/local.conf > * When running this script to get updates changes that were made > to DL_DIR were lost because local.conf was copied over. Now > the script will use the old DL_DIR setting. > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com<mailto:Chase.Maupin@ti.com>> > > --- > * Updated in version 2 > * Removed sh -x setting which was accidentally left over > * Fixed typo in commit message > --- > oe-layertool-setup.sh | 17 ++++++++++++++++- > 1 files changed, 16 insertions(+), 1 deletions(-) > > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh index > 55cd174..72e36a2 100755 > --- a/oe-layertool-setup.sh > +++ b/oe-layertool-setup.sh > @@ -732,6 +732,22 @@ EOM > threads=`cat /proc/cpuinfo | grep -c processor` > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j ${threads}\"/" > $confdir/local.conf > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = > \"${threads}\"/" $confdir/local.conf > + > + # Find if old DL_DIR was set > + if [ -e $confdir/local.conf.bak ] > + then > + old_dldir=`cat $confdir/local.conf.bak | grep -e "^DL_DIR =" | sed > 's|DL_DIR = ||' | sed 's/"//g'` > + else > + old_dldir="$dldir" > + fi > + > + # If command line option was not set use the old dldir > + if [ "x$dldir" == "x" ] > + then > + dldir=$old_dldir > + fi > + > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" $confdir/local.conf > } > > > @@ -838,7 +854,6 @@ cd - > sourcedir="$oebase/sources" > builddir="$oebase/build" > confdir="$builddir/conf" > -dldir="$oebase/downloads" > > check_input > > -- > 1.7.0.4 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org<mailto:meta-arago@arago-project.org> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list meta-arago@arago-project.org<mailto:meta-arago@arago-project.org> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago [-- Attachment #2: Type: text/html, Size: 8835 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-24 20:18 ` Dmytriyenko, Denys 2013-09-24 20:23 ` Maupin, Chase @ 2013-09-26 20:00 ` Denys Dmytriyenko 2013-09-26 20:16 ` Maupin, Chase 1 sibling, 1 reply; 8+ messages in thread From: Denys Dmytriyenko @ 2013-09-26 20:00 UTC (permalink / raw) To: Maupin, Chase, meta-arago@arago-project.org, Cooper Jr., Franklin I believe there is a bug introduced by this patch - DL_DIR doesn't get set with default on first run when no -d option is specified... On Tue, Sep 24, 2013 at 04:18:11PM -0400, Dmytriyenko, Denys wrote: > Ack > > Denys > > -----Original Message----- > From: Cooper Jr., Franklin [fcooper@ti.com] > Received: Tuesday, 24 Sep 2013, 16:10 > To: Maupin, Chase [chase.maupin@ti.com]; meta-arago@arago-project.org > [meta-arago@arago-project.org] > Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set > DL_DIR > > Acked-by: Franklin Cooper Jr. <fcooper@ti.com> > > > -----Original Message----- > > From: meta-arago-bounces@arago-project.org [mailto:meta-arago- > > bounces@arago-project.org] On Behalf Of Maupin, Chase > > Sent: Tuesday, September 24, 2013 3:50 PM > > To: meta-arago@arago-project.org > > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: properly set > DL_DIR > > > > * This script took a parameter using -d to set the DL_DIR but > > ignored that setting. Now if that is set make it the DL_DIR > > value in conf/local.conf > > * When running this script to get updates changes that were made > > to DL_DIR were lost because local.conf was copied over. Now > > the script will use the old DL_DIR setting. > > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > > > > --- > > * Updated in version 2 > > * Removed sh -x setting which was accidentally left over > > * Fixed typo in commit message > > --- > > oe-layertool-setup.sh | 17 ++++++++++++++++- > > 1 files changed, 16 insertions(+), 1 deletions(-) > > > > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh index > > 55cd174..72e36a2 100755 > > --- a/oe-layertool-setup.sh > > +++ b/oe-layertool-setup.sh > > @@ -732,6 +732,22 @@ EOM > > threads=`cat /proc/cpuinfo | grep -c processor` > > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j ${threads}\"/" > > $confdir/local.conf > > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = > > \"${threads}\"/" $confdir/local.conf > > + > > + # Find if old DL_DIR was set > > + if [ -e $confdir/local.conf.bak ] > > + then > > + old_dldir=`cat $confdir/local.conf.bak | grep -e "^DL_DIR =" | > sed > > 's|DL_DIR = ||' | sed 's/"//g'` > > + else > > + old_dldir="$dldir" > > + fi > > + > > + # If command line option was not set use the old dldir > > + if [ "x$dldir" == "x" ] > > + then > > + dldir=$old_dldir > > + fi > > + > > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" $confdir/local.conf > > } > > > > > > @@ -838,7 +854,6 @@ cd - > > sourcedir="$oebase/sources" > > builddir="$oebase/build" > > confdir="$builddir/conf" > > -dldir="$oebase/downloads" > > > > check_input > > > > -- > > 1.7.0.4 > > > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-26 20:00 ` Denys Dmytriyenko @ 2013-09-26 20:16 ` Maupin, Chase 2013-09-26 20:19 ` Denys Dmytriyenko 0 siblings, 1 reply; 8+ messages in thread From: Maupin, Chase @ 2013-09-26 20:16 UTC (permalink / raw) To: Dmytriyenko, Denys, meta-arago@arago-project.org, Cooper Jr., Franklin Let me check. So no existing local.conf and no -d option? Sincerely, Chase Maupin Integration Team Manager Linux Core Product Development e-mail: chase.maupin@ti.com phone: (214) 567-2950 For support: Forums - http://community.ti.com/forums/ Wiki - http://wiki.davincidsp.com/ >-----Original Message----- >From: Dmytriyenko, Denys >Sent: Thursday, September 26, 2013 3:00 PM >To: Maupin, Chase; meta-arago@arago-project.org; Cooper Jr., >Franklin >Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >properly set DL_DIR > >I believe there is a bug introduced by this patch - DL_DIR doesn't >get set >with default on first run when no -d option is specified... > > >On Tue, Sep 24, 2013 at 04:18:11PM -0400, Dmytriyenko, Denys >wrote: >> Ack >> >> Denys >> >> -----Original Message----- >> From: Cooper Jr., Franklin [fcooper@ti.com] >> Received: Tuesday, 24 Sep 2013, 16:10 >> To: Maupin, Chase [chase.maupin@ti.com]; meta-arago@arago- >project.org >> [meta-arago@arago-project.org] >> Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >properly set >> DL_DIR >> >> Acked-by: Franklin Cooper Jr. <fcooper@ti.com> >> >> > -----Original Message----- >> > From: meta-arago-bounces@arago-project.org [mailto:meta- >arago- >> > bounces@arago-project.org] On Behalf Of Maupin, Chase >> > Sent: Tuesday, September 24, 2013 3:50 PM >> > To: meta-arago@arago-project.org >> > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >properly set >> DL_DIR >> > >> > * This script took a parameter using -d to set the DL_DIR >but >> > ignored that setting. Now if that is set make it the >DL_DIR >> > value in conf/local.conf >> > * When running this script to get updates changes that were >made >> > to DL_DIR were lost because local.conf was copied over. >Now >> > the script will use the old DL_DIR setting. >> > >> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> >> > >> > --- >> > * Updated in version 2 >> > * Removed sh -x setting which was accidentally left >over >> > * Fixed typo in commit message >> > --- >> > oe-layertool-setup.sh | 17 ++++++++++++++++- >> > 1 files changed, 16 insertions(+), 1 deletions(-) >> > >> > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh >index >> > 55cd174..72e36a2 100755 >> > --- a/oe-layertool-setup.sh >> > +++ b/oe-layertool-setup.sh >> > @@ -732,6 +732,22 @@ EOM >> > threads=`cat /proc/cpuinfo | grep -c processor` >> > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j >${threads}\"/" >> > $confdir/local.conf >> > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = >> > \"${threads}\"/" $confdir/local.conf >> > + >> > + # Find if old DL_DIR was set >> > + if [ -e $confdir/local.conf.bak ] >> > + then >> > + old_dldir=`cat $confdir/local.conf.bak | grep -e >"^DL_DIR =" | >> sed >> > 's|DL_DIR = ||' | sed 's/"//g'` >> > + else >> > + old_dldir="$dldir" >> > + fi >> > + >> > + # If command line option was not set use the old dldir >> > + if [ "x$dldir" == "x" ] >> > + then >> > + dldir=$old_dldir >> > + fi >> > + >> > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" >$confdir/local.conf >> > } >> > >> > >> > @@ -838,7 +854,6 @@ cd - >> > sourcedir="$oebase/sources" >> > builddir="$oebase/build" >> > confdir="$builddir/conf" >> > -dldir="$oebase/downloads" >> > >> > check_input >> > >> > -- >> > 1.7.0.4 >> > >> > _______________________________________________ >> > meta-arago mailing list >> > meta-arago@arago-project.org >> > http://arago-project.org/cgi-bin/mailman/listinfo/meta- >arago >> _______________________________________________ >> meta-arago mailing list >> meta-arago@arago-project.org >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-26 20:16 ` Maupin, Chase @ 2013-09-26 20:19 ` Denys Dmytriyenko 2013-09-26 20:19 ` Maupin, Chase 0 siblings, 1 reply; 8+ messages in thread From: Denys Dmytriyenko @ 2013-09-26 20:19 UTC (permalink / raw) To: Maupin, Chase; +Cc: meta-arago@arago-project.org, Cooper Jr., Franklin Correct. You should probably not remove the old default: > dldir="$oebase/downloads" Denys On Thu, Sep 26, 2013 at 04:16:23PM -0400, Maupin, Chase wrote: > Let me check. So no existing local.conf and no -d option? > > Sincerely, > Chase Maupin > Integration Team Manager > Linux Core Product Development > e-mail: chase.maupin@ti.com > phone: (214) 567-2950 > > For support: > Forums - http://community.ti.com/forums/ > Wiki - http://wiki.davincidsp.com/ > > > >-----Original Message----- > >From: Dmytriyenko, Denys > >Sent: Thursday, September 26, 2013 3:00 PM > >To: Maupin, Chase; meta-arago@arago-project.org; Cooper Jr., > >Franklin > >Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: > >properly set DL_DIR > > > >I believe there is a bug introduced by this patch - DL_DIR doesn't > >get set > >with default on first run when no -d option is specified... > > > > > >On Tue, Sep 24, 2013 at 04:18:11PM -0400, Dmytriyenko, Denys > >wrote: > >> Ack > >> > >> Denys > >> > >> -----Original Message----- > >> From: Cooper Jr., Franklin [fcooper@ti.com] > >> Received: Tuesday, 24 Sep 2013, 16:10 > >> To: Maupin, Chase [chase.maupin@ti.com]; meta-arago@arago- > >project.org > >> [meta-arago@arago-project.org] > >> Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: > >properly set > >> DL_DIR > >> > >> Acked-by: Franklin Cooper Jr. <fcooper@ti.com> > >> > >> > -----Original Message----- > >> > From: meta-arago-bounces@arago-project.org [mailto:meta- > >arago- > >> > bounces@arago-project.org] On Behalf Of Maupin, Chase > >> > Sent: Tuesday, September 24, 2013 3:50 PM > >> > To: meta-arago@arago-project.org > >> > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: > >properly set > >> DL_DIR > >> > > >> > * This script took a parameter using -d to set the DL_DIR > >but > >> > ignored that setting. Now if that is set make it the > >DL_DIR > >> > value in conf/local.conf > >> > * When running this script to get updates changes that were > >made > >> > to DL_DIR were lost because local.conf was copied over. > >Now > >> > the script will use the old DL_DIR setting. > >> > > >> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> > >> > > >> > --- > >> > * Updated in version 2 > >> > * Removed sh -x setting which was accidentally left > >over > >> > * Fixed typo in commit message > >> > --- > >> > oe-layertool-setup.sh | 17 ++++++++++++++++- > >> > 1 files changed, 16 insertions(+), 1 deletions(-) > >> > > >> > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh > >index > >> > 55cd174..72e36a2 100755 > >> > --- a/oe-layertool-setup.sh > >> > +++ b/oe-layertool-setup.sh > >> > @@ -732,6 +732,22 @@ EOM > >> > threads=`cat /proc/cpuinfo | grep -c processor` > >> > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j > >${threads}\"/" > >> > $confdir/local.conf > >> > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = > >> > \"${threads}\"/" $confdir/local.conf > >> > + > >> > + # Find if old DL_DIR was set > >> > + if [ -e $confdir/local.conf.bak ] > >> > + then > >> > + old_dldir=`cat $confdir/local.conf.bak | grep -e > >"^DL_DIR =" | > >> sed > >> > 's|DL_DIR = ||' | sed 's/"//g'` > >> > + else > >> > + old_dldir="$dldir" > >> > + fi > >> > + > >> > + # If command line option was not set use the old dldir > >> > + if [ "x$dldir" == "x" ] > >> > + then > >> > + dldir=$old_dldir > >> > + fi > >> > + > >> > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" > >$confdir/local.conf > >> > } > >> > > >> > > >> > @@ -838,7 +854,6 @@ cd - > >> > sourcedir="$oebase/sources" > >> > builddir="$oebase/build" > >> > confdir="$builddir/conf" > >> > -dldir="$oebase/downloads" > >> > > >> > check_input > >> > > >> > -- > >> > 1.7.0.4 > >> > > >> > _______________________________________________ > >> > meta-arago mailing list > >> > meta-arago@arago-project.org > >> > http://arago-project.org/cgi-bin/mailman/listinfo/meta- > >arago > >> _______________________________________________ > >> meta-arago mailing list > >> meta-arago@arago-project.org > >> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR 2013-09-26 20:19 ` Denys Dmytriyenko @ 2013-09-26 20:19 ` Maupin, Chase 0 siblings, 0 replies; 8+ messages in thread From: Maupin, Chase @ 2013-09-26 20:19 UTC (permalink / raw) To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org, Cooper Jr., Franklin Yep. That is the fix I'm testing now Sincerely, Chase Maupin Integration Team Manager Linux Core Product Development e-mail: chase.maupin@ti.com phone: (214) 567-2950 For support: Forums - http://community.ti.com/forums/ Wiki - http://wiki.davincidsp.com/ >-----Original Message----- >From: Dmytriyenko, Denys >Sent: Thursday, September 26, 2013 3:19 PM >To: Maupin, Chase >Cc: meta-arago@arago-project.org; Cooper Jr., Franklin >Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >properly set DL_DIR > >Correct. You should probably not remove the old default: > >> dldir="$oebase/downloads" > >Denys > > >On Thu, Sep 26, 2013 at 04:16:23PM -0400, Maupin, Chase wrote: >> Let me check. So no existing local.conf and no -d option? >> >> Sincerely, >> Chase Maupin >> Integration Team Manager >> Linux Core Product Development >> e-mail: chase.maupin@ti.com >> phone: (214) 567-2950 >> >> For support: >> Forums - http://community.ti.com/forums/ >> Wiki - http://wiki.davincidsp.com/ >> >> >> >-----Original Message----- >> >From: Dmytriyenko, Denys >> >Sent: Thursday, September 26, 2013 3:00 PM >> >To: Maupin, Chase; meta-arago@arago-project.org; Cooper Jr., >> >Franklin >> >Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >> >properly set DL_DIR >> > >> >I believe there is a bug introduced by this patch - DL_DIR >doesn't >> >get set >> >with default on first run when no -d option is specified... >> > >> > >> >On Tue, Sep 24, 2013 at 04:18:11PM -0400, Dmytriyenko, Denys >> >wrote: >> >> Ack >> >> >> >> Denys >> >> >> >> -----Original Message----- >> >> From: Cooper Jr., Franklin [fcooper@ti.com] >> >> Received: Tuesday, 24 Sep 2013, 16:10 >> >> To: Maupin, Chase [chase.maupin@ti.com]; meta-arago@arago- >> >project.org >> >> [meta-arago@arago-project.org] >> >> Subject: Re: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >> >properly set >> >> DL_DIR >> >> >> >> Acked-by: Franklin Cooper Jr. <fcooper@ti.com> >> >> >> >> > -----Original Message----- >> >> > From: meta-arago-bounces@arago-project.org [mailto:meta- >> >arago- >> >> > bounces@arago-project.org] On Behalf Of Maupin, Chase >> >> > Sent: Tuesday, September 24, 2013 3:50 PM >> >> > To: meta-arago@arago-project.org >> >> > Subject: [meta-arago] [PATCHv2] oe-layertool-setup.sh: >> >properly set >> >> DL_DIR >> >> > >> >> > * This script took a parameter using -d to set the >DL_DIR >> >but >> >> > ignored that setting. Now if that is set make it the >> >DL_DIR >> >> > value in conf/local.conf >> >> > * When running this script to get updates changes that >were >> >made >> >> > to DL_DIR were lost because local.conf was copied >over. >> >Now >> >> > the script will use the old DL_DIR setting. >> >> > >> >> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> >> >> > >> >> > --- >> >> > * Updated in version 2 >> >> > * Removed sh -x setting which was accidentally left >> >over >> >> > * Fixed typo in commit message >> >> > --- >> >> > oe-layertool-setup.sh | 17 ++++++++++++++++- >> >> > 1 files changed, 16 insertions(+), 1 deletions(-) >> >> > >> >> > diff --git a/oe-layertool-setup.sh b/oe-layertool- >setup.sh >> >index >> >> > 55cd174..72e36a2 100755 >> >> > --- a/oe-layertool-setup.sh >> >> > +++ b/oe-layertool-setup.sh >> >> > @@ -732,6 +732,22 @@ EOM >> >> > threads=`cat /proc/cpuinfo | grep -c processor` >> >> > sed -i "s/^PARALLEL_MAKE.*/PARALLEL_MAKE = \"-j >> >${threads}\"/" >> >> > $confdir/local.conf >> >> > sed -i "s/^BB_NUMBER_THREADS.*/BB_NUMBER_THREADS = >> >> > \"${threads}\"/" $confdir/local.conf >> >> > + >> >> > + # Find if old DL_DIR was set >> >> > + if [ -e $confdir/local.conf.bak ] >> >> > + then >> >> > + old_dldir=`cat $confdir/local.conf.bak | grep - >e >> >"^DL_DIR =" | >> >> sed >> >> > 's|DL_DIR = ||' | sed 's/"//g'` >> >> > + else >> >> > + old_dldir="$dldir" >> >> > + fi >> >> > + >> >> > + # If command line option was not set use the old >dldir >> >> > + if [ "x$dldir" == "x" ] >> >> > + then >> >> > + dldir=$old_dldir >> >> > + fi >> >> > + >> >> > + sed -i "s|^DL_DIR.*|DL_DIR = \"${dldir}\"|" >> >$confdir/local.conf >> >> > } >> >> > >> >> > >> >> > @@ -838,7 +854,6 @@ cd - >> >> > sourcedir="$oebase/sources" >> >> > builddir="$oebase/build" >> >> > confdir="$builddir/conf" >> >> > -dldir="$oebase/downloads" >> >> > >> >> > check_input >> >> > >> >> > -- >> >> > 1.7.0.4 >> >> > >> >> > _______________________________________________ >> >> > meta-arago mailing list >> >> > meta-arago@arago-project.org >> >> > http://arago-project.org/cgi-bin/mailman/listinfo/meta- >> >arago >> >> _______________________________________________ >> >> meta-arago mailing list >> >> meta-arago@arago-project.org >> >> http://arago-project.org/cgi-bin/mailman/listinfo/meta- >arago ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-09-26 20:19 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-09-24 20:50 [PATCHv2] oe-layertool-setup.sh: properly set DL_DIR Chase Maupin 2013-09-24 20:10 ` Cooper Jr., Franklin 2013-09-24 20:18 ` Dmytriyenko, Denys 2013-09-24 20:23 ` Maupin, Chase 2013-09-26 20:00 ` Denys Dmytriyenko 2013-09-26 20:16 ` Maupin, Chase 2013-09-26 20:19 ` Denys Dmytriyenko 2013-09-26 20:19 ` Maupin, Chase
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.