* [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments @ 2011-05-24 22:31 Darren Hart 2011-05-24 22:31 ` [PATCH 1/1] " Darren Hart 2011-05-25 6:32 ` [PATCH 0/1] " Saul Wold 0 siblings, 2 replies; 8+ messages in thread From: Darren Hart @ 2011-05-24 22:31 UTC (permalink / raw) To: openembedded-core From: Darren Hart <dvhart@linux.intel.com> The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44: codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib.git dvhart/build http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build Darren Hart (1): oe-setup-builddir: remove unreachable code, update comments scripts/create-pull-request | 2 +- scripts/oe-setup-builddir | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 20 deletions(-) ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-24 22:31 [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments Darren Hart @ 2011-05-24 22:31 ` Darren Hart 2011-05-24 22:35 ` Darren Hart 2011-05-25 6:32 ` [PATCH 0/1] " Saul Wold 1 sibling, 1 reply; 8+ messages in thread From: Darren Hart @ 2011-05-24 22:31 UTC (permalink / raw) To: openembedded-core From: Darren Hart <dvhart@linux.intel.com> The script forces TEMPLATECONF to be non-empty with: TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} This ensures that OELOCALCONF and OELAYERSCONF will be non-empty as well. Remove all the empty checks for these variables. While this patch doesn't change behavior, all this code was unreachable, it does bring up a point of intent. It appears as though OE*CONF was intended to be configurable by the user via the environment, the code only allows for the user to set TEMPLATECONF. This means that in order to use something other than the sample default configs, the user must specify both a local.conf.sample and a bblayers.conf.sample in their TEMPLATECONF directory. Update the comments to correctly identify the required files as local.conf.sample and bblayers.conf.sample. Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- scripts/create-pull-request | 2 +- scripts/oe-setup-builddir | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index b808146..169b888 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -24,7 +24,7 @@ # submission to Open Embedded and The Yocto Project, as well as to # related projects and layers. # - +set -x ODIR=pull-$$ RELATIVE_TO="master" COMMIT_ID="HEAD" diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5fc8b19..6c2e837 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -37,29 +37,26 @@ fi cd "$BUILDDIR" -TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} # -# $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf +# $TEMPLATECONF can point to a directory for the template local.conf & +# bblayers.conf. If the user hasn't specified a path, default to +# meta-yocto/conf. # -if [ "x" != "x$TEMPLATECONF" ]; then +TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} +if ! (test -d "$TEMPLATECONF"); then + # Allow TEMPLATECONF=meta-xyz/conf as a shortcut + if [ -d "$OEROOT/$TEMPLATECONF" ]; then + TEMPLATECONF="$OEROOT/$TEMPLATECONF" + fi if ! (test -d "$TEMPLATECONF"); then - # Allow TEMPLATECONF=meta-xyz/conf as a shortcut - if [ -d "$OEROOT/$TEMPLATECONF" ]; then - TEMPLATECONF="$OEROOT/$TEMPLATECONF" - fi - if ! (test -d "$TEMPLATECONF"); then - echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf" - return - fi + echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf.sample & bblayers.conf.sample" + return fi - OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" - OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" fi +OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" +OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" -if [ "x" = "x$OECORELOCALCONF" ]; then - OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" -fi if ! (test -r "$BUILDDIR/conf/local.conf"); then cat <<EOM You had no conf/local.conf file. This configuration file has therefore been @@ -79,9 +76,6 @@ EOM cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf fi -if [ "x" = "x$OECORELAYERCONF" ]; then - OECORELAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" -fi if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then cat <<EOM You had no conf/bblayers.conf file. The configuration file has been created for -- 1.7.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-24 22:31 ` [PATCH 1/1] " Darren Hart @ 2011-05-24 22:35 ` Darren Hart 0 siblings, 0 replies; 8+ messages in thread From: Darren Hart @ 2011-05-24 22:35 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 05/24/2011 03:31 PM, Darren Hart wrote: > From: Darren Hart <dvhart@linux.intel.com> > > The script forces TEMPLATECONF to be non-empty with: > > TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} > > This ensures that OELOCALCONF and OELAYERSCONF will be non-empty as well. Remove > all the empty checks for these variables. > > While this patch doesn't change behavior, all this code was unreachable, it does > bring up a point of intent. It appears as though OE*CONF was intended to be > configurable by the user via the environment, the code only allows for the user > to set TEMPLATECONF. This means that in order to use something other than the > sample default configs, the user must specify both a local.conf.sample and a > bblayers.conf.sample in their TEMPLATECONF directory. > > Update the comments to correctly identify the required files as local.conf.sample > and bblayers.conf.sample. > > Signed-off-by: Darren Hart <dvhart@linux.intel.com> > --- > scripts/create-pull-request | 2 +- > scripts/oe-setup-builddir | 32 +++++++++++++------------------- > 2 files changed, 14 insertions(+), 20 deletions(-) > > diff --git a/scripts/create-pull-request b/scripts/create-pull-request > index b808146..169b888 100755 > --- a/scripts/create-pull-request > +++ b/scripts/create-pull-request > @@ -24,7 +24,7 @@ > # submission to Open Embedded and The Yocto Project, as well as to > # related projects and layers. > # > - > +set -x EEEK, sorry about that. I've removed this and re-pushed to the same contrib/dvhart/build branch. The only file changed is scripts/oe-setup-builddir. Apologies. -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-24 22:31 [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments Darren Hart 2011-05-24 22:31 ` [PATCH 1/1] " Darren Hart @ 2011-05-25 6:32 ` Saul Wold 2011-05-25 17:58 ` Darren Hart 1 sibling, 1 reply; 8+ messages in thread From: Saul Wold @ 2011-05-25 6:32 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Darren Hart On 05/24/2011 03:31 PM, Darren Hart wrote: > From: Darren Hart<dvhart@linux.intel.com> > > The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44: > > codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100) > > are available in the git repository at: > git://git.pokylinux.org/poky-contrib.git dvhart/build > http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build > > Darren Hart (1): > oe-setup-builddir: remove unreachable code, update comments > > scripts/create-pull-request | 2 +- > scripts/oe-setup-builddir | 32 +++++++++++++------------------- > 2 files changed, 14 insertions(+), 20 deletions(-) > > If this is intended for oe-core, please rebase to oe-core and resend, I had a merge issue and want to make sure I am getting the right code committed. Sau! > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-25 6:32 ` [PATCH 0/1] " Saul Wold @ 2011-05-25 17:58 ` Darren Hart 2011-05-25 21:49 ` Saul Wold 0 siblings, 1 reply; 8+ messages in thread From: Darren Hart @ 2011-05-25 17:58 UTC (permalink / raw) To: Saul Wold; +Cc: Patches and discussions about the oe-core layer On 05/24/2011 11:32 PM, Saul Wold wrote: > On 05/24/2011 03:31 PM, Darren Hart wrote: >> From: Darren Hart<dvhart@linux.intel.com> >> >> The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44: >> >> codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100) >> >> are available in the git repository at: >> git://git.pokylinux.org/poky-contrib.git dvhart/build >> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build >> >> Darren Hart (1): >> oe-setup-builddir: remove unreachable code, update comments >> >> scripts/create-pull-request | 2 +- >> scripts/oe-setup-builddir | 32 +++++++++++++------------------- >> 2 files changed, 14 insertions(+), 20 deletions(-) >> >> > If this is intended for oe-core, please rebase to oe-core and resend, I > had a merge issue and want to make sure I am getting the right code > committed. Gah, right. I saw the oe- in the script name and just had oe-core in my head. Apologies. The two scripts are slightly different in the two repositories, but both suffer from the same unreachable code problem. Would you prefer I send two patches, one for each repository, or that I push to one or the other and let you handle the merge process as part of the regular sync up process (whatever that is). Before I do that - are people in agreement with the approach? ie Should I be removing the unreachable code or should I instead making it usable again, reestablishing the functionality of OELOCALCONF and OELAYERSCONF? -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-25 17:58 ` Darren Hart @ 2011-05-25 21:49 ` Saul Wold 2011-05-25 22:38 ` Richard Purdie 0 siblings, 1 reply; 8+ messages in thread From: Saul Wold @ 2011-05-25 21:49 UTC (permalink / raw) To: Darren Hart, Richard Purdie Cc: Patches and discussions about the oe-core layer On 05/25/2011 10:58 AM, Darren Hart wrote: > > > On 05/24/2011 11:32 PM, Saul Wold wrote: >> On 05/24/2011 03:31 PM, Darren Hart wrote: >>> From: Darren Hart<dvhart@linux.intel.com> >>> >>> The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44: >>> >>> codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100) >>> >>> are available in the git repository at: >>> git://git.pokylinux.org/poky-contrib.git dvhart/build >>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build >>> >>> Darren Hart (1): >>> oe-setup-builddir: remove unreachable code, update comments >>> >>> scripts/create-pull-request | 2 +- >>> scripts/oe-setup-builddir | 32 +++++++++++++------------------- >>> 2 files changed, 14 insertions(+), 20 deletions(-) >>> >>> >> If this is intended for oe-core, please rebase to oe-core and resend, I >> had a merge issue and want to make sure I am getting the right code >> committed. > > > Gah, right. I saw the oe- in the script name and just had oe-core in my > head. Apologies. The two scripts are slightly different in the two > repositories, but both suffer from the same unreachable code problem. > > Would you prefer I send two patches, one for each repository, or that I > push to one or the other and let you handle the merge process as part of > the regular sync up process (whatever that is). > Typically, if something is part of oe-core than a patch request goes there and then Richard will pull it across to poky. This is a special case and I am not sure how he is handling this currently. So we need Richard to chime in on this one. SaU! > Before I do that - are people in agreement with the approach? ie Should > I be removing the unreachable code or should I instead making it usable > again, reestablishing the functionality of OELOCALCONF and OELAYERSCONF? > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-25 21:49 ` Saul Wold @ 2011-05-25 22:38 ` Richard Purdie 2011-05-25 23:39 ` Darren Hart 0 siblings, 1 reply; 8+ messages in thread From: Richard Purdie @ 2011-05-25 22:38 UTC (permalink / raw) To: Saul Wold; +Cc: Darren Hart, Patches, oe-core layer On Wed, 2011-05-25 at 14:49 -0700, Saul Wold wrote: > On 05/25/2011 10:58 AM, Darren Hart wrote: > > > > > > On 05/24/2011 11:32 PM, Saul Wold wrote: > >> On 05/24/2011 03:31 PM, Darren Hart wrote: > >>> From: Darren Hart<dvhart@linux.intel.com> > >>> > >>> The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44: > >>> > >>> codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100) > >>> > >>> are available in the git repository at: > >>> git://git.pokylinux.org/poky-contrib.git dvhart/build > >>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build > >>> > >>> Darren Hart (1): > >>> oe-setup-builddir: remove unreachable code, update comments > >>> > >>> scripts/create-pull-request | 2 +- > >>> scripts/oe-setup-builddir | 32 +++++++++++++------------------- > >>> 2 files changed, 14 insertions(+), 20 deletions(-) > >>> > >>> > >> If this is intended for oe-core, please rebase to oe-core and resend, I > >> had a merge issue and want to make sure I am getting the right code > >> committed. > > > > > > Gah, right. I saw the oe- in the script name and just had oe-core in my > > head. Apologies. The two scripts are slightly different in the two > > repositories, but both suffer from the same unreachable code problem. > > > > Would you prefer I send two patches, one for each repository, or that I > > push to one or the other and let you handle the merge process as part of > > the regular sync up process (whatever that is). > > > Typically, if something is part of oe-core than a patch request goes > there and then Richard will pull it across to poky. This is a special > case and I am not sure how he is handling this currently. So we need > Richard to chime in on this one. They should be the same script, that is what I've been aiming for. If they're not, we need to work out how to get them there... Cheers, Richard ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments 2011-05-25 22:38 ` Richard Purdie @ 2011-05-25 23:39 ` Darren Hart 0 siblings, 0 replies; 8+ messages in thread From: Darren Hart @ 2011-05-25 23:39 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On 05/25/2011 03:38 PM, Richard Purdie wrote: > On Wed, 2011-05-25 at 14:49 -0700, Saul Wold wrote: >> On 05/25/2011 10:58 AM, Darren Hart wrote: >>> >>> >>> On 05/24/2011 11:32 PM, Saul Wold wrote: >>>> On 05/24/2011 03:31 PM, Darren Hart wrote: >>>>> From: Darren Hart<dvhart@linux.intel.com> >>>>> >>>>> The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44: >>>>> >>>>> codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100) >>>>> >>>>> are available in the git repository at: >>>>> git://git.pokylinux.org/poky-contrib.git dvhart/build >>>>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build >>>>> >>>>> Darren Hart (1): >>>>> oe-setup-builddir: remove unreachable code, update comments >>>>> >>>>> scripts/create-pull-request | 2 +- >>>>> scripts/oe-setup-builddir | 32 +++++++++++++------------------- >>>>> 2 files changed, 14 insertions(+), 20 deletions(-) >>>>> >>>>> >>>> If this is intended for oe-core, please rebase to oe-core and resend, I >>>> had a merge issue and want to make sure I am getting the right code >>>> committed. >>> >>> >>> Gah, right. I saw the oe- in the script name and just had oe-core in my >>> head. Apologies. The two scripts are slightly different in the two >>> repositories, but both suffer from the same unreachable code problem. >>> >>> Would you prefer I send two patches, one for each repository, or that I >>> push to one or the other and let you handle the merge process as part of >>> the regular sync up process (whatever that is). >>> >> Typically, if something is part of oe-core than a patch request goes >> there and then Richard will pull it across to poky. This is a special >> case and I am not sure how he is handling this currently. So we need >> Richard to chime in on this one. > > They should be the same script, that is what I've been aiming for. If > they're not, we need to work out how to get them there... The diff is quite minimal: -TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} +TEMPLATECONF=${TEMPLATECONF:-meta/conf} We could have a templateconf symlink or we could modify a common conf directory for systems that incorporate oe-core. Failing that we would need a yocto specific wrapper to the setup scripts to specify our preferred directory. I will send the patch as is based on oe and ask that it be merged to poky as well. > > Cheers, > > Richard > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-05-25 23:42 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-05-24 22:31 [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments Darren Hart 2011-05-24 22:31 ` [PATCH 1/1] " Darren Hart 2011-05-24 22:35 ` Darren Hart 2011-05-25 6:32 ` [PATCH 0/1] " Saul Wold 2011-05-25 17:58 ` Darren Hart 2011-05-25 21:49 ` Saul Wold 2011-05-25 22:38 ` Richard Purdie 2011-05-25 23:39 ` Darren Hart
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.