summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:14:53 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:29:33 (GMT)
commit765d380e33f485a5ba9f10adabbb88440f9eaf07 (patch)
tree37f01d84517cc360a5f60c1d0421ea855a69ac73 /meta-yocto
parent949645e577d68c1e11b53e82df0459629bf4bddd (diff)
downloadpoky-765d380e33f485a5ba9f10adabbb88440f9eaf07.tar.gz
meta-yocto: Catch up with OE-Core renaming
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/bblayers.conf.sample4
-rw-r--r--meta-yocto/conf/distro/poky-lsb.conf2
-rw-r--r--meta-yocto/conf/distro/poky.conf6
-rw-r--r--meta-yocto/conf/local.conf.sample8
-rw-r--r--meta-yocto/conf/site.conf.sample6
5 files changed, 14 insertions, 12 deletions
diff --git a/meta-yocto/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample
index ee85a98..2df038c 100644
--- a/meta-yocto/conf/bblayers.conf.sample
+++ b/meta-yocto/conf/bblayers.conf.sample
@@ -4,6 +4,6 @@ LCONF_VERSION = "4"
4 4
5BBFILES ?= "" 5BBFILES ?= ""
6BBLAYERS = " \ 6BBLAYERS = " \
7 ##POKYBASE##/meta \ 7 ##COREBASE##/meta \
8 ##POKYBASE##/meta-yocto \ 8 ##COREBASE##/meta-yocto \
9 " 9 "
diff --git a/meta-yocto/conf/distro/poky-lsb.conf b/meta-yocto/conf/distro/poky-lsb.conf
index 64603da..eb1cf82 100644
--- a/meta-yocto/conf/distro/poky-lsb.conf
+++ b/meta-yocto/conf/distro/poky-lsb.conf
@@ -1,7 +1,7 @@
1require conf/distro/poky.conf 1require conf/distro/poky.conf
2 2
3DISTRO = "poky-lsb" 3DISTRO = "poky-lsb"
4DISTROOVERRIDES = "poky:poky-lsb" 4DISTROOVERRIDES = "poky:linuxstdbase"
5 5
6DISTRO_FEATURES += "pam largefile" 6DISTRO_FEATURES += "pam largefile"
7PREFERRED_PROVIDER_virtual/libx11 = "libx11" 7PREFERRED_PROVIDER_virtual/libx11 = "libx11"
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 01ff45e..ebd8c5e 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -28,6 +28,8 @@ QA_LOGFILE = "${TMPDIR}/qa.log"
28 28
29IMAGE_ROOTFS_SIZE_ext2 ?= "131072" 29IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
30 30
31LOCALCONF_VERSION = "1"
32
31#IPK_FEED_URIS += " \ 33#IPK_FEED_URIS += " \
32# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ 34# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
33#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ 35#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
@@ -113,7 +115,7 @@ LOCALE_UTF8_ONLY = "0"
113 115
114DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" 116DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci"
115 117
116POKY_EXTRA_RDEPENDS = "task-poky-boot" 118POKY_EXTRA_RDEPENDS = "task-core-boot"
117POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" 119POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
118POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" 120POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config"
119POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" 121POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config"
@@ -146,7 +148,7 @@ COMMERCIAL_VIDEO_PLUGINS ?= ""
146COMMERCIAL_QT ?= "" 148COMMERCIAL_QT ?= ""
147# COMMERCIAL_QT ?= "qmmp" 149# COMMERCIAL_QT ?= "qmmp"
148# Set of common licenses used for license.bbclass 150# Set of common licenses used for license.bbclass
149COMMON_LICENSE_DIR ??= "${POKYBASE}/meta/files/common-licenses" 151COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses"
150 152
151BB_GENERATE_MIRROR_TARBALLS ??= "0" 153BB_GENERATE_MIRROR_TARBALLS ??= "0"
152 154
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 434c684..c739127 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -51,8 +51,8 @@ BBMASK = ""
51# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) 51# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
52# "debug-tweaks" - make an image for suitable of development 52# "debug-tweaks" - make an image for suitable of development
53# e.g. ssh root access has a blank password 53# e.g. ssh root access has a blank password
54# There are other application targets too, see meta/classes/poky-image.bbclass 54# There are other application targets too, see meta/classes/core-image.bbclass
55# and meta/packages/tasks/task-poky.bb for more details. 55# and meta/recipes-core/tasks/task-core.bb for more details.
56 56
57EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" 57EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
58 58
@@ -75,7 +75,7 @@ PACKAGE_CLASSES ?= "package_rpm package_ipk"
75# and less useful for bigger images. Also mklibs library optimization can break the ABI compatibility, so should not be applied to the images which are tobe 75# and less useful for bigger images. Also mklibs library optimization can break the ABI compatibility, so should not be applied to the images which are tobe
76# extended or upgraded later. 76# extended or upgraded later.
77#This enabled mklibs library size optimization just for the specified image. 77#This enabled mklibs library size optimization just for the specified image.
78#MKLIBS_OPTIMIZED_IMAGES ?= "poky-image-minimal" 78#MKLIBS_OPTIMIZED_IMAGES ?= "core-image-minimal"
79#This enable mklibs library size optimization will be for all the images. 79#This enable mklibs library size optimization will be for all the images.
80#MKLIBS_OPTIMIZED_IMAGES ?= "all" 80#MKLIBS_OPTIMIZED_IMAGES ?= "all"
81 81
@@ -102,7 +102,7 @@ USER_CLASSES ?= "image-mklibs image-prelink"
102# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard 102# Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
103# disk space, so make sure to free enough space. The default TMPDIR is 103# disk space, so make sure to free enough space. The default TMPDIR is
104# <build directory>/tmp 104# <build directory>/tmp
105#TMPDIR = "${POKYBASE}/build/tmp" 105#TMPDIR = "${COREBASE}/build/tmp"
106 106
107# The following are used to control options related to debugging. 107# The following are used to control options related to debugging.
108# 108#
diff --git a/meta-yocto/conf/site.conf.sample b/meta-yocto/conf/site.conf.sample
index 4204204..d438298 100644
--- a/meta-yocto/conf/site.conf.sample
+++ b/meta-yocto/conf/site.conf.sample
@@ -20,7 +20,7 @@ SCONF_VERSION = "1"
20# although this only works for http 20# although this only works for http
21#GIT_PROXY_HOST = "proxy.example.com" 21#GIT_PROXY_HOST = "proxy.example.com"
22#GIT_PROXY_PORT = "81" 22#GIT_PROXY_PORT = "81"
23#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-command" 23#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-command"
24 24
25# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access 25# GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access
26#GIT_CORE_CONFIG = "Yes" 26#GIT_CORE_CONFIG = "Yes"
@@ -28,11 +28,11 @@ SCONF_VERSION = "1"
28#GIT_PROXY_IGNORE_2 = "another.server.com" 28#GIT_PROXY_IGNORE_2 = "another.server.com"
29 29
30# If SOCKS is available run the following command to comple a simple transport 30# If SOCKS is available run the following command to comple a simple transport
31# gcc scripts/poky-git-proxy-socks.c -o poky-git-proxy-socks 31# gcc scripts/oe-git-proxy-socks.c -o oe-git-proxy-socks
32# and then share that binary somewhere in PATH, then use the following settings 32# and then share that binary somewhere in PATH, then use the following settings
33#GIT_PROXY_HOST = "proxy.example.com" 33#GIT_PROXY_HOST = "proxy.example.com"
34#GIT_PROXY_PORT = "81" 34#GIT_PROXY_PORT = "81"
35#export GIT_PROXY_COMMAND = "${POKYBASE}/scripts/poky-git-proxy-socks-command" 35#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-socks-command"
36 36
37 37
38# Uncomment this to use a shared download directory 38# Uncomment this to use a shared download directory