From 85f0c2d5e5646795506e5966a9c95c7dfa685d8f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 29 Apr 2009 13:01:13 +0200 Subject: bitbake.conf: make MACHINE_KERNEL_PR defaults to PR By default MACHINE_KERNEL_PR defaults to 'r0' which makes build of kernel for machines which not use MACHINE_KERNEL_PR harder (kernel.bbclass uses M_K_P instead of PR). --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9e026e44c4..fd84ea205a 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -164,7 +164,7 @@ P = "${PN}-${PV}" # Define a PR for kernels that machines can override so things like # modules get rebuilt -MACHINE_KERNEL_PR ?= "r0" +MACHINE_KERNEL_PR ?= "${PR}" # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" -- cgit v1.2.3 From 7785ce4baefbb17b2fd2f8ebe64e8a91a7fade32 Mon Sep 17 00:00:00 2001 From: Martin Lund Date: Thu, 30 Apr 2009 13:15:36 +0200 Subject: Initial add of micro linux dist --- conf/distro/micro-uclibc.conf | 43 ++++++++++++++++++ conf/distro/micro.conf | 100 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) create mode 100644 conf/distro/micro-uclibc.conf create mode 100644 conf/distro/micro.conf (limited to 'conf') diff --git a/conf/distro/micro-uclibc.conf b/conf/distro/micro-uclibc.conf new file mode 100644 index 0000000000..82b78cbf79 --- /dev/null +++ b/conf/distro/micro-uclibc.conf @@ -0,0 +1,43 @@ +############################################################################# +#@TYPE: Distribution +#@NAME: Micro uclibc +#@DESCRIPTION: Micro Linux Distribution (uclibc based) +#@MAINTAINER: Martin Lund +#@COMMENT: This distribution configuration defines a Micro Linux distribution +#@COMMENT: based on uclibc. +############################################################################# + +# Based on the Micro Linux distribution +require conf/distro/micro.conf + +############################################################################# +# DISTRO CONFIGURATION +############################################################################# +DISTRO_NAME = "micro-uclibc" + +############################################################################# +# TARGET OS +############################################################################# +# Use linux uclibc +TARGET_OS = "linux-uclibc" + +############################################################################# +# TOOLCHAIN +############################################################################# +PREFERRED_LIBC = "uclibc" + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" + +############################################################################# +# PREFERRED VERSIONS +############################################################################# +PREFERRED_VERSION_uclibc = "0.9.30.1" +PREFERRED_VERSION_uclibc-initial = "0.9.30.1" + diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf new file mode 100644 index 0000000000..bf4e5e1a82 --- /dev/null +++ b/conf/distro/micro.conf @@ -0,0 +1,100 @@ +############################################################################# +#@TYPE: Distribution +#@NAME: Micro +#@DESCRIPTION: Micro Linux Distribution (glibc based) +#@MAINTAINER: Martin Lund +#@COMMENT: This distribution configuration defines a truely tiny OE Linux +#@COMMENT: distribution. The matching buildable image target (micro-image) +#@COMMENT: basically consists of: libc, busybox, udev, sysv init, and a few +#@COMMENT: init scripts for running up the system. +############################################################################# + +############################################################################# +# DISTRO CONFIGURATION +############################################################################# +DISTRO_NAME = "micro" +DISTRO_VERSION = "${SRCDATE}" + +############################################################################# +# TARGET OS +############################################################################# +# Linux +TARGET_OS = "linux" + +############################################################################# +# DISTRO FEATURE SELECTION +############################################################################# +# No features selected +DISTRO_FEATURES = "" + +############################################################################# +# LIBRARY NAMES +############################################################################# +# Use Debian naming scheme for library (.so) files +INHERIT += "debian" + +############################################################################# +# PACKAGING & FEEDS +############################################################################# +# Select packaging system +PREFERRED_PKG_FORMAT = "ipk" +IPKG_VARIANT = "opkg-nogpg" + +require conf/distro/include/sane-feed.inc +require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +############################################################################# +# IMAGES +############################################################################# +# Name generated images +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-\ +${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" + +CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_LIBC}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" + +# Image output types +IMAGE_FSTYPES ?= "tar.gz jffs2" + +############################################################################# +# LINUX KERNEL SELECTION +############################################################################# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +############################################################################# +# TOOLCHAIN +############################################################################# +PREFERRED_LIBC = "glibc" +require conf/distro/include/sane-toolchain.inc + +############################################################################# +# OVERRIDES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\ +${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +############################################################################# +# PREFERRED VERSIONS +############################################################################# +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc + +############################################################################# +# NLS +############################################################################# +USE_NLS = "no" +USE_NLS_glib-2.0 = "yes" +USE_NLS_glib-2.0-native = "yes" +USE_NLS_gcc-cross = "no" + +# Disable binary locale generation +ENABLE_BINARY_LOCALE_GENERATION = "0" + -- cgit v1.2.3 From a02e11ade1c3ad77b63594b5c441c408227bbffb Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Wed, 29 Apr 2009 23:07:45 +0400 Subject: coreutils: add version 7.2 Acked-by: Otavio Salvador --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index ffc84c666e..9a2c473d77 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3990,6 +3990,10 @@ sha256=efa27532ec6dc12a21f703ad4a0f612e613e9cc2575147685db81cc701952ac9 md5=cbb2b3d1718ee1237b808e00b5c11b1e sha256=813cb19fa19a885f342664109c7c5810f0081b624ff317bba8d1b6ccd83c2a05 +[ftp://ftp.gnu.org/gnu/coreutils/coreutils-7.2.tar.gz] +md5=427c2914d3eab956f317c9ec6a45e62a +sha256=dd77bfec92e5a3ad48abd8a5bda3f8d40149c4e24744e4173abc3cc6a731fdb2 + [http://www.rpsys.net/openzaurus/patches/archive/corgi_rearrange_lcd-r0.patch] md5=c1bec44c92f5da5abad97137c73b1365 sha256=d4dc8f0583e616e74ea41b103d5f6a29b6d079ce37eaf9f362825514c7082490 -- cgit v1.2.3 From d5631dc0546cd152d41529b528ec2635bd103a28 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Thu, 30 Apr 2009 00:05:37 +0400 Subject: remove install-native package Sane 'install' program is provided by coreutils-native now. Acked-by: Otavio Salvador --- conf/distro/include/preferred-om-2008-versions.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index e3e21872b7..8c5c4f7cb0 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -712,7 +712,6 @@ PREFERRED_VERSION_inkscape ?= "0.43" PREFERRED_VERSION_inkwp ?= "0.1.1" PREFERRED_VERSION_inotify-tools ?= "2.1" PREFERRED_VERSION_inputproto ?= "1.4.4" -PREFERRED_VERSION_install-native ?= "0.1" PREFERRED_VERSION_insttrain ?= "1.0.5" PREFERRED_VERSION_interbench ?= "0.30" PREFERRED_VERSION_intercom ?= "0.15" -- cgit v1.2.3 From 861dedd490eb87d90c6eb1357a37dd13000571be Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Thu, 30 Apr 2009 16:19:40 -0500 Subject: SlugOS: preferred-slugos-versions - get rid of overrides for openssh, fixed upstream. --- conf/distro/include/preferred-slugos-versions.inc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 8c8de40f9d..992235a4b9 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -71,9 +71,3 @@ PREFERRED_VERSION_libusb ?= "0.0.0" # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" - -# We don't really care which openssl and openssl-native we get, but -# the DEFAULT_PREFERENCE set in the recipes is such that if we don't -# specify explicitly, we may get mismatched versions. -PREFERRED_VERSION_openssl ?= "0.9.8j" -PREFERRED_VERSION_openssl-native ?= "0.9.8j" -- cgit v1.2.3 From 9823dcf3aa8783b0d1daa7ce363aaf01c318bea0 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Thu, 30 Apr 2009 16:23:31 -0500 Subject: SlugOS: slugos.inc - ensure that the rootfs is mounted with the noatime option (this is for documentation purposes, and to future-proof, since the real command line is set in the apex recipe.) --- conf/distro/include/slugos.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b141548ce3..51ca9f34b1 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -81,7 +81,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) -CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES -- cgit v1.2.3 From e34ffc1bf774a0a6561d7b9e0e6800e1029c0ef1 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 1 May 2009 01:25:26 +0200 Subject: zaurus-2.6.inc: force creation of jffs2 images - tar.gz is (weak) assigned in bitbake.conf --- conf/machine/include/zaurus-2.6.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index d3345b469b..841b360f0d 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -22,6 +22,8 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PCMCIA_MANAGER ?= "pcmciautils" +IMAGE_FSTYPES += "jffs2" + MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " -- cgit v1.2.3 From e8410422c0d3a3621ee5a604cd5a52e80604532f Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 1 May 2009 00:16:54 +0000 Subject: Unslung: Removed all trace of the unslung distro from OE --- conf/distro/unslung.conf | 88 ------------------------------------------------ 1 file changed, 88 deletions(-) delete mode 100644 conf/distro/unslung.conf (limited to 'conf') diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf deleted file mode 100644 index 5cb162524f..0000000000 --- a/conf/distro/unslung.conf +++ /dev/null @@ -1,88 +0,0 @@ -#@TYPE: Distribution -#@NAME: Unslung -#@DESCRIPTION: Unslung Linux Distribution for the NSLU2 - -DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.11-beta" -DISTRO_TYPE = "beta" - -FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" -FEED_URIS += "native##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/native/stable" -FEED_URIS += "oe##http://ipkg.nslu2-linux.org/feeds/unslung/modules/cross/stable" - -TARGET_FPU = "soft" -TARGET_OS = "linux" - -# select distro specific options to match that of the original LinkSys build -ARM_INSTRUCTION_SET = "arm" -THUMB_INTERWORK = "no" - -# for compatibility PACKAGE_ARCH stays as TARGET_ARCH and TARGET_ARCH is hard-wired -# to armeb - this makes this stuff independent of changes in machine/nslu2.conf -TARGET_ARCH = "armeb" -PACKAGE_ARCH = "${TARGET_ARCH}" -# PACKAGE_EXTRA_ARCHS has the full list of supported architectures (from nslu2be.conf). -# We need "nslu2" added for backwards compatibility. -PACKAGE_EXTRA_ARCHS += "nslu2" - -# match the optimisation settings to that which has traditionally been used -# in unslung -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" - -INHERIT += " package_ipk" - -IMAGE_FSTYPES = "jffs2" -UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}" -EXTRA_IMAGECMD_jffs2 = "-n --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}" - -UNSLUNG_EXTRA_DEPENDS ?= "" -UNSLUNG_EXTRA_RDEPENDS ?= "" - -UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}" - -# Select between multiple alternative providers, if more than one is eligible. -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-initial:glibc-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" -PREFERRED_PROVIDERS += " virtual/libc:glibc" -PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers" - -PREFERRED_PROVIDER_libc6-unslung = "glibc" - -PREFERRED_VERSION_binutils ?= "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" -PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate ?= "3.4.4" -PREFERRED_VERSION_gcc-cross ?= "3.4.4" -PREFERRED_VERSION_gcc ?= "3.4.4" -PREFERRED_VERSION_glibc ?= "2.2.5" -PREFERRED_VERSION_glibc-initial ?= "2.2.5" - -# Whilst gcc 3.4.4 sypports sysroot, binutils 2.15.94.0.1 does not -# so we need the linkage helpers to help binutils find staging. -DEPENDS_append_pn-linux-libc-headers = "cross-linkage staging-linkage" - -PREFERRED_PROVIDER_virtual/kernel = "unslung-kernel" -PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" -PREFERRED_VERSION_unslung-rootfs ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-libs ?= "2.3r63" -PREFERRED_VERSION_nslu2-linksys-ramdisk ?= "2.3r63" - -CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" -INHERIT += "nslu2-mirrors" - -#------------------------------------------------------------------- -# FIXME! -# This is clearly wrong, the headers should match the 2.4.22 kernel, -# but locking this to 2.6.11.1 at least gets Unslung building again. -# - mwester 16 Dec 2006 -# -PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/sane-srcrevs.inc -- cgit v1.2.3 From ca2039c1472204edae3aa7ea2c70717c80a24301 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 1 May 2009 22:18:20 +0000 Subject: bluez-gnome: Update to version 1.8. --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index 9a2c473d77..c128cabf8c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2758,6 +2758,10 @@ sha256=e03a131c26f1f1c51b8cadb4e68db8a3d0f64c43b4aefc706b07129336ebe5c2 md5=54334e3d7af70846eb4916191e46081c sha256=056ec158ea09b6be8b9ea07f37d8b58f6dec28da6dcb33f789ce9b3f932eb7cd +[http://www.kernel.org/pub/linux/bluetooth/bluez-gnome-1.8.tar.gz] +md5=7f34a08e36aa77d4476d0919c52b59b6 +sha256=481b48f3cde1f896650195b75c25994df11eca05bb6e8d1951a46b603228811a + [http://bluez.sourceforge.net/download/bluez-hcidump-1.26.tar.gz] md5=6eca8534fd6f0384d29f04198363f19c sha256=cd016375e9082268af224b26891cbea162fac5cf83a984f3e3988e6cee380a56 -- cgit v1.2.3 From ed293046eb0a06a0c787e9b0719a9299cbd49173 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Thu, 30 Apr 2009 23:46:56 +0400 Subject: bridge-utils: add version 1.4 Acked-by: Otavio Salvador --- conf/checksums.ini | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index c128cabf8c..6f15ceb105 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3038,6 +3038,10 @@ sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 md5=1e6cff57ac90d7ab984d9512fdd9f2dd sha256=c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 +[http://downloads.sourceforge.net/bridge/bridge-utils-1.4.tar.gz] +md5=0182fcac3a2b307113bbec34e5f1c673 +sha256=876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933 + [http://www.ludd.luth.se/~torger/files/brutefir-1.0i.tar.gz] md5=33fcf84a41d38f5aac24c57a66a2c3ee sha256=e0f3988afb0a84a89f38153fd5617615e9bcf32bb747ee981c99c44d3c4236f6 -- cgit v1.2.3 From f8f9b7e4b46979691a5813361b3d4ecba50a20eb Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 2 May 2009 02:06:48 -0500 Subject: nslu2 machine configs: do not inherit machine-specific image class The creation of the NSLU2 full flash image (.bin) file should be image-specific, since not all images for machines similar to the NSLU2 have the same flash constraints. --- conf/machine/nslu2be.conf | 2 -- conf/machine/nslu2le.conf | 2 -- 2 files changed, 4 deletions(-) (limited to 'conf') diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 5bddf09148..9bc92f1a99 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--big-endian" - -INHERIT += "nslu2-image" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 4ff36059a6..62e47cb678 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.inc EXTRA_IMAGECMD_jffs2 += "--little-endian" - -INHERIT += "nslu2-image" -- cgit v1.2.3 From 19641ab1b283755f6e3c02c167db5b2bf564c566 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 23 Apr 2009 18:28:50 -0400 Subject: Add distro inc files for eglibc, glibc and uclibc. This gives us the libc into OVERRIDES, of glibc for glibc/eglibc and uclibc for uclibc. We also ?= for libintl/libiconv and = set the rest of the virtuals. Acked-by: Leon Woestenberg Acked-by: Mike Westerhof Signed-off-by: Tom Rini --- conf/distro/include/eglibc.inc | 9 +++++++++ conf/distro/include/glibc.inc | 9 +++++++++ conf/distro/include/uclibc.inc | 9 +++++++++ 3 files changed, 27 insertions(+) create mode 100644 conf/distro/include/eglibc.inc create mode 100644 conf/distro/include/glibc.inc create mode 100644 conf/distro/include/uclibc.inc (limited to 'conf') diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc new file mode 100644 index 0000000000..ed3e0ecf9d --- /dev/null +++ b/conf/distro/include/eglibc.inc @@ -0,0 +1,9 @@ +# Add glibc overrides to the overrides for eglibc. +OVERRIDES .= ":glibc" + +# The things eglibc can provide. We default to wanting eglibc to provide them. +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" diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc new file mode 100644 index 0000000000..1d6b22d8b5 --- /dev/null +++ b/conf/distro/include/glibc.inc @@ -0,0 +1,9 @@ +# Add glibc to the overrides. +OVERRIDES .= ":glibc" + +# The things glibc can provide. We default to wanting glibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc new file mode 100644 index 0000000000..bb2e2be71f --- /dev/null +++ b/conf/distro/include/uclibc.inc @@ -0,0 +1,9 @@ +# Add uclibc overrides to the overrides. +OVERRIDES .= ":uclibc" + +# The things uclibc can provide. We default to wanting uclibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" +PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -- cgit v1.2.3 From 501e733081d00bc90b9e830c04cbe03c5332445d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 23 Apr 2009 18:21:00 -0400 Subject: All distro conf files: Use LIBC to pick or set your libc. Acked-by: Leon Woestenberg Acked-by: Mike Westerhof Signed-off-by: Tom Rini --- conf/distro/angstrom-2008.1.conf | 2 +- conf/distro/asusoe.conf | 1 + conf/distro/celinux-test.conf | 1 + conf/distro/chinook-compat.conf | 1 + conf/distro/foonas.conf | 5 +++-- conf/distro/gmustix.conf | 1 + conf/distro/include/angstrom-2007-for-openmoko.inc | 2 +- conf/distro/include/angstrom.inc | 13 +++++++------ conf/distro/include/kaeilos.inc | 12 ++++++------ conf/distro/jlime-2009.1.conf | 1 + conf/distro/jlime-donkey.conf | 1 + conf/distro/jlime-henchman.conf | 1 + conf/distro/jlime-mongo.conf | 1 + conf/distro/jlime-shrek.conf | 1 + conf/distro/kaeilos.conf | 2 +- conf/distro/mamona.conf | 1 + conf/distro/minimal-uclibc.conf | 1 + conf/distro/nylon.conf | 1 + conf/distro/openmn.conf | 1 + conf/distro/openmoko.conf | 2 ++ conf/distro/openprotium.conf | 1 + conf/distro/oplinux-uclibc.conf | 1 + conf/distro/oplinux.conf | 1 + conf/distro/slugos.conf | 1 + conf/distro/ucslugc.conf | 1 + conf/distro/wrt54oe.conf | 1 + 26 files changed, 40 insertions(+), 17 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 740ff31435..a466834968 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -46,7 +46,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)} # set feed path variables -FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf index 35be6a4fab..ecda37f8cf 100644 --- a/conf/distro/asusoe.conf +++ b/conf/distro/asusoe.conf @@ -7,6 +7,7 @@ DISTRO_VERSION = "0.1-alpha" TARGET_OS = "linux-uclibc" TARGET_SYS = "${TARGET_ARCH}-uclibc" +LIBC = "uclibc" CROSS_DIR = "/opt/brcm/hndtools-mipsel-uclibc" diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf index 0787ff2bca..a3a0bc4f70 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/celinux-test.conf @@ -49,6 +49,7 @@ PREFERRED_VERSION_gcc-cross = "3.4.4" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" +LIBC = "glibc" PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" # glibc provides iconv and intl diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index d2ff51eaa4..e7350484e2 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -21,6 +21,7 @@ DISTRO_TYPE = "debug" # Needed for e.g. libffi builds on armv6 OVERRIDES .= ":${FEED_ARCH}" +LIBC = "glibc" require conf/distro/include/angstrom-glibc.inc FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index cc5bbbbb32..57d73a0a2a 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -6,8 +6,9 @@ #@MAINTAINER: Øyvind Repvik #@-------------------------------------------------------------------- -FOONAS_MODE ?= "glibc" -ANGSTROMLIBC = ${FOONAS_MODE} +LIBC ?= "glibc" +FOONAS_MODE ?= "${LIBC}" +ANGSTROMLIBC = "${LIBC}" require conf/distro/angstrom-2008.1.conf DISTRO_NAME = "foonas" diff --git a/conf/distro/gmustix.conf b/conf/distro/gmustix.conf index a47de7c100..106b16e87e 100644 --- a/conf/distro/gmustix.conf +++ b/conf/distro/gmustix.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Gumstix distribution for GMU (George Mason University) INHERIT += "package_tar package_ipk" +LIBC = "uclibc" TARGET_OS = "linux-uclibc" TARGET_FPU = "soft" IMAGE_FSTYPES = "jffs2" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index b931d340c3..dcd49980eb 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -28,7 +28,7 @@ DISTRO_TYPE ?= "debug" IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' # set feed path variables -FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 1f0fced434..d8c3cd78df 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -18,11 +18,12 @@ SRC_DIST_LOCAL ?= "symlink" # Can be "glibc", "eglibc" or "uclibc" ANGSTROMLIBC ?= "glibc" -PSTAGE_EXTRAPATH = "${ANGSTROMLIBC}" +LIBC ?= "${ANGSTROMLIBC}" +PSTAGE_EXTRAPATH = "${LIBC}" -CACHE = "${TMPDIR}/cache/${ANGSTROMLIBC}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROMLIBC}" -require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc +CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}" +require conf/distro/include/angstrom-${LIBC}.inc # ARM920T and up can use thumb mode to decrease binary size at the expense of speed # (the complete story is a bit more nuanced due to cache starvation) @@ -144,7 +145,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROMLIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # Angstrom *always* has some form of release config, so error out if someone thinks he knows better @@ -156,7 +157,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # in their local.conf #Name of the client -TINDER_MACHINE = "${MACHINE}-${ANGSTROMLIBC}-build-image" +TINDER_MACHINE = "${MACHINE}-${LIBC}-build-image" # Which lof file to write to, which tree to report to TINDER_LOG = "${TMPDIR}/tinder.log" diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc index 6d5ceb8da8..de7dca7534 100644 --- a/conf/distro/include/kaeilos.inc +++ b/conf/distro/include/kaeilos.inc @@ -20,12 +20,12 @@ SRC_DIST_LOCAL ?= "symlink" INHERIT += "src_distribute_local" # Can be "glibc", "eglibc" or "uclibc" -ANGSTROMLIBC ?= "glibc" -PSTAGE_EXTRAPATH = "${ANGSTROMLIBC}" +LIBC ?= "glibc" +PSTAGE_EXTRAPATH = "${LIBC}" -CACHE = "${TMPDIR}/cache/${ANGSTROMLIBC}/${MACHINE}" -DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROMLIBC}" -require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc +CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}" +require conf/distro/include/angstrom-${LIBC}.inc # ARM920T and up can use thumb mode to decrease binary size at the expense of speed # (the complete story is a bit more nuanced due to cache starvation) @@ -283,7 +283,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi" #Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROMLIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # KaeilOS *always* has some form of release config, so error out if someone thinks he knows better diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf index a72988ea76..85d460d7a4 100644 --- a/conf/distro/jlime-2009.1.conf +++ b/conf/distro/jlime-2009.1.conf @@ -69,6 +69,7 @@ TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +LIBC = "glibc" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index dad1f1fd05..ff1c1cafc5 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -23,6 +23,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" +LIBC = "glibc" PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf index 5a99ef2d79..8ae89017bb 100644 --- a/conf/distro/jlime-henchman.conf +++ b/conf/distro/jlime-henchman.conf @@ -68,6 +68,7 @@ TARGET_OS = "linux" TARGET_FPU_arm = "fixed" TARGET_FPU_armeb = "fixed" +LIBC = "glibc" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf index 4e922eab35..5eeb1dd049 100644 --- a/conf/distro/jlime-mongo.conf +++ b/conf/distro/jlime-mongo.conf @@ -69,6 +69,7 @@ TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +LIBC = "glibc" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 7928387390..8f1b81a812 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -15,6 +15,7 @@ PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +LIBC = "glibc" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf index 53e928ba81..718239bed8 100644 --- a/conf/distro/kaeilos.conf +++ b/conf/distro/kaeilos.conf @@ -44,7 +44,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)} # set feed path variables -FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROMLIBC}/" +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf index 83e102663c..e176b9c147 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -53,6 +53,7 @@ PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" # *libc TARGET_OS = "linux-gnueabi" +LIBC = "glibc" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index 62eb86ab84..94d671b258 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -21,6 +21,7 @@ DISTRO_NAME = "minimal-uclibc" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +LIBC = "uclibc" PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 3d1f0579f0..ff98de0cd8 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -16,6 +16,7 @@ TARGET_OS = "linux" INHERIT += "package_ipk debian nylon-mirrors" INHERIT += "linux-kernel-base" +LIBC = "glibc" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf index 9de6c7d9e1..421b0576a3 100644 --- a/conf/distro/openmn.conf +++ b/conf/distro/openmn.conf @@ -13,6 +13,7 @@ TARGET_OS = "linux" INHERIT += "package_ipk" INHERIT += "debian" PACKAGE_EXTRA_ARCHS = "armv5te openmn" +LIBC = "glibc" FEED_URIS = "mnci54##http://www.mn-solutions.de/feed/mnci54/base" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 36461087bd..0d3c88ede5 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -18,6 +18,8 @@ DISTRO = "openmoko" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +LIBC = "glibc" + INHERIT += "packaged-staging" CVS_TARBALL_STASH += "http://downloads.openmoko.org/developer/sources/" diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 633e3bcaef..37e53b7c0b 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -67,6 +67,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/powerpc-linux-libc-initial = "glibc-initial" +LIBC = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/oplinux-uclibc.conf index 3a97c36aa6..20e7df5a99 100644 --- a/conf/distro/oplinux-uclibc.conf +++ b/conf/distro/oplinux-uclibc.conf @@ -31,6 +31,7 @@ DISTRO_TYPE = "debug" TARGET_OS = "linux-uclibc" PREFERRED_PROVIDER_virtual/libiconv = "libiconv" PREFERRED_PROVIDER_virtual/libintl = "gettext" +LIBC = "uclibc" # # Kernel diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf index bab726ff16..4e4b59fee9 100644 --- a/conf/distro/oplinux.conf +++ b/conf/distro/oplinux.conf @@ -46,6 +46,7 @@ PREFERRED_PROVIDER_esound ?= "pulseaudio" # glibc: +LIBC ?= "glibc" PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 3e816f7c58..eb661b9634 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -18,6 +18,7 @@ IMAGE_INITSCRIPTS ?= "initscripts-slugos" require conf/distro/include/slugos.inc # glibc: +LIBC ?= "glibc" PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index e3fa0166ed..e47173513c 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" THUMB_INTERWORK = "yes" TARGET_OS = "linux-uclibc" +LIBC = "uclibc" PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" diff --git a/conf/distro/wrt54oe.conf b/conf/distro/wrt54oe.conf index 4d18407333..f60f927304 100644 --- a/conf/distro/wrt54oe.conf +++ b/conf/distro/wrt54oe.conf @@ -12,6 +12,7 @@ INHERIT += "package_ipk debian" TARGET_OS = "linux-uclibc" +LIBC = "uclibc" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" -- cgit v1.2.3 From d59fc6ce4782b882620fbaa60d682d29e63d0731 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 29 Apr 2009 12:07:09 -0400 Subject: All distros: Bring in conf/distro/include/${LIBC}.inc With minimal/minimal-uclibc we have to do a little rework so that minimal-uclibc can override the main distro. Acked-by: Leon Woestenberg Acked-by: Mike Westerhof Signed-off-by: Tom Rini --- conf/distro/asusoe.conf | 1 + conf/distro/celinux-test.conf | 6 +----- conf/distro/chinook-compat.conf | 6 ------ conf/distro/gmustix.conf | 2 +- conf/distro/include/angstrom-2007-for-openmoko.inc | 1 - conf/distro/include/angstrom-eglibc.inc | 13 +------------ conf/distro/include/angstrom-glibc.inc | 16 ++-------------- conf/distro/include/angstrom-uclibc.inc | 9 +-------- conf/distro/include/angstrom-uclinux-uclibc.inc | 5 +---- conf/distro/include/sane-toolchain-eglibc.inc | 20 -------------------- conf/distro/include/sane-toolchain-glibc.inc | 17 ++--------------- conf/distro/include/sane-toolchain-uclibc.inc | 8 -------- .../distro/include/sane-toolchain-uclinux-uclibc.inc | 4 ---- conf/distro/include/sane-toolchain.inc | 7 ++++--- conf/distro/include/slugos.inc | 7 ------- conf/distro/include/uclibc.inc | 2 ++ conf/distro/jlime-2009.1.conf | 8 ++------ conf/distro/jlime-donkey.conf | 3 +-- conf/distro/jlime-henchman.conf | 8 ++------ conf/distro/jlime-mongo.conf | 8 ++------ conf/distro/jlime-shrek.conf | 2 +- conf/distro/mamona.conf | 12 +----------- conf/distro/minimal-uclibc.conf | 10 ++++------ conf/distro/minimal.conf | 10 +++++----- conf/distro/nylon.conf | 2 +- conf/distro/openmn.conf | 1 + conf/distro/openmoko.conf | 1 + conf/distro/openprotium.conf | 8 +------- conf/distro/oplinux-uclibc.conf | 3 +-- conf/distro/oplinux.conf | 16 +--------------- conf/distro/slugos.conf | 5 +---- conf/distro/ucslugc.conf | 1 + conf/distro/wrt54oe.conf | 2 +- 33 files changed, 43 insertions(+), 181 deletions(-) (limited to 'conf') diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf index ecda37f8cf..efc4efccd4 100644 --- a/conf/distro/asusoe.conf +++ b/conf/distro/asusoe.conf @@ -8,6 +8,7 @@ DISTRO_VERSION = "0.1-alpha" TARGET_OS = "linux-uclibc" TARGET_SYS = "${TARGET_ARCH}-uclibc" LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc CROSS_DIR = "/opt/brcm/hndtools-mipsel-uclibc" diff --git a/conf/distro/celinux-test.conf b/conf/distro/celinux-test.conf index a3a0bc4f70..fbc96e19bf 100644 --- a/conf/distro/celinux-test.conf +++ b/conf/distro/celinux-test.conf @@ -39,7 +39,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_binutils-cross = "2.16" @@ -50,12 +49,9 @@ PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" LIBC = "glibc" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_glibc = "2.3.5+cvs20050627" -# glibc provides iconv and intl -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - # # omap5912osk settings # diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index e7350484e2..8fefbbce8a 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -50,12 +50,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDER_virtual/libc = "glibc" - -# NPTL stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc" - PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libx11 = "libx11" diff --git a/conf/distro/gmustix.conf b/conf/distro/gmustix.conf index 106b16e87e..17f805617a 100644 --- a/conf/distro/gmustix.conf +++ b/conf/distro/gmustix.conf @@ -4,6 +4,7 @@ INHERIT += "package_tar package_ipk" LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc TARGET_OS = "linux-uclibc" TARGET_FPU = "soft" IMAGE_FSTYPES = "jffs2" @@ -12,7 +13,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:uclibc" PREFERRED_PROVIDER_classpath = "classpath-minimal" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index dcd49980eb..1deb85d7f7 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -137,7 +137,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" #Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index c0d87a4ff5..655cf9d50e 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,16 +1,5 @@ # 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" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" +require conf/distro/include/eglibc.inc TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index b14f880328..5df77d8c74 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,19 +1,7 @@ # 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" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" +require conf/distro/include/glibc.inc +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 86a9afd465..3079e0d365 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -1,12 +1,5 @@ # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" +require conf/distro/include/uclibc.inc PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc index 68ad145879..c3f908c2c4 100644 --- a/conf/distro/include/angstrom-uclinux-uclibc.inc +++ b/conf/distro/include/angstrom-uclinux-uclibc.inc @@ -1,8 +1,5 @@ # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +require conf/distro/include/uclibc.inc USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/sane-toolchain-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc index e780349137..1b0d49316d 100644 --- a/conf/distro/include/sane-toolchain-eglibc.inc +++ b/conf/distro/include/sane-toolchain-eglibc.inc @@ -1,26 +1,6 @@ # Originally brought to you by the Angstrom Distribution # 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" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" -PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" - -#TARGET_OS = "linux-gnuspe" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" diff --git a/conf/distro/include/sane-toolchain-glibc.inc b/conf/distro/include/sane-toolchain-glibc.inc index b14f880328..b4da525fcf 100644 --- a/conf/distro/include/sane-toolchain-glibc.inc +++ b/conf/distro/include/sane-toolchain-glibc.inc @@ -1,19 +1,6 @@ -# 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" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" - -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc" +# Originally brought to you by the Angstrom Distribution +# glibc: TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/sane-toolchain-uclibc.inc b/conf/distro/include/sane-toolchain-uclibc.inc index 66ac81a508..394b52ae75 100644 --- a/conf/distro/include/sane-toolchain-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclibc.inc @@ -1,14 +1,6 @@ # Originally brought to you by the Angstrom Distribution # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" -PREFERRED_PROVIDER_virtual/arm-${TARGET_VENDOR}-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" -PREFERRED_PROVIDER_virtual/armeb-${TARGET_VENDOR}-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc index 85ccddf704..b757efb55a 100644 --- a/conf/distro/include/sane-toolchain-uclinux-uclibc.inc +++ b/conf/distro/include/sane-toolchain-uclinux-uclibc.inc @@ -1,10 +1,6 @@ # Originally brought to you by the Angstrom Distribution # uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" USE_NLS ?= "no" USE_NLS_glib-2.0 = "yes" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index f70e98ee17..dff4b9f081 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -115,9 +115,10 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" ############################################################################# # Can be "glibc", "eglibc" or "uclibc" -PREFERRED_LIBC ?= "glibc" -PSTAGE_EXTRAPATH = "${PREFERRED_LIBC}" -require conf/distro/include/sane-toolchain-${PREFERRED_LIBC}.inc +LIBC ?= "glibc" +require conf/distro/include/${LIBC}.inc +PSTAGE_EXTRAPATH = "${LIBC}" +require conf/distro/include/sane-toolchain-${LIBC}.inc # Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable PREFERRED_PROVIDER_qemu-native = "qemu-native" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 51ca9f34b1..b1b89b9870 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -120,13 +120,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-interme PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" -#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-linux-gnueabi-libc-for-gcc = "glibc" - # Set the preferred provider for a few toolchain-related items, otherwise # these may be selected from the external-toolchain instead. PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc index bb2e2be71f..979b7f1539 100644 --- a/conf/distro/include/uclibc.inc +++ b/conf/distro/include/uclibc.inc @@ -4,6 +4,8 @@ OVERRIDES .= ":uclibc" # The things uclibc can provide. We default to wanting uclibc to provide them. PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libintl_avr32 = "proxy-libintl" PREFERRED_PROVIDER_virtual/libc = "uclibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "uclibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf index 85d460d7a4..7488ddec3e 100644 --- a/conf/distro/jlime-2009.1.conf +++ b/conf/distro/jlime-2009.1.conf @@ -70,12 +70,8 @@ TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" LIBC = "glibc" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc" +require conf/distro/include/${LIBC}.inc + PREFERRED_VERSION_linux-libc-headers = "2.6.18" PREFERRED_VERSION_glibc = "2.5" diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index ff1c1cafc5..db964f00bc 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -24,8 +24,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" LIBC = "glibc" -PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" +require conf/distro/include/${LIBC}.inc #<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf index 8ae89017bb..14ea57d18c 100644 --- a/conf/distro/jlime-henchman.conf +++ b/conf/distro/jlime-henchman.conf @@ -69,12 +69,8 @@ TARGET_FPU_arm = "fixed" TARGET_FPU_armeb = "fixed" LIBC = "glibc" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc" +require conf/distro/include/${LIBC}.inc + PREFERRED_VERSION_linux-libc-headers = "2.6.23" PREFERRED_VERSION_glibc = "2.5" diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf index 5eeb1dd049..2e6c43462e 100644 --- a/conf/distro/jlime-mongo.conf +++ b/conf/distro/jlime-mongo.conf @@ -70,12 +70,8 @@ TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" LIBC = "glibc" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc" +require conf/distro/include/${LIBC}.inc + PREFERRED_VERSION_linux-libc-headers = "2.6.18" PREFERRED_VERSION_glibc = "2.5" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 8f1b81a812..98844d76a4 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -16,7 +16,7 @@ PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inte PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" LIBC = "glibc" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +require conf/distro/include/${LIBC}.inc PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf index e176b9c147..648d327677 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -54,23 +54,13 @@ PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" # *libc TARGET_OS = "linux-gnueabi" LIBC = "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" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_uclibc ?= "0.9.29" -# NPTL stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-mamona-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-mamona-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/i586-mamona-linux-libc-for-gcc = "glibc" - # Other Packages # ============== diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index 94d671b258..34f92119b2 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -8,8 +8,6 @@ #@COMMENT: It bases on conservative settings and should always be buildable. #----------------------------------------------------------------------------- -require conf/distro/minimal.conf - # # Header # @@ -21,12 +19,11 @@ DISTRO_NAME = "minimal-uclibc" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -LIBC = "uclibc" -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" + +# Override the default virtual/libintl +LIBC = "uclibc" PREFERRED_PROVIDER_virtual/libintl = "proxy-libintl" USE_NLS ?= "no" @@ -37,3 +34,4 @@ USE_NLS_gcc-cross = "no" PREFERRED_VERSION_uclibc = "0.9.30" PREFERRED_VERSION_uclibc-initial = "0.9.30" +require conf/distro/minimal.conf diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 35c3368451..f1f04e5e6a 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -10,7 +10,7 @@ ############################################################################# # NAME and VERSION ############################################################################# -DISTRO_NAME = "minimal" +DISTRO_NAME ?= "minimal" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" @@ -56,9 +56,9 @@ IPKG_VARIANT = "opkg-nogpg" # IMAGES ############################################################################# # Name the generated images in a sane way -IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${PREFERRED_LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" -CACHE ?= "${TMPDIR}/cache/${PREFERRED_LIBC}/${MACHINE}" -DEPLOY_DIR ?= "${TMPDIR}/deploy/${PREFERRED_