[oe-commits] org.oe.dev Revive uclibc svn. Rearrange preferred providers based on libc. Bump up some package versions.
khem commit
oe at amethyst.openembedded.net
Sun May 4 08:16:38 UTC 2008
Revive uclibc svn. Rearrange preferred providers based on libc. Bump up some package versions.
Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: a147eede058360494dc7116dfa7a3de17b92123b
ViewMTN: http://monotone.openembedded.org/revision/info/a147eede058360494dc7116dfa7a3de17b92123b
Files:
1
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/angstrom-glibc.inc
conf/distro/include/angstrom-uclibc.inc
conf/distro/include/sane-srcrevs.inc
Diffs:
#
# mt diff -r9784b47b36a685e0be655fb6a7449d2868b4b934 -ra147eede058360494dc7116dfa7a3de17b92123b
#
#
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [dd2138b465f663603f99ce6be674dfd46af8c33f]
# to [252a01909d484f213676e0ef32e9f21efbd1f999]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [d3e88061dc045abd484e366a596f3accf7445889]
# to [14c6b4a552e2c80acee490345dee361941a819ac]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [a902b60d693bd9d292860e99c2423a71397b7318]
# to [561fbe60af1e4718fb9ecf5d28222df8410898dd]
#
# patch "conf/distro/include/angstrom-uclibc.inc"
# from [ed3615a8cce5b329c1b4354ca91a98190a64f862]
# to [ca2fe974b58e8678de2abda68a7ace8c061523a2]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [2a8d95384edcc2c692a0ed61a1977601f9e22b15]
# to [8652978a044df3b651585f9a18c684f81e52849f]
#
============================================================
--- conf/distro/angstrom-2008.1.conf dd2138b465f663603f99ce6be674dfd46af8c33f
+++ conf/distro/angstrom-2008.1.conf 252a01909d484f213676e0ef32e9f21efbd1f999
@@ -70,13 +70,10 @@ PREFERRED_VERSION_linux-libc-headers =
PREFERRED_VERSION_linux-libc-headers = "2.6.23"
#Prefer glibc 2.6 and uclibc 0.9.29, these have had the most testing.
-PREFERRED_VERSION_glibc = "2.6.1"
-PREFERRED_VERSION_glibc-intermediate = "2.6.1"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-PREFERRED_VERSION_uclibc ?= "0.9.29"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-intermediate ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
-
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
@@ -134,18 +131,6 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREF
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-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial"
-
# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc d3e88061dc045abd484e366a596f3accf7445889
+++ conf/distro/include/angstrom-2008-preferred-versions.inc 14c6b4a552e2c80acee490345dee361941a819ac
@@ -1,5 +1,5 @@ PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_busybox = "1.9.2"
-PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
@@ -7,3 +7,4 @@ PREFERRED_VERSION_xserver-kdrive = "1.4.
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_dropbear = "0.50"
============================================================
--- conf/distro/include/angstrom-glibc.inc a902b60d693bd9d292860e99c2423a71397b7318
+++ conf/distro/include/angstrom-glibc.inc 561fbe60af1e4718fb9ecf5d28222df8410898dd
@@ -5,6 +5,16 @@ PREFERRED_PROVIDER_linux-libc-headers ?=
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-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "glibc-intermediate"
+
+
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']]}"
#mess with compiler flags to use -Os instead of -O2
============================================================
--- conf/distro/include/angstrom-uclibc.inc ed3615a8cce5b329c1b4354ca91a98190a64f862
+++ conf/distro/include/angstrom-uclibc.inc ca2fe974b58e8678de2abda68a7ace8c061523a2
@@ -3,7 +3,13 @@ PREFERRED_PROVIDER_virtual/libintl ?= "g
PREFERRED_PROVIDER_virtual/libc = "uclibc"
PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
+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"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+
USE_NLS ?= "no"
USE_NLS_glib-2.0 = "yes"
============================================================
--- conf/distro/include/sane-srcrevs.inc 2a8d95384edcc2c692a0ed61a1977601f9e22b15
+++ conf/distro/include/sane-srcrevs.inc 8652978a044df3b651585f9a18c684f81e52849f
@@ -14,6 +14,8 @@ SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-assassin ?= "41"
SRCREV_pn-bfin-uclibc ?= "1857"
+SRCREV_pn-uclibc ?= "21926"
+SRCREV_pn-uclibc-initial ?= "21926"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-dbus-c++-native ?= "13131"
SRCREV_pn-dbus-c++ ?= "13131"
More information about the Openembedded-commits
mailing list