From c0a148077ae27a1ef57c55ac22953c68d001af57 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 10 May 2011 14:04:57 +0100 Subject: distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options The intent is to allow distros to share common core config but still allow customisations. The core should work with no distro set but users can still customise in any ways needed. Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 4 +-- meta/conf/distro/defaultsetup.conf | 23 ++++++++++++ meta/conf/distro/include/poky-default.inc | 55 ---------------------------- meta/conf/distro/include/poky-eglibc.inc | 36 ------------------- meta/conf/distro/include/poky-glibc.inc | 36 ------------------- meta/conf/distro/include/poky-uclibc.inc | 30 ---------------- meta/conf/distro/include/tclibc-eglibc.inc | 32 +++++++++++++++++ meta/conf/distro/include/tclibc-glibc.inc | 33 +++++++++++++++++ meta/conf/distro/include/tclibc-uclibc.inc | 31 ++++++++++++++++ meta/conf/distro/include/tcmode-default.inc | 56 +++++++++++++++++++++++++++++ meta/conf/distro/poky.conf | 46 +++++++----------------- 11 files changed, 188 insertions(+), 194 deletions(-) create mode 100644 meta/conf/distro/defaultsetup.conf delete mode 100644 meta/conf/distro/include/poky-default.inc delete mode 100644 meta/conf/distro/include/poky-eglibc.inc delete mode 100644 meta/conf/distro/include/poky-glibc.inc delete mode 100644 meta/conf/distro/include/poky-uclibc.inc create mode 100644 meta/conf/distro/include/tclibc-eglibc.inc create mode 100644 meta/conf/distro/include/tclibc-glibc.inc create mode 100644 meta/conf/distro/include/tclibc-uclibc.inc create mode 100644 meta/conf/distro/include/tcmode-default.inc diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d5338f69e..7c72de1e2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -627,10 +627,8 @@ include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf include conf/machine-sdk/${SDKMACHINE}.conf -include conf/distro/include/default-providers.inc -include conf/distro/include/default-versions.inc -include conf/distro/include/world-broken.inc include conf/distro/${DISTRO}.conf +include conf/distro/defaultsetup.conf include conf/documentation.conf require conf/sanity.conf require conf/abi_version.conf diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf new file mode 100644 index 000000000..af5ef7b5a --- /dev/null +++ b/meta/conf/distro/defaultsetup.conf @@ -0,0 +1,23 @@ +include conf/distro/include/default-providers.inc +include conf/distro/include/default-versions.inc +include conf/distro/include/world-broken.inc + +TARGET_VENDOR ?= "-oecore" + +TARGET_FPU_arm ?= "soft" +TARGET_FPU_armeb ?= "soft" + +TCMODE ?= "default" +require conf/distro/include/tcmode-${TCMODE}.inc + +TCLIBC ?= "eglibc" +require conf/distro/include/tclibc-${TCLIBC}.inc + +CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" + +USER_CLASSES ?= "" +PACKAGE_CLASSES ?= "package_ipk" +INHERIT_INSANE ?= "insane" +INHERIT_DISTRO ?= "debian devshell sstate license" +INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_INSANE} ${INHERIT_DISTRO}" + diff --git a/meta/conf/distro/include/poky-default.inc b/meta/conf/distro/include/poky-default.inc deleted file mode 100644 index 91985b3af..000000000 --- a/meta/conf/distro/include/poky-default.inc +++ /dev/null @@ -1,55 +0,0 @@ -# -# Poky's default configuration -# - -TARGET_VENDOR = "-poky" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${POKYLIBC}" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${POKYLIBC}-initial" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${POKYLIBC}-nativesdk" - -PREFERRED_PROVIDER_virtual/gettext ??= "gettext" - -GCCVERSION ?= "4.5.1" -SDKGCCVERSION ?= "4.5.1" -BINUVERSION ?= "2.21" -GLIBCVERSION ?= "2.10.1" -LINUXLIBCVERSION ?= "2.6.37.2" - -# Temporary preferred version overrides for PPC -PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" - -PREFERRED_VERSION_gcc ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-cross-canadian ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_binutils ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" -PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}" -PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" -PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" -PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}" -PREFERRED_VERSION_elfutils ?= "0.148" -# don't use version earlier than 1.4 for gzip-native, as it's necessary for -# some packages using an archive format incompatible with earlier gzip -PREFERRED_VERSION_gzip-native ?= "1.4" - -require conf/distro/include/as-needed.inc - - diff --git a/meta/conf/distro/include/poky-eglibc.inc b/meta/conf/distro/include/poky-eglibc.inc deleted file mode 100644 index 3d2c362ba..000000000 --- a/meta/conf/distro/include/poky-eglibc.inc +++ /dev/null @@ -1,36 +0,0 @@ -# -# eglibc specific configuration -# - -# Add glibc overrides to the overrides for eglibc. -OVERRIDES .= ":libc-glibc" - -#eglibc -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" -PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" -PREFERRED_PROVIDER_virtual/libc ?= "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc ?= "eglibc" - -#eglibc-nativesdk -PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" -PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "eglibc-initial-nativesdk" - -TARGET_OS = "${GLIBCTARGETOS}" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -LIBC_DEPENDENCIES = "libsegfault \ - eglibc \ - eglibc-dbg \ - eglibc-dev \ - eglibc-utils \ - eglibc-thread-db \ - eglibc-localedata-i18n \ - eglibc-gconv-ibm850 \ - eglibc-gconv-cp1252 \ - eglibc-gconv-iso8859-1 \ - eglibc-gconv-iso8859-15 \ - locale-base-en-us \ - locale-base-en-gb " diff --git a/meta/conf/distro/include/poky-glibc.inc b/meta/conf/distro/include/poky-glibc.inc deleted file mode 100644 index 4be712271..000000000 --- a/meta/conf/distro/include/poky-glibc.inc +++ /dev/null @@ -1,36 +0,0 @@ -# -# glibc specific configuration -# - -# Add glibc to the overrides. -OVERRIDES =. "libc-glibc:" - -#glibc -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" - -#glibc-nativesdk -PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" -PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk ?= "glibc-initial-nativesdk" - -TARGET_OS = "${GLIBCTARGETOS}" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -LIBC_DEPENDENCIES = "\ - libsegfault \ - glibc \ - glibc-dbg \ - glibc-dev \ - glibc-utils \ - glibc-thread-db \ - glibc-localedata-i18n \ - glibc-gconv-ibm850 \ - glibc-gconv-cp1252 \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ - locale-base-en-gb \ - " diff --git a/meta/conf/distro/include/poky-uclibc.inc b/meta/conf/distro/include/poky-uclibc.inc deleted file mode 100644 index def9dfe44..000000000 --- a/meta/conf/distro/include/poky-uclibc.inc +++ /dev/null @@ -1,30 +0,0 @@ -# -# uclibc specific configuration -# - -# Add uclibc overrides to the overrides. -OVERRIDES =. "libc-uclibc:" - -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" - -USE_NLS ?= "no" -USE_NLS_glib-2.0 = "yes" - -TARGET_OS = "${UCLIBCTARGETOS}" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -IMAGE_LINGUAS = "" - -DEPLOY_DIR = "${TMPDIR}/deploy-uclibc" -DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images" - -LIBC_DEPENDENCIES = "\ - uclibc \ - uclibc-dbg \ - uclibc-dev \ - uclibc-thread-db \ - " diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc new file mode 100644 index 000000000..735db7b2d --- /dev/null +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -0,0 +1,32 @@ +# +# eglibc specific configuration +# + +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + +# Add glibc overrides to the overrides for eglibc. +OVERRIDES .= ":libc-glibc" + +PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" +PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" +PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" +PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "eglibc-nativesdk" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +LIBC_DEPENDENCIES = "libsegfault \ + eglibc \ + eglibc-dbg \ + eglibc-dev \ + eglibc-utils \ + eglibc-thread-db \ + eglibc-localedata-i18n \ + eglibc-gconv-ibm850 \ + eglibc-gconv-cp1252 \ + eglibc-gconv-iso8859-1 \ + eglibc-gconv-iso8859-15 \ + locale-base-en-us \ + locale-base-en-gb " diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc new file mode 100644 index 000000000..826f545ac --- /dev/null +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -0,0 +1,33 @@ +# +# glibc specific configuration +# + +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + +# Add glibc to the overrides. +OVERRIDES =. "libc-glibc:" + +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "glibc-nativesdk" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" +PREFERRED_PROVIDER_virtual/libc-nativesdk ?= "glibc-nativesdk" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +LIBC_DEPENDENCIES = "\ + libsegfault \ + glibc \ + glibc-dbg \ + glibc-dev \ + glibc-utils \ + glibc-thread-db \ + glibc-localedata-i18n \ + glibc-gconv-ibm850 \ + glibc-gconv-cp1252 \ + glibc-gconv-iso8859-1 \ + glibc-gconv-iso8859-15 \ + locale-base-en-gb \ + " diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc new file mode 100644 index 000000000..9e254c697 --- /dev/null +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -0,0 +1,31 @@ +# +# uclibc specific configuration +# + +TARGET_OS = "linux-uclibc" +TARGET_OS_arm = "linux-uclibceabi" +TARGET_OS_armeb = "linux-uclibceabi" + +# Add uclibc overrides to the overrides. +OVERRIDES =. "libc-uclibc:" + +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" +PREFERRED_PROVIDER_virtual/libintl ?= "gettext" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +IMAGE_LINGUAS = "" + +DEPLOY_DIR = "${TMPDIR}/deploy-uclibc" +DEPLOY_DIR_IMAGE = "${TMPDIR}/deploy/images" + +LIBC_DEPENDENCIES = "\ + uclibc \ + uclibc-dbg \ + uclibc-dev \ + uclibc-thread-db \ + " diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc new file mode 100644 index 000000000..f3756dcd3 --- /dev/null +++ b/meta/conf/distro/include/tcmode-default.inc @@ -0,0 +1,56 @@ +# +# Default toolchain configuration +# + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" + +# Default libc config +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-nativesdk" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk" +PREFERRED_PROVIDER_virtual/gettext ??= "gettext" + +GCCVERSION ?= "4.5.1" +SDKGCCVERSION ?= "4.5.1" +BINUVERSION ?= "2.21" +GLIBCVERSION ?= "2.10.1" +LINUXLIBCVERSION ?= "2.6.37.2" + +# Temporary preferred version overrides for PPC +PREFERRED_VERSION_u-boot-mkimage-native_powerpc ?= "2009.08" + +PREFERRED_VERSION_gcc ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_gcc-cross-canadian ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-runtime-nativesdk ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_binutils ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-crosssdk ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-cross-canadian ?= "${BINUVERSION}" +PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" +PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" +PREFERRED_VERSION_glibc ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-nativesdk ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-initial ?= "${GLIBCVERSION}" +PREFERRED_VERSION_glibc-initial-nativesdk ?= "${GLIBCVERSION}" +PREFERRED_VERSION_elfutils ?= "0.148" +# don't use version earlier than 1.4 for gzip-native, as it's necessary for +# some packages using an archive format incompatible with earlier gzip +PREFERRED_VERSION_gzip-native ?= "1.4" + +# Setup suitable toolchain flags +require conf/distro/include/as-needed.inc +TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" + diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 2e9d327ec..f13a67f39 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -1,56 +1,29 @@ - DISTRO = "poky" -DISTRO_NAME = "Yocto (Built by Poky 4.0)" -DISTRO_VERSION = "0.9+snapshot-${DATE}" +DISTRO_NAME = "Yocto (Built by Poky 5.0)" +DISTRO_VERSION = "1.0+snapshot-${DATE}" +SDK_VENDOR = "-pokysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" MAINTAINER = "Poky " -USER_CLASSES ?= "" - -PACKAGE_CLASSES ?= "package_ipk" -INHERIT_INSANE ?= "insane" -INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian devshell ${INHERIT_INSANE} sstate license" -# For some reason, this doesn't work -# TARGET_OS ?= "linux" -# TARGET_VENDOR ?= "-poky" -# Set by POKYMODE instead -TARGET_OS = "linux" -TARGET_FPU_arm ?= "soft" -TARGET_FPU_armeb ?= "soft" -TARGET_FPU_nokia800 = "hard" - -TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH', d, True) in ['mips', 'mipsel', 'mips64', 'mips64el']]}" +TARGET_VENDOR = "-poky" QA_LOGFILE = "${TMPDIR}/qa.log" IMAGE_ROOTFS_SIZE_ext2 ?= "131072" +LOCALCONF_VERSION = "1" + OEINCLUDELOGS = "yes" KERNEL_CONSOLE = "ttyS0" -# Default to TARGETOS values for EABI on arm -GLIBCTARGETOS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" -UCLIBCTARGETOS = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -POKYMODE ?= "default" -require conf/distro/include/poky-${POKYMODE}.inc - -POKYLIBC ?= "eglibc" -require conf/distro/include/poky-${POKYLIBC}.inc - -SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" +SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" -CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" - - require conf/distro/include/preferred-xorg-versions.inc PCMCIA_MANAGER ?= "pcmciautils" -#IMAGE_LINGUAS ?= "en-gb en-us" -#LIMIT_BUILT_LOCALES ?= "en_GB en_US" IMAGE_LINGUAS ?= "en-us en-gb" LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB" ENABLE_BINARY_LOCALE_GENERATION ?= "1" @@ -62,6 +35,8 @@ POKY_EXTRA_RDEPENDS = "task-core-boot" POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv6 = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarmv7 = "qemu-config" +POKY_EXTRA_RDEPENDS_qemumips = "qemu-config" +POKY_EXTRA_RDEPENDS_qemuppc = "qemu-config" POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" POKY_EXTRA_RDEPENDS_qemux86-64 = "qemu-config" @@ -93,6 +68,9 @@ COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" BB_GENERATE_MIRROR_TARBALLS ??= "0" +QEMU_TARGETS ?= "arm i386 mips mipsel ppc x86_64" +# Other QEMU_TARGETS "mips64 mips64el sh4" + PREMIRRORS ?= "\ bzr://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ cvs://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \ -- cgit v1.2.3