angstrom: start with merging in angstrom/angstrom-next branch

5 files changed, 90 insertions, 10 deletions

diff --git a/conf/distro/include/angstrom-2010-preferred-versions.inc b/conf/distro/include/angstrom-2010-preferred-versions.inc
new file mode 100644
index 0000000000..8212c2f45e
--- /dev/null
+++ b/conf/distro/include/angstrom-2010-preferred-versions.inc
@@ -0,0 +1,86 @@
+ANGSTROM_MESA_VERSION = "7.8.2"
+ANGSTROM_QT_VERSION ?= "4.6.3"
+CE_VERSION ?= "2.25.01"
+
+require conf/distro/include/angstrom-codec-engine-${CE_VERSION}-preferred-versions.inc
+require conf/distro/include/preferred-xorg-versions-live.inc
+
+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_busybox 	= "1.13.2"
+PREFERRED_VERSION_cairo		= "1.8.10"
+PREFERRED_VERSION_dbus 		= "1.2.24"
+PREFERRED_VERSION_dropbear      = "0.51"
+PREFERRED_VERSION_fontconfig	= "2.8.0"
+PREFERRED_VERSION_glib-2.0 	= "2.24.1"
+PREFERRED_VERSION_glib-2.0-native = "2.24.1"
+PREFERRED_VERSION_glibmm = "2.24.0"
+PREFERRED_VERSION_gst-pulse 	= "0.9.7"
+PREFERRED_VERSION_gtk+		= "2.20.1"
+PREFERRED_VERSION_gtk+-native	= "2.20.1"
+PREFERRED_VERSION_gtkmm		= "2.20.0"
+PREFERRED_VERSION_hal		= "0.5.14"
+PREFERRED_VERSION_libgemwidget	= "1.0"
+PREFERRED_VERSION_libgpephone	= "0.4"
+PREFERRED_VERSION_libsdl-x11	= "1.2.14"
+PREFERRED_VERSION_libtool 	= "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross	= "2.2.6b"
+PREFERRED_VERSION_libtool-sdk	= "2.2.6b"
+PREFERRED_VERSION_lighttpd      = "1.4.26"
+PREFERRED_VERSION_mesa          = "${ANGSTROM_MESA_VERSION}"
+PREFERRED_VERSION_mesa-dri      = "${ANGSTROM_MESA_VERSION}"
+PREFERRED_VERSION_mesa-xlib     = "${ANGSTROM_MESA_VERSION}"
+PREFERRED_VERSION_mythplugins   = "0.22"
+PREFERRED_VERSION_myththemes    = "0.22"
+PREFERRED_VERSION_mythtv        = "0.22"
+PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr30165"
+PREFERRED_VERSION_network-manager-applet = "0.8"
+PREFERRED_VERSION_networkmanager = "0.8"
+PREFERRED_VERSION_openssl = "1.0.0a"
+PREFERRED_VERSION_openssl-native = "1.0.0a"
+PREFERRED_VERSION_pango 	= "1.24.4"
+PREFERRED_VERSION_pango-native     = "1.24.4"
+#PREFERRED_VERSION_pixman	= "0.13.2"
+PREFERRED_VERSION_pkgconfig	= "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio 	= "0.9.15"
+PREFERRED_VERSION_python-pycairo = "1.8.0"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+PREFERRED_VERSION_samba		= "3.3.9"
+PREFERRED_VERSION_tiff 		= "3.9.2+4.0.0beta5"
+
+PREFERRED_VERSION_udev 		= "151"
+PREFERRED_VERSION_udev_libc-uclibc = "141"
+UDEV_GE_141 = "1"
+
+PREFERRED_VERSION_usbutils = "0.86"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_wget = "1.11.4"
+PREFERRED_VERSION_xserver-common = "1.33"
+PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.8.1"
+
+#
+# meta-moblin package SRCREVs
+#
+SRCREV_pn-bickley ?= "de9431b7c6040bc3731157c05947159ad2c7a0a9"
+SRCREV_pn-json-glib ?= "930fdf4c4dff1f5310a946c2a9f5b6860f7c8ba8"
+SRCREV_pn-libccss ?= "92bc59e1d39302c8be500d53cb5dd8b05c2e4a15"
+SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
+SRCREV_pn-librest ?= "14d35103d9649dc1e10c3e9ac2c690b3165c8184"
+SRCREV_pn-moblin-menus ?= "e1d63681739dd16195d005b3cf15752df294bd3c"
+SRCREV_pn-mojito ?= "0542c4b0e26c0e3b69c5ad1fa1898dc276fb9f48"
+SRCREV_pn-mozilla-headless-services ?= "c7873654894af6c7c6c01194d6185db46667b81f"
+SRCREV_pn-mutter ?= "aff4cf110307e149d3497d20543cde27b9699758"
+SRCREV_pn-twitter-glib ?= "849bec29292df88590e0b2898b50b9b8d766817e"
+SRCREV_pn-xf86-video-psb ?= "b6b3bba06fe5a3fe0b1bd6e31a7369dd83812bab"
+
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 26b858802d..6c504b4c82 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -10,16 +10,14 @@ TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'po
 
 #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 -ggdb3"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
-BUILD_OPTIMIZATION = "-O2"
+BUILD_OPTIMIZATION = "-O2 -g"
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_sparc = "-O2"
 
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 1c7f7f5394..77e7fd56f8 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -12,10 +12,8 @@ USE_NLS_gcc-cross = "no"
 TARGET_OS_UC = "linux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARCH',d)  in ['bfin']]}"
 
-#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
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
-BUILD_OPTIMIZATION = "-O2"
+BUILD_OPTIMIZATION = "-O2 -g"
 
 #Gcc will die with 'internal consistency error when using the above optimizations
 #with gcc-4.2.1-atmel.1.0.3 (and probably most other avr32 gcc ports).
diff --git a/conf/distro/include/angstrom-uclinux-uclibc.inc b/conf/distro/include/angstrom-uclinux-uclibc.inc
index e591ee2fd5..47b6d5cc6e 100644
--- a/conf/distro/include/angstrom-uclinux-uclibc.inc
+++ b/conf/distro/include/angstrom-uclinux-uclibc.inc
@@ -8,8 +8,6 @@ USE_NLS_gcc-cross = "no"
 
 TARGET_OS_UC = "uclinux${@['-uclibc','-uclibceabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
 
-#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
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3"
 BUILD_OPTIMIZATION = "-O2"
 
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 3ba94fa02a..8983c86cb4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -21,7 +21,7 @@ INHERIT += "src_distribute_local"
 SRC_DIST_LOCAL ?= "symlink"
 
 # Can be "glibc", "eglibc" or "uclibc"
-ANGSTROMLIBC ?= "glibc"
+ANGSTROMLIBC ?= "eglibc"
 LIBC ?= "${ANGSTROMLIBC}"
 PSTAGE_EXTRAPATH = "${LIBC}"