From e27f339a048c70a01642357ffb8bb79ed697eb00 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. (From OE-Core rev: c0a148077ae27a1ef57c55ac22953c68d001af57) 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 | 38 ++++++++++++++++++++ meta/conf/distro/include/tclibc-glibc.inc | 38 ++++++++++++++++++++ meta/conf/distro/include/tclibc-uclibc.inc | 34 ++++++++++++++++++ meta/conf/distro/include/tcmode-default.inc | 54 ++++++++++++++++++++++++++++ 10 files changed, 188 insertions(+), 160 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 (limited to 'meta') diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d843e705fd..d7c430a1e4 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 0000000000..af5ef7b5a0 --- /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 91985b3afc..0000000000 --- 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 3d2c362baf..0000000000 --- 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 4be712271a..0000000000 --- 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 def9dfe447..0000000000 --- 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 0000000000..16625e3bf0 --- /dev/null +++ b/meta/conf/distro/include/tclibc-eglibc.inc @@ -0,0 +1,38 @@ +# +# 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" + +#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" + +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 0000000000..79da9860e8 --- /dev/null +++ b/meta/conf/distro/include/tclibc-glibc.inc @@ -0,0 +1,38 @@ +# +# glibc specific configuration +# + +TARGET_OS = "linux" +TARGET_OS_arm = "linux-gnueabi" +TARGET_OS_armeb = "linux-gnueabi" + +# 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" + +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 0000000000..18748fa3a3 --- /dev/null +++ b/meta/conf/distro/include/tclibc-uclibc.inc @@ -0,0 +1,34 @@ +# +# 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/${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/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc new file mode 100644 index 0000000000..909d802f89 --- /dev/null +++ b/meta/conf/distro/include/tcmode-default.inc @@ -0,0 +1,54 @@ +# +# Default toolchain configuration +# + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" +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 = "${TCLIBC}-initial" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk ?= "${TCLIBC}-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']]}" + -- cgit 1.2.3-korg