diff options
Diffstat (limited to 'conf/distro')
49 files changed, 331 insertions, 402 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 740ff31435..ad34b7d48c 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -17,8 +17,10 @@ #DISTRO_VERSION = "2009.X" DISTRO_VERSION = "2009.X-test-${DATE}" -DISTRO_REVISION = "1" -DISTRO_PR = ".1" +DISTRO_REVISION = "2" +DISTRO_PR = ".2" + +OLDEST_KERNEL ?= "2.6.16" #build staging from packages INHERIT += "packaged-staging" @@ -46,7 +48,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/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/" #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback @@ -99,9 +101,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" # Blackfin has its on gcc ANGSTROM_GCC_VERSION_bfin = "4.1.2" -ANGSTROM_GCC_VERSION_486sx = "4.3.3" -ANGSTROM_GCC_VERSION_armv7a = "4.3.3" - # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc) #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53" @@ -109,10 +108,10 @@ ANGSTROM_GCC_VERSION_armv7a = "4.3.3" ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" #Everybody else can just use this: -ANGSTROM_GCC_VERSION ?= "4.2.4" +ANGSTROM_GCC_VERSION ?= "4.3.3" -#2.19.51.0.3 -ANGSTROM_BINUTILS_VERSION ?= "2.18.50.0.7" +ANGSTROM_BINUTILS_VERSION ?= "2.18" +ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7" PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}" PREFERRED_VERSION_binutils-cross ?= "${ANGSTROM_BINUTILS_VERSION}" diff --git a/conf/distro/asusoe.conf b/conf/distro/asusoe.conf index 35be6a4fab..efc4efccd4 100644 --- a/conf/distro/asusoe.conf +++ b/conf/distro/asusoe.conf @@ -7,6 +7,8 @@ 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 0787ff2bca..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" @@ -49,12 +48,10 @@ 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" +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 d2ff51eaa4..8fefbbce8a 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" @@ -49,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/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 <repvik@foonas.org> #@-------------------------------------------------------------------- -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..17f805617a 100644 --- a/conf/distro/gmustix.conf +++ b/conf/distro/gmustix.conf @@ -3,6 +3,8 @@ #@DESCRIPTION: Gumstix distribution for GMU (George Mason University) INHERIT += "package_tar package_ipk" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc TARGET_OS = "linux-uclibc" TARGET_FPU = "soft" IMAGE_FSTYPES = "jffs2" @@ -11,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 b931d340c3..1deb85d7f7 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 @@ -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-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a11c1d5691..3b7905c284 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -11,6 +11,7 @@ PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.16.0" PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_hal = "0.5.12" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" @@ -24,6 +25,6 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_udev = "124" +PREFERRED_VERSION_udev = "141" PREFERRED_VERSION_wpa-supplicant = "0.6.7" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" 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/angstrom.inc b/conf/distro/include/angstrom.inc index 1f0fced434..2655bfe3bb 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) @@ -31,9 +32,6 @@ require conf/distro/include/angstrom-${ANGSTROMLIBC}.inc # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" -ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb" ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" @@ -101,11 +99,6 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales LOCALE_UTF8_ONLY = "1" -#qemu doesn't like armv6/eabi/vfp -ENABLE_BINARY_LOCALE_GENERATION_armv6 = "0" -ENABLE_BINARY_LOCALE_GENERATION_armv6-novfp = "0" -ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" - #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" @@ -144,7 +137,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 +149,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/eglibc.inc b/conf/distro/include/eglibc.inc new file mode 100644 index 0000000000..0d2087ed4b --- /dev/null +++ b/conf/distro/include/eglibc.inc @@ -0,0 +1,9 @@ +# Add glibc overrides to the overrides for eglibc. +OVERRIDES .= ":libc-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..f9140ffa43 --- /dev/null +++ b/conf/distro/include/glibc.inc @@ -0,0 +1,9 @@ +# Add glibc to the overrides. +OVERRIDES .= ":libc-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/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/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 12e3cf467d..803d436bbf 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -503,7 +503,7 @@ PREFERRED_VERSION_gnome-vfs ?= "2.22.0" PREFERRED_VERSION_gnome-vfs-extras ?= "0.99.13" PREFERRED_VERSION_gnome-vfs-obexftp ?= "0.4" PREFERRED_VERSION_gnuchess ?= "5.05" -PREFERRED_VERSION_gnumeric ?= "1.6.3" +PREFERRED_VERSION_gnumeric ?= "1.8.4" PREFERRED_VERSION_gnupg ?= "1.4.2.2" PREFERRED_VERSION_gnuplot ?= "4.2.2" PREFERRED_VERSION_gnuradio ?= "3.0.4" @@ -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" 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" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc index 1f6076525f..6e42065aed 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc @@ -2,6 +2,6 @@ PREFERRED_VERSION_xserver-xorg ?= "1.5.3" PREFERRED_VERSION_xf86-input-evdev ?= "2.1.0" -PREFERRED_VERSION_xf86-video-geode ?= "2.11.0" +PREFERRED_VERSION_xf86-video-geode ?= "2.11.2" PREFERRED_VERSION_libxi ?= "1.2.0" PREFERRED_VERSION_inputproto ?= "1.5.0" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 8be99a363d..15a8c00127 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -39,14 +39,15 @@ SRCDATE_python-cairo ?= "20060814" SRCDATE_qemu-native ?= "20070613" SRCDATE_rdesktop ?= "20080917" SRCDATE_roadster ?= "20060814" +SRCDATE_rosetta ?= "20090514" SRCDATE_sctzap ?= "20060814" SRCDATE_tslib ?= "20051101" SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" -SRCDATE_yamonenv ?= "20060814" -SRCDATE_zaurusd ?= "20060628" +SRCDATE_yamonenv ?= "20051022" +SRCDATE_zaurusd ?= "20090501" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8962174814..8d2bc93359 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -75,9 +75,10 @@ SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "10302" -SRCREV_pn-gpe-conf ?= "9798" +SRCREV_pn-gpe-conf ?= "9900" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gpe-gallery ?= "9376" +SRCREV_pn-gpe-mini-browser2 ?= "9900" SRCREV_pn-gpe-sketchbook ?= "9547" SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" @@ -111,7 +112,7 @@ SRCREV_pn-libowl ?= "277" SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" -SRCREV_pn-linux-bug ?= "8918" +SRCREV_pn-linux-bug ?= "9110" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1089" SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7" @@ -131,7 +132,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9" SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9" -SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338" +SRCREV_pn-midori ?= "eaaed697bf962862b6f393c6b1aceeb04df7414b" SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce" SRCREV_pn-moko-gtk-engine ?= "4734" SRCREV_pn-mokoko ?= "127" @@ -239,6 +240,7 @@ SRCREV_pn-table ?= "2191" SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177" SRCREV_pn-tmut ?= "60" SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96" +SRCREV_pn-u-boot-bug ?= "8674" SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-uclibc ?= "25712" @@ -248,11 +250,11 @@ SRCREV_pn-usbpath-native ?= "3172" SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd" -SRCREV_pn-webkit-gtk ?= "42127" +SRCREV_pn-webkit-gtk ?= "43635" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "4522" -SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77" +SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" 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 b141548ce3..b1b89b9870 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 @@ -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 new file mode 100644 index 0000000000..ee18fc87e1 --- /dev/null +++ b/conf/distro/include/uclibc.inc @@ -0,0 +1,11 @@ +# Add uclibc overrides to the overrides. +OVERRIDES .= ":libc-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 a72988ea76..7488ddec3e 100644 --- a/conf/distro/jlime-2009.1.conf +++ b/conf/distro/jlime-2009.1.conf @@ -69,12 +69,9 @@ TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -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" +LIBC = "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 dad1f1fd05..db964f00bc 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -23,8 +23,8 @@ 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_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc" +LIBC = "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 5a99ef2d79..14ea57d18c 100644 --- a/conf/distro/jlime-henchman.conf +++ b/conf/distro/jlime-henchman.conf @@ -68,12 +68,9 @@ TARGET_OS = "linux" TARGET_FPU_arm = "fixed" TARGET_FPU_armeb = "fixed" -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" +LIBC = "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 4e922eab35..2e6c43462e 100644 --- a/conf/distro/jlime-mongo.conf +++ b/conf/distro/jlime-mongo.conf @@ -69,12 +69,9 @@ TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -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" +LIBC = "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 7928387390..98844d76a4 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -15,7 +15,8 @@ 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:glibc" +LIBC = "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/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..648d327677 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -53,23 +53,14 @@ PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" # *libc TARGET_OS = "linux-gnueabi" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" +LIBC = "glibc" +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/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 <mgl@doredevelopment.dk> +#@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 <mgl@doredevelopment.dk> +#@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" + diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index 62eb86ab84..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,11 +19,11 @@ DISTRO_NAME = "minimal-uclibc" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" -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" @@ -36,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..c05676cb50 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -10,10 +10,10 @@ ############################################################################# # NAME and VERSION ############################################################################# -DISTRO_NAME = "minimal" +DISTRO_NAME ?= "minimal" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" #DISTRO_TYPE = "release" -DISTRO_TYPE = "debug" +DISTRO_TYPE ?= "debug" # Ensure some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") @@ -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_LIBC}" +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" ############################################################################# @@ -70,7 +70,7 @@ MACHINE_KERNEL_VERSION = "2.6" ############################################################################# # TOOLCHAIN ############################################################################# -PREFERRED_LIBC = "glibc" +LIBC ?= "glibc" require conf/distro/include/sane-toolchain.inc ############################################################################# diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 3d1f0579f0..99cab2bcbb 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -1,39 +1,73 @@ +############################################################################# #@TYPE: Distribution #@NAME: Nylon Linux #@DESCRIPTION: Distribution configuration for Nylon Mesh Linux distribution +############################################################################# -# this distribution is mainly for wireless networking devices and includes -# packages necessary for wireless LAN access point, routing, encryption and -# especially mesh routing applications -# -# it is primarily aimed at the 4G Systems MeshCube (mtx-1) and other -# mipsel based platforms -# -# Bruno Randolf <bruno.randolf@4g-systems.biz> +require conf/distro/angstrom-2008.1.conf -TARGET_OS = "linux" +############################################################################# +# NAME and VERSION +############################################################################# +DISTRO_NAME = "nylon" +DISTRO = ${DISTRO_NAME} +DISTRO_VERSION = "${NYLON_VERSION}" +BUILDNAME := "${NYLON_VERSION}" +#DISTRO_TYPE = "release" +DISTRO_TYPE = "debug" +TARGET_FPU = "soft" +SRCDATE := "20050527" +TARGET_VENDOR = "-nylon" + +# Ensure some form of release config, so error out if someone thinks he knows better +DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") + +############################################################################# +# PACKAGING +############################################################################# +# Chose the packaging system +INHERIT += "nylon-mirrors" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" +KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" -INHERIT += "package_ipk debian nylon-mirrors" -INHERIT += "linux-kernel-base" +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel24" +MACHINE_KERNEL_VERSION = "2.4" -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:glibc" -PREFERRED_PROVIDERS += " virtual/libx11:diet-x11" -PREFERRED_PROVIDERS += " python:python-curses" -PREFERRED_PROVIDER_classpath = "classpath-minimal" +############################################################################# +# TOOLCHAIN +############################################################################# +fixedCxxflags = "${@bb.data.getVar('CXXFLAGS', d, 1).replace('-fvisibility-inlines-hidden','')}" +CXXFLAGS := ${fixedCxxflags} -TARGET_FPU = "soft" +# we're not supporting pcmcia right now +DISTRO_FEATURES = "nfs smbfs wifi pcmcia ppp ext2 vfat usbhost pci" -SRCDATE := "20050527" +# FIXME: cannot build linux-libc-headers unless this is set. +IPKGBUILDCMD = "stage-manager-ipkg-build -o 0 -g 0" +############################################################################# +# PREFERRED VERSIONS +############################################################################# +PREFERRED_VERSION_busybox = "1.7.2" PREFERRED_VERSION_glibc = "2.3.3" +PREFERRED_VERSION_glibc-initial = "2.3.2" PREFERRED_VERSION_shorewall = "2.0.9-monolithic" PREFERRED_VERSION_ppp-dsl = "0.1-monolithic" -PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20060223" +PREFERRED_VERSION_mtd-utils = "1.0.0+git" PREFERRED_VERSION_kismet = "2005-01-R1" +PREFERRED_VERSION_automake-native = "1.10" +PREFERRED_VERSION_pkgconfig-native = "0.23" +PREFERRED_VERSION_netperf = "2.3" +PREFERRED_PROVIDER_hotplug = "linux-hotplug" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.3.4" @@ -44,67 +78,8 @@ PREFERRED_VERSION_binutils-cross = "2.14.90.0.7" PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7" PREFERRED_VERSION_binutils = "2.16" PREFERRED_VERSION_linux-libc-headers = "2.6.18" - PREFERRED_VERSION_prism54-firmware = "1.0.3.0" - -KERNEL_VERSION_mtx-1 = "2.4.27" -KERNEL_VERSION_mtx-2 = "2.4.27" - -#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3 = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3 = "2.16" +#PREFERRED_VERSION_udev = "089" +PREFERRED_VERSION_udev = "100" PREFERRED_VERSION_madwifi-modules = "0.9.3" PREFERRED_VERSION_madwifi-tools = "0.9.3" - -PREFERRED_VERSION_udev = "089" - -KERNEL_VERSION_mtx-3 = "2.6.15.4" -PREFERRED_PROVIDER_virtual/kernel_mtx-3a = "linux-mtx-3a" - - -#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627" -PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4" -PREFERRED_VERSION_gcc_mtx-3a = "3.4.4" -### did not compile with: -#PREFERRED_VERSION_binutils-cross_mtx-3a = "2.16.91.0.7" -#PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.16.91.0.7" -### falling back to: -PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1" -PREFERRED_VERSION_binutils_mtx-3a = "2.16" - -PREFERRED_VERSION_udev = "100" - -KERNEL_VERSION_mtx-3a = "2.6.16.6" - - -# usually overrrided from local.conf -NYLON_RELEASE = "unstable" - -# use meshcub.org mirrors for CVS sources -CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/" - -export FEED_URIS = " \ - nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed \ - nylon-bin##http://meshcube.org/nylon/${NYLON_RELEASE}/binary-feed" - -# image names -DISTRO_VERSION = "${NYLON_VERSION}" -BUILDNAME := "${NYLON_VERSION}" -#this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')} -IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}" -KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}" - diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf index 9de6c7d9e1..c4a4ccfaee 100644 --- a/conf/distro/openmn.conf +++ b/conf/distro/openmn.conf @@ -13,6 +13,8 @@ TARGET_OS = "linux" INHERIT += "package_ipk" INHERIT += "debian" PACKAGE_EXTRA_ARCHS = "armv5te openmn" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc 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..4d73b8ff84 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -18,6 +18,9 @@ DISTRO = "openmoko" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc + 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..4e0f472675 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -63,13 +63,8 @@ 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" -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" - -PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" +LIBC = "glibc" +require conf/distro/include/${LIBC}.inc #silence a warning message... PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" diff --git a/conf/distro/oplinux-uclibc.conf b/conf/distro/oplinux-uclibc.conf index 3a97c36aa6..b8617cc763 100644 --- a/conf/distro/oplinux-uclibc.conf +++ b/conf/distro/oplinux-uclibc.conf @@ -29,8 +29,8 @@ DISTRO_TYPE = "debug" # Target OS & FPU system # TARGET_OS = "linux-uclibc" -PREFERRED_PROVIDER_virtual/libiconv = "libiconv" -PREFERRED_PROVIDER_virtual/libintl = "gettext" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc # # Kernel diff --git a/conf/distro/oplinux.conf b/conf/distro/oplinux.conf index bab726ff16..43e8fad61c 100644 --- a/conf/distro/oplinux.conf +++ b/conf/distro/oplinux.conf @@ -46,21 +46,8 @@ PREFERRED_PROVIDER_esound ?= "pulseaudio" # glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" - - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/arm-oplinux-linux-gnueabi-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/armeb-oplinux-linux-gnueabi-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/powerpc-oplinux-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/mipsel-oplinux-linux-libc-for-gcc = "glibc" -PREFERRED_PROVIDER_virtual/sparc-oplinux-linux-libc-for-gcc = "glibc" - - +LIBC ?= "glibc" +require conf/distro/include/${LIBC}.inc # Virtuals: PREFERRED_PROVIDER_virtual/db ?= "db" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 3e816f7c58..d82be5d2b5 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -18,7 +18,5 @@ IMAGE_INITSCRIPTS ?= "initscripts-slugos" require conf/distro/include/slugos.inc # 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" +LIBC ?= "glibc" +require conf/distro/include/${LIBC}.inc diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index e3fa0166ed..df8cde8973 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -8,6 +8,8 @@ TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" THUMB_INTERWORK = "yes" TARGET_OS = "linux-uclibc" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc PREFERRED_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" 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 diff --git a/conf/distro/wrt54oe.conf b/conf/distro/wrt54oe.conf index 4d18407333..0cea34912a 100644 --- a/conf/distro/wrt54oe.conf +++ b/conf/distro/wrt54oe.conf @@ -12,12 +12,13 @@ INHERIT += "package_ipk debian" TARGET_OS = "linux-uclibc" +LIBC = "uclibc" +require conf/distro/include/${LIBC}.inc 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_VERSION_gcc-cross-initial = "3.4.4" PREFERRED_VERSION_gcc-cross-intermediate = "3.4.4" |