SlugOS: Initial commit for SlugOS 5.5 - update toolchain, use eglibc
authorMike Westerhof <mwester@dls.net>
Wed, 16 Jun 2010 18:31:14 +0000 (13:31 -0500)
committerMike Westerhof <mwester@dls.net>
Wed, 16 Jun 2010 18:31:14 +0000 (13:31 -0500)
Switch to gcc 4.4.4, update toolchains to match, switch to eglibc
Also add some PREFERRED_PROVIDERS.

conf/distro/include/preferred-slugos-versions.inc
conf/distro/include/slugos.inc
conf/distro/slugos.conf

index fc5891c..c7683b6 100644 (file)
@@ -32,24 +32,26 @@ OPKG_SRCREV = "160"
 
 PREFERRED_VERSION_atk                          ?= "1.28.0"
 PREFERRED_VERSION_atk-native                   ?= "1.28.0"
-PREFERRED_VERSION_autoconf                     ?= "2.61"
-PREFERRED_VERSION_autoconf-native              ?= "2.61"
-PREFERRED_VERSION_automake-native              ?= "1.10.3"
-PREFERRED_VERSION_automake                     ?= "1.10.3"
-PREFERRED_VERSION_binutils                     ?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross               ?= "2.18.50.0.7"
-PREFERRED_VERSION_binutils-cross-sdk           ?= "2.18.50.0.7"
+PREFERRED_VERSION_autoconf                     ?= "2.65"
+PREFERRED_VERSION_autoconf-native              ?= "2.65"
+PREFERRED_VERSION_automake                     ?= "1.11.1"
+PREFERRED_VERSION_automake-native              ?= "1.11.1"
+PREFERRED_VERSION_binutils                     ?= "2.20.1"
+PREFERRED_VERSION_binutils-cross               ?= "2.20.1"
+PREFERRED_VERSION_binutils-cross-sdk           ?= "2.20.1"
 PREFERRED_VERSION_busybox                      ?= "1.13.2"
 PREFERRED_VERSION_dbus                         ?= "1.2.3"
-PREFERRED_VERSION_gcc                          ?= "4.2.4"
-PREFERRED_VERSION_gcc-cross                    ?= "4.2.4"
-PREFERRED_VERSION_gcc-cross-sdk                        ?= "4.2.4"
-PREFERRED_VERSION_gcc-cross-initial            ?= "4.2.4"
-PREFERRED_VERSION_gcc-cross-intermediate       ?= "4.2.4"
+PREFERRED_VERSION_eglibc                       ?= "2.11"
+PREFERRED_VERSION_eglibc-initial               ?= "2.11"
+PREFERRED_VERSION_gcc                          ?= "4.4.4"
+PREFERRED_VERSION_gcc-cross                    ?= "4.4.4"
+PREFERRED_VERSION_gcc-cross-sdk                        ?= "4.4.4"
+PREFERRED_VERSION_gcc-cross-initial            ?= "4.4.4"
+PREFERRED_VERSION_gcc-cross-intermediate       ?= "4.4.4"
 PREFERRED_VERSION_glib-2.0                     ?= "2.22.1"
 PREFERRED_VERSION_glib-2.0-native              ?= "2.22.1"
-PREFERRED_VERSION_glibc                                ?= "2.6.1"
-PREFERRED_VERSION_glibc-initial                        ?= "2.6.1"
+PREFERRED_VERSION_glibc                                ?= "2.10.1"
+PREFERRED_VERSION_glibc-initial                        ?= "2.10.1"
 PREFERRED_VERSION_gtk+                         ?= "2.18.6"
 PREFERRED_VERSION_gtk+-native                  ?= "2.18.6"
 PREFERRED_VERSION_ipkg                         ?= "0.99.163"
@@ -59,20 +61,25 @@ PREFERRED_VERSION_libtool-native            ?= "2.2.6b"
 PREFERRED_VERSION_libtool-cross                        ?= "2.2.6b"
 PREFERRED_VERSION_libtool-sdk                  ?= "2.2.6b"
 PREFERRED_VERSION_linux-libc-headers           ?= "2.6.23"
-PREFERRED_VERSION_m4                           ?= "1.4.8"
-PREFERRED_VERSION_m4-native                    ?= "1.4.8"
+PREFERRED_VERSION_m4                           ?= "1.4.14"
+PREFERRED_VERSION_m4-native                    ?= "1.4.14"
 PREFERRED_VERSION_nslu2-linksys-firmware       ?= "2.3r63"
 PREFERRED_VERSION_pkgconfig                    ?= "0.23"
 PREFERRED_VERSION_pkgconfig-native             ?= "0.23"
+PREFERRED_VERSION_uclibc                       ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial               ?= "0.9.30.1"
 PREFERRED_VERSION_udev                         ?= "118"
 
 ##################### Stuff with special notes, and broken stuff:
 
+# Newer version required by glibc and some userspace apps
+#PREFERRED_VERSION_linux-libc-headers          ?= "2.6.31"
+
 # boost 1.36 won't build
-PREFERRED_VERSION_boost                                ?= "1.33.1"
+#PREFERRED_VERSION_boost                               ?= "1.33.1"
 
 # pulseaudio 0.9.19 is broken (ASM errors during do_compile):
-PREFERRED_VERSION_pulseaudio                    ?= "0.9.15"
+#PREFERRED_VERSION_pulseaudio                    ?= "0.9.15"
 
 # latest tcl recipe has a bug that overwites regex.h; use the old tcl
-PREFERRED_VERSION_tcl                          ?= "8.4.19"
\ No newline at end of file
+#PREFERRED_VERSION_tcl                         ?= "8.4.19"
index e7ecc80..00a10bf 100644 (file)
@@ -16,7 +16,7 @@
 #TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "5.4"
+SLUGOS_VERSION = "5.5"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
@@ -163,7 +163,9 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm    ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm       ?= "gtk+"
 
 PREFERRED_PROVIDER_avahi                       ?= "avahi"
+PREFERRED_PROVIDER_ifupdown                    ?= "ifupdown"
 PREFERRED_PROVIDER_gconf                       ?= "gconf"
+PREFERRED_PROVIDER_libqte2                     ?= "qte"
 PREFERRED_PROVIDER_virtual/libusb0             ?= "libusb-compat"
 
 # we use bluez4 instead of the older bluez3
index 4b77cf8..5a2f0dc 100644 (file)
@@ -19,6 +19,6 @@ IMAGE_INITSCRIPTS ?= "initscripts-slugos"
 
 require conf/distro/include/slugos.inc
 
-# glibc:
-LIBC ?= "glibc"
+# Can be either glibc or eglibc (or perhaps even uclibc)
+LIBC ?= "eglibc"
 require conf/distro/include/${LIBC}.inc