Commit Graph

13 Commits

Author SHA1 Message Date
Matthieu Crapet 9a928c5f12 oe-setup-builddir: small rework
Changes:
- drop useless subshell creation in test:
if ! (test -r "$BUILDDIR/conf/local.conf"); then$
- replace "source" builtin by "." (bashsism)
- fix indentation 4 spaces (drop some tabs too)
- fix return => exit  (return is not allowed in main)
- drop "sed -i" (doesn't exist in BSD sed)
- for homogeneity, always use [ ] (instead of test)
- replace old [ "x" = "x$VAR" ] by [ -z "$VAR" ]

(From OE-Core rev: 3a116577446f02bda0ef4e035360293ff73c9eef)

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-12 06:04:53 -07:00
Gary Thomas 5662ab61b4 scripts/oe-setup-builddir: Keep track of TEMPLATECONF setting
Keeping track of the TEMPLATECONF variable in the build
tree will let this script produce the same output when
listing 'conf-notes.txt' every time the script is run,
regardless of whether or not TEMPLATECONF has been
provided by the user.

Note that the default value for TEMPLATECONF now comes from
an easily customizable file $OEROOT/.templateconf

(From OE-Core rev: 4474357faf2cbca250e99630d749776fbc80d44b)

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-11 08:14:01 -07:00
Ross Burton 70a16efaa6 oe-setup-builddir: substitute ##OEROOT## when using templates
oe-setup-builddir substitutes ##COREBASE## which seems like it should have the
same value as the variable ${COREBASE}.  In reality it doesn't as ##COREBASE##
is substituted with the value of $OEROOT (the location of the oe-init-build-env
script), whereas ${COREBASE} is set by oe-core to the parent directory of meta/.
If oe-core's meta/ isn't a top-level directory then ##COREBASE## and ${COREBASE}
have different values, which can lead to confusion.

To resolve this, deprecate (but still substitute) ##COREBASE## and substitute
 ##OEROOT# for $OEROOT.

(From OE-Core rev: 1890783928dd1c73105fae32fb6c588afc287ff6)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-13 23:06:03 +01:00
Peter Kjellerstedt a468b0d557 oe-setup-builddir: Allow $OECORENOTESCONF to not exist
(From OE-Core rev: 6fc14169ac0c3001e3a69eda8d07fc0ac93a15ee)

Signed-off-by: Peter Kjellerstedt <pkj@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05 23:05:34 +01:00
Anders Roxell a0bd02db2d oe-setup-builddir: Possibility to customize text.
Possibility to customize the text that is presented to the user when
they execute the script.

(From OE-Core rev: 6ad06582621fc20d09d4d7fd78ea7e175367c187)

Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Tested-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-29 10:40:55 +00:00
Robert P. J. Day 951aa5ea1f Various typoes fixed, all comments or output strings.
Typoes fixed: "enviroment", "editted", "spliting", "scheulder".

(From OE-Core rev: 17e981a857a51b0bec08c929e8539d36d83874b6)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-26 12:13:05 +01:00
Robert P. J. Day 54e8e04a87 scripts: Rename "adt-install" to "adt-installer" in user help.
(From OE-Core rev: 2d97f7e92d1dca3d381f65aeac6904a158d8826c)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-14 15:17:19 +01:00
Richard Purdie 2894dfb8bf scripts/oe-setup-builddir: Fix Yocto documentation links and add a couple of other example targets
This takes into account some feedback from Yocto's tech writer
as mentioned in the bugzilla.

[YOCTO #1182]

(From OE-Core rev: dd090729dad1e7788c9d9eac111d9207bae60fe0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-29 10:57:12 +01:00
Otavio Salvador 915f491a08 scripts/oe-setup-builddir: fix typo
(From OE-Core rev: bf74c17f7c73b22492f6fa069a5bbbdc28e6ddf5)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-10 09:56:20 +01:00
Gary Thomas 29ea5ad86c Need override for TEMPLATECONF
The recently upgraded scripts used to setup the build environment
have made it so that a distribution/layer can no longer provide
the build templates.  This patch restores that possibility.

Note: my patch that created this functionality allowed for the
distribution/layers to provide XXX/conf/local.conf as well as
XXX/conf/local.conf.sample  Any comments on why that was removed?

Thanks

--
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

>From e3370ac5f4e902dd517cb196cfe416c96d309210 Mon Sep 17 00:00:00 2001
From: Gary Thomas <gary@mlbassoc.com>
Date: Mon, 25 Apr 2011 13:43:39 -0600
Subject: [PATCH] oe-setup-builddir: Allow template directory to be overridden

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-05-03 12:12:16 +01:00
Richard Purdie 37ac9a0823 scripts/oe-setup-builddir: Fix up OE-Core/Poky mismatch for now (and fix permissions)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 19:19:33 +01:00
Richard Purdie 65f4b65410 Further cleanup of various poky references
(From OE-Core rev: fe73ea8c510877fe4e3c117985e8f3d0b79ddf1b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 12:56:16 +01:00
Richard Purdie 3ba0b8284d poky-setup-builddir: Rename to oe-setup-builddir and clean up POKY variable references
(From OE-Core rev: ac7411a885f53d687e65fdb6fd02510c09b97dc8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00