From 765d380e33f485a5ba9f10adabbb88440f9eaf07 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Apr 2011 00:14:53 +0100 Subject: meta-yocto: Catch up with OE-Core renaming Signed-off-by: Richard Purdie --- meta-yocto/conf/bblayers.conf.sample | 4 ++-- meta-yocto/conf/distro/poky-lsb.conf | 2 +- meta-yocto/conf/distro/poky.conf | 6 ++++-- meta-yocto/conf/local.conf.sample | 8 ++++---- meta-yocto/conf/site.conf.sample | 6 +++--- 5 files changed, 14 insertions(+), 12 deletions(-) (limited to 'meta-yocto') 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" BBFILES ?= "" BBLAYERS = " \ - ##POKYBASE##/meta \ - ##POKYBASE##/meta-yocto \ + ##COREBASE##/meta \ + ##COREBASE##/meta-yocto \ " 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 @@ require conf/distro/poky.conf DISTRO = "poky-lsb" -DISTROOVERRIDES = "poky:poky-lsb" +DISTROOVERRIDES = "poky:linuxstdbase" DISTRO_FEATURES += "pam largefile" PREFERRED_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" IMAGE_ROOTFS_SIZE_ext2 ?= "131072" +LOCALCONF_VERSION = "1" + #IPK_FEED_URIS += " \ # upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ #upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ @@ -113,7 +115,7 @@ LOCALE_UTF8_ONLY = "0" DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci" -POKY_EXTRA_RDEPENDS = "task-poky-boot" +POKY_EXTRA_RDEPENDS = "task-core-boot" POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" @@ -146,7 +148,7 @@ COMMERCIAL_VIDEO_PLUGINS ?= "" COMMERCIAL_QT ?= "" # COMMERCIAL_QT ?= "qmmp" # Set of common licenses used for license.bbclass -COMMON_LICENSE_DIR ??= "${POKYBASE}/meta/files/common-licenses" +COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" BB_GENERATE_MIRROR_TARBALLS ??= "0" 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 = "" # "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. +# There are other application targets too, see meta/classes/core-image.bbclass +# and meta/recipes-core/tasks/task-core.bb for more details. EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks" @@ -75,7 +75,7 @@ PACKAGE_CLASSES ?= "package_rpm package_ipk" # 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 # extended or upgraded later. #This enabled mklibs library size optimization just for the specified image. -#MKLIBS_OPTIMIZED_IMAGES ?= "poky-image-minimal" +#MKLIBS_OPTIMIZED_IMAGES ?= "core-image-minimal" #This enable mklibs library size optimization will be for all the images. #MKLIBS_OPTIMIZED_IMAGES ?= "all" @@ -102,7 +102,7 @@ USER_CLASSES ?= "image-mklibs image-prelink" # 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" +#TMPDIR = "${COREBASE}/build/tmp" # The following are used to control options related to debugging. # 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" # 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" +#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-command" # GIT_PROXY_IGNORE_* lines define hosts which do not require a proxy to access #GIT_CORE_CONFIG = "Yes" @@ -28,11 +28,11 @@ SCONF_VERSION = "1" #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 +# gcc scripts/oe-git-proxy-socks.c -o oe-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" +#export GIT_PROXY_COMMAND = "${COREBASE}/scripts/oe-git-proxy-socks-command" # Uncomment this to use a shared download directory -- cgit v1.1