From e624b2700abc93990b58bef0ba9447373148a31c Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 17 Aug 2010 17:34:59 +0100 Subject: build/conf: move sample conf files to meta/conf Currently rm -fr build breaks things badly but will work if we move the sample configuration files to meta/conf - this patch does so. Signed-off-by: Joshua Lock --- build/conf/bblayers.conf.sample | 10 --- build/conf/local.conf.sample | 151 ---------------------------------------- build/conf/site.conf.sample | 40 ----------- meta/conf/bblayers.conf.sample | 10 +++ meta/conf/local.conf.sample | 151 ++++++++++++++++++++++++++++++++++++++++ meta/conf/site.conf.sample | 40 +++++++++++ scripts/poky-env-internal | 4 +- 7 files changed, 203 insertions(+), 203 deletions(-) delete mode 100644 build/conf/bblayers.conf.sample delete mode 100644 build/conf/local.conf.sample delete mode 100644 build/conf/site.conf.sample create mode 100644 meta/conf/bblayers.conf.sample create mode 100644 meta/conf/local.conf.sample create mode 100644 meta/conf/site.conf.sample diff --git a/build/conf/bblayers.conf.sample b/build/conf/bblayers.conf.sample deleted file mode 100644 index d361f244d9..0000000000 --- a/build/conf/bblayers.conf.sample +++ /dev/null @@ -1,10 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "2" - -BBFILES ?= "" -BBLAYERS = " \ - ##POKYBASE##/meta \ - ##POKYBASE##/meta-moblin \ - ##POKYBASE##/meta-emenlow \ - " diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample deleted file mode 100644 index 66acaa49a7..0000000000 --- a/build/conf/local.conf.sample +++ /dev/null @@ -1,151 +0,0 @@ -# CONF_VERSION is increased each time build/conf/ changes incompatibly -CONF_VERSION = "1" - -# Uncomment and change to cache the files Poky downloads in an alternative -# location, default it ${TOPDIR}/sources -#DL_DIR ?= "${TOPDIR}/sources" -# Uncomment and change to cache Poky's built staging output in an alternative -# location, default ${TOPDIR}/pstage -#PSTAGE_DIR ?= "${TOPDIR}/pstage" - -# Uncomment and set to allow bitbake to execute multiple tasks at once. -# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would -# be appropriate. -# BB_NUMBER_THREADS = "4" -# Also, make can be passed flags so it run parallel threads e.g.: -# PARALLEL_MAKE = "-j 4" - -# The machine to target -MACHINE ?= "qemux86" - -# Other supported machines -#MACHINE ?= "qemuarm" -#MACHINE ?= "netbook" -#MACHINE ?= "c7x0" -#MACHINE ?= "akita" -#MACHINE ?= "spitz" -#MACHINE ?= "nokia770" -#MACHINE ?= "nokia800" -#MACHINE ?= "fic-gta01" -#MACHINE ?= "bootcdx86" -#MACHINE ?= "cm-x270" -#MACHINE ?= "em-x270" -#MACHINE ?= "htcuniversal" -#MACHINE ?= "mx31ads" -#MACHINE ?= "mx31litekit" -#MACHINE ?= "mx31phy" -#MACHINE ?= "zylonite" -#MACHINE ?= "igep0020" -#MACHINE ?= "igep0030" - -DISTRO ?= "poky" -# For bleeding edge / experimental / unstable package versions -# DISTRO ?= "poky-bleeding" - -BBMASK = "" - -# EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images -# (Some of these are automatically added to certain image types) -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "tools-profile" - add profiling tools (oprofile, exmap, lttng valgrind (x86 only)) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image for suitable of development -# e.g. ssh root access has a blank password -# There are other application targets too, see meta/classes/poky-image.bbclass -# and meta/packages/tasks/task-poky.bb for more details. - -EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" - -# The default IMAGE_FEATURES above are too large for the mx31phy and -# c700/c750 machines which have limited space. The code below limits -# the default features for those machines. -EXTRA_IMAGE_FEATURES_c7x0 = "tools-testapps debug-tweaks" -EXTRA_IMAGE_FEATURES_mx31phy = "debug-tweaks" -EXTRA_IMAGE_FEATURES_mx31ads = "tools-testapps debug-tweaks" - -# A list of packaging systems used in generated images -# The first package type listed will be used for rootfs generation -# include 'package_deb' for debs -# include 'package_ipk' for ipks -#PACKAGE_CLASSES ?= "package_deb package_ipk" -PACKAGE_CLASSES ?= "package_ipk" - -# A list of additional classes to use when building the system -# include 'image-prelink' in order to prelink the filesystem image -USER_CLASSES ?= "image-prelink" - -# POKYMODE controls the characteristics of the generated packages/images by -# telling poky which type of toolchain to use. -# -# Options include several different EABI combinations and a compatibility -# mode for the OABI mode poky previously used. -# -# The default is "eabi" -# Use "oabi" for machines with kernels < 2.6.18 on ARM for example. -# Use "external-MODE" to use the precompiled external toolchains where MODE -# is the type of external toolchain to use e.g. eabi. -# POKYMODE = "external-eabi" - -# Uncomment this to specify where BitBake should create its temporary files. -# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard -# disk space, so make sure to free enough space. The default TMPDIR is -# /tmp -#TMPDIR = "${POKYBASE}/build/tmp" - - -# Uncomment this if you are using the Openedhand provided qemu deb - see README -# ASSUME_PROVIDED += "qemu-native" - -# Comment this out if you don't have a 3.x gcc version available and wish -# poky to build one for you. The 3.x gcc is required to build qemu-native. -# ASSUME_PROVIDED += "gcc3-native" - -# Uncomment these two if you want BitBake to build images useful for debugging. -# DEBUG_BUILD = "1" -# INHIBIT_PACKAGE_STRIP = "1" - -# Uncomment these to build a package such that you can use gprof to profile it. -# NOTE: This will only work with 'linux' targets, not -# 'linux-uclibc', as uClibc doesn't provide the necessary -# object files. Also, don't build glibc itself with these -# flags, or it'll fail to build. -# -# PROFILE_OPTIMIZATION = "-pg" -# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" -# LDFLAGS =+ "-pg" - -# Uncomment this if you want BitBake to emit debugging output -# BBDEBUG = "yes" -# Uncomment this if you want BitBake to emit the log if a build fails. -BBINCLUDELOGS = "yes" - -# Set this if you wish to make pkgconfig libraries from your system available -# for native builds. Combined with extra ASSUME_PROVIDEDs this can allow -# native builds of applications like oprofileui-native (unsupported feature). -#EXTRA_NATIVE_PKGCONFIG_PATH = ":/usr/lib/pkgconfig" -#ASSUME_PROVIDED += "gtk+-native libglade-native" - -ENABLE_BINARY_LOCALE_GENERATION = "1" - -# The architecture to build SDK items for, by setting this you can build SDK -# packages for architectures other than the host i.e. building i586 packages -# on an x86_64 host. -# Supported values are i586 and x86_64 -#SDKMACHINE ?= "i586" - -# Poky can try and fetch packaged-staging packages from a http, https or ftp -# mirror. Set this variable to the root of a pstage directory on a server. -#PSTAGE_MIRROR ?= "http://someserver.tld/share/pstage" - -# Set IMAGETEST to qemu if you want to build testcases and start -# testing in qemu after do_rootfs. -#IMAGETEST = "qemu" - -# By default testing will run the sanitytest suite. If you want to run other tests -# (e.g. bat), list them here -#TEST_SCEN = "sanitytest bat" diff --git a/build/conf/site.conf.sample b/build/conf/site.conf.sample deleted file mode 100644 index 42042042f7..0000000000 --- a/build/conf/site.conf.sample +++ /dev/null @@ -1,40 +0,0 @@ -# -# local.conf covers user settings, site.conf covers site specific information -# such as proxy server addresses and optionally any shared download location -# -# SITE_CONF_VERSION is increased each time build/conf/site.conf -# changes incompatibly -SCONF_VERSION = "1" - -# Uncomment to cause CVS to use the proxy host specified -#CVS_PROXY_HOST = "proxy.example.com" -#CVS_PROXY_PORT = "81" - -# For svn, you need to create ~/.subversion/servers containing: -#[global] -#http-proxy-host = proxy.example.com -#http-proxy-port = 81 -# - -# Uncomment to cause git to use the proxy host specificed -# although this only works for http -#GIT_PROXY_HOST = "proxy.example.com" -#GIT_PROXY_PORT = "81" -#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-command" - -# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access -#GIT_CORE_CONFIG = "Yes" -#GIT_PROXY_IGNORE_1 = "host.server.com" -#GIT_PROXY_IGNORE_2 = "another.server.com" - -# If SOCKS is available run the following command to comple a simple transport -# gcc scripts/poky-git-proxy-socks.c -o poky-git-proxy-socks -# and then share that binary somewhere in PATH, then use the following settings -#GIT_PROXY_HOST = "proxy.example.com" -#GIT_PROXY_PORT = "81" -#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-socks-command" - - -# Uncomment this to use a shared download directory -#DL_DIR = "/some/shared/download/directory/" - diff --git a/meta/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample new file mode 100644 index 0000000000..d361f244d9 --- /dev/null +++ b/meta/conf/bblayers.conf.sample @@ -0,0 +1,10 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "2" + +BBFILES ?= "" +BBLAYERS = " \ + ##POKYBASE##/meta \ + ##POKYBASE##/meta-moblin \ + ##POKYBASE##/meta-emenlow \ + " diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample new file mode 100644 index 0000000000..66acaa49a7 --- /dev/null +++ b/meta/conf/local.conf.sample @@ -0,0 +1,151 @@ +# CONF_VERSION is increased each time build/conf/ changes incompatibly +CONF_VERSION = "1" + +# Uncomment and change to cache the files Poky downloads in an alternative +# location, default it ${TOPDIR}/sources +#DL_DIR ?= "${TOPDIR}/sources" +# Uncomment and change to cache Poky's built staging output in an alternative +# location, default ${TOPDIR}/pstage +#PSTAGE_DIR ?= "${TOPDIR}/pstage" + +# Uncomment and set to allow bitbake to execute multiple tasks at once. +# For a quadcore, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would +# be appropriate. +# BB_NUMBER_THREADS = "4" +# Also, make can be passed flags so it run parallel threads e.g.: +# PARALLEL_MAKE = "-j 4" + +# The machine to target +MACHINE ?= "qemux86" + +# Other supported machines +#MACHINE ?= "qemuarm" +#MACHINE ?= "netbook" +#MACHINE ?= "c7x0" +#MACHINE ?= "akita" +#MACHINE ?= "spitz" +#MACHINE ?= "nokia770" +#MACHINE ?= "nokia800" +#MACHINE ?= "fic-gta01" +#MACHINE ?= "bootcdx86" +#MACHINE ?= "cm-x270" +#MACHINE ?= "em-x270" +#MACHINE ?= "htcuniversal" +#MACHINE ?= "mx31ads" +#MACHINE ?= "mx31litekit" +#MACHINE ?= "mx31phy" +#MACHINE ?= "zylonite" +#MACHINE ?= "igep0020" +#MACHINE ?= "igep0030" + +DISTRO ?= "poky" +# For bleeding edge / experimental / unstable package versions +# DISTRO ?= "poky-bleeding" + +BBMASK = "" + +# EXTRA_IMAGE_FEATURES allows extra packages to be added to the generated images +# (Some of these are automatically added to certain image types) +# "dbg-pkgs" - add -dbg packages for all installed packages +# (adds symbol information for debugging/profiling) +# "dev-pkgs" - add -dev packages for all installed packages +# (useful if you want to develop against libs in the image) +# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) +# "tools-debug" - add debugging tools (gdb, strace) +# "tools-profile" - add profiling tools (oprofile, exmap, lttng valgrind (x86 only)) +# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) +# "debug-tweaks" - make an image for suitable of development +# e.g. ssh root access has a blank password +# There are other application targets too, see meta/classes/poky-image.bbclass +# and meta/packages/tasks/task-poky.bb for more details. + +EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" + +# The default IMAGE_FEATURES above are too large for the mx31phy and +# c700/c750 machines which have limited space. The code below limits +# the default features for those machines. +EXTRA_IMAGE_FEATURES_c7x0 = "tools-testapps debug-tweaks" +EXTRA_IMAGE_FEATURES_mx31phy = "debug-tweaks" +EXTRA_IMAGE_FEATURES_mx31ads = "tools-testapps debug-tweaks" + +# A list of packaging systems used in generated images +# The first package type listed will be used for rootfs generation +# include 'package_deb' for debs +# include 'package_ipk' for ipks +#PACKAGE_CLASSES ?= "package_deb package_ipk" +PACKAGE_CLASSES ?= "package_ipk" + +# A list of additional classes to use when building the system +# include 'image-prelink' in order to prelink the filesystem image +USER_CLASSES ?= "image-prelink" + +# POKYMODE controls the characteristics of the generated packages/images by +# telling poky which type of toolchain to use. +# +# Options include several different EABI combinations and a compatibility +# mode for the OABI mode poky previously used. +# +# The default is "eabi" +# Use "oabi" for machines with kernels < 2.6.18 on ARM for example. +# Use "external-MODE" to use the precompiled external toolchains where MODE +# is the type of external toolchain to use e.g. eabi. +# POKYMODE = "external-eabi" + +# Uncomment this to specify where BitBake should create its temporary files. +# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard +# disk space, so make sure to free enough space. The default TMPDIR is +# /tmp +#TMPDIR = "${POKYBASE}/build/tmp" + + +# Uncomment this if you are using the Openedhand provided qemu deb - see README +# ASSUME_PROVIDED += "qemu-native" + +# Comment this out if you don't have a 3.x gcc version available and wish +# poky to build one for you. The 3.x gcc is required to build qemu-native. +# ASSUME_PROVIDED += "gcc3-native" + +# Uncomment these two if you want BitBake to build images useful for debugging. +# DEBUG_BUILD = "1" +# INHIBIT_PACKAGE_STRIP = "1" + +# Uncomment these to build a package such that you can use gprof to profile it. +# NOTE: This will only work with 'linux' targets, not +# 'linux-uclibc', as uClibc doesn't provide the necessary +# object files. Also, don't build glibc itself with these +# flags, or it'll fail to build. +# +# PROFILE_OPTIMIZATION = "-pg" +# SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" +# LDFLAGS =+ "-pg" + +# Uncomment this if you want BitBake to emit debugging output +# BBDEBUG = "yes" +# Uncomment this if you want BitBake to emit the log if a build fails. +BBINCLUDELOGS = "yes" + +# Set this if you wish to make pkgconfig libraries from your system available +# for native builds. Combined with extra ASSUME_PROVIDEDs this can allow +# native builds of applications like oprofileui-native (unsupported feature). +#EXTRA_NATIVE_PKGCONFIG_PATH = ":/usr/lib/pkgconfig" +#ASSUME_PROVIDED += "gtk+-native libglade-native" + +ENABLE_BINARY_LOCALE_GENERATION = "1" + +# The architecture to build SDK items for, by setting this you can build SDK +# packages for architectures other than the host i.e. building i586 packages +# on an x86_64 host. +# Supported values are i586 and x86_64 +#SDKMACHINE ?= "i586" + +# Poky can try and fetch packaged-staging packages from a http, https or ftp +# mirror. Set this variable to the root of a pstage directory on a server. +#PSTAGE_MIRROR ?= "http://someserver.tld/share/pstage" + +# Set IMAGETEST to qemu if you want to build testcases and start +# testing in qemu after do_rootfs. +#IMAGETEST = "qemu" + +# By default testing will run the sanitytest suite. If you want to run other tests +# (e.g. bat), list them here +#TEST_SCEN = "sanitytest bat" diff --git a/meta/conf/site.conf.sample b/meta/conf/site.conf.sample new file mode 100644 index 0000000000..42042042f7 --- /dev/null +++ b/meta/conf/site.conf.sample @@ -0,0 +1,40 @@ +# +# local.conf covers user settings, site.conf covers site specific information +# such as proxy server addresses and optionally any shared download location +# +# SITE_CONF_VERSION is increased each time build/conf/site.conf +# changes incompatibly +SCONF_VERSION = "1" + +# Uncomment to cause CVS to use the proxy host specified +#CVS_PROXY_HOST = "proxy.example.com" +#CVS_PROXY_PORT = "81" + +# For svn, you need to create ~/.subversion/servers containing: +#[global] +#http-proxy-host = proxy.example.com +#http-proxy-port = 81 +# + +# Uncomment to cause git to use the proxy host specificed +# although this only works for http +#GIT_PROXY_HOST = "proxy.example.com" +#GIT_PROXY_PORT = "81" +#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-command" + +# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access +#GIT_CORE_CONFIG = "Yes" +#GIT_PROXY_IGNORE_1 = "host.server.com" +#GIT_PROXY_IGNORE_2 = "another.server.com" + +# If SOCKS is available run the following command to comple a simple transport +# gcc scripts/poky-git-proxy-socks.c -o poky-git-proxy-socks +# and then share that binary somewhere in PATH, then use the following settings +#GIT_PROXY_HOST = "proxy.example.com" +#GIT_PROXY_PORT = "81" +#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-socks-command" + + +# Uncomment this to use a shared download directory +#DL_DIR = "/some/shared/download/directory/" + diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal index 3279fb0bea..e8d8f2b037 100755 --- a/scripts/poky-env-internal +++ b/scripts/poky-env-internal @@ -59,7 +59,7 @@ if ! (test -d "$BITBAKEDIR" && test -d "$BUILDDIR"); then fi if [ "x" = "x$POKYLOCALCONF" ]; then - POKYLOCALCONF="$OEROOT/build/conf/local.conf.sample" + POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample" fi if ! (test -r "$BUILDDIR/conf/local.conf"); then echo "You had no conf/local.conf file. Poky has created this configuration file for you" @@ -73,7 +73,7 @@ if ! (test -r "$BUILDDIR/conf/local.conf"); then fi if [ "x" = "x$POKYLAYERCONF" ]; then - POKYLAYERCONF="$OEROOT/build/conf/bblayers.conf.sample" + POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" fi if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then echo "You had no conf/bblayers.conf file. Poky has created this configuration file for you" -- cgit v1.2.3-54-g00ecf