summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf4
-rw-r--r--conf/distro/chinook-compat.conf1
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc4
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc5
-rw-r--r--conf/distro/include/sane-srcrevs.inc8
5 files changed, 13 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 823dd9d340..da0aabee38 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -63,8 +63,8 @@ PCMCIA_MANAGER = "pcmciautils"
PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
#Initramfs for kernels
-KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/"
-KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
+#KERNEL_INITRAMFS_DIR = "${TMPDIR}/deploy/uclibc/images/${MACHINE}/"
+#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
PREFERRED_VERSION_linux-libc-headers = "2.6.23"
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index 24a90e4e59..b9d882d5d6 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -211,6 +211,7 @@ PKG_zlib = "zlib1g"
PKG_libglade = "libglade2-0"
PKG_libsoup = "libsoup2.2-8"
+PKG_libsdl-mixer = "libsdl-mixer1.2"
PKG_libsdl-image = "libsdl-image1.2"
PKG_libsdl-directfb = "libsdl1.2"
PKG_libsdl-ttf = "libsdl-ttf2.0-0"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index b5c13e17cb..17459ee31d 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -4,10 +4,10 @@ PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_glib-2.0 = "2.18.0"
+PREFERRED_VERSION_glib-2.0 = "2.18.1"
PREFERRED_VERSION_glib-2.0-native = "2.18.0"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.14.1"
+PREFERRED_VERSION_gtk+ = "2.14.2"
PREFERRED_VERSION_libsdl-x11 = "1.2.11"
PREFERRED_VERSION_libtool = "2.2.4"
PREFERRED_VERSION_libtool-native = "2.2.4"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index a42e555c48..f420097466 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -288,7 +288,7 @@ PREFERRED_VERSION_e2tools-native ?= "0.0.16"
PREFERRED_VERSION_eb ?= "4.3"
PREFERRED_VERSION_ebtables ?= "2.0.6"
PREFERRED_VERSION_eciadsl ?= "0.11"
-PREFERRED_VERSION_ecj-native ?= "3.3"
+PREFERRED_VERSION_libecj-bootstrap ?= "3.3"
PREFERRED_VERSION_editres ?= "1.0.2"
PREFERRED_VERSION_eds-feed ?= "0.3.2"
PREFERRED_VERSION_eel ?= "2.12.2"
@@ -1378,7 +1378,7 @@ PREFERRED_VERSION_openssh ?= "4.6p1"
PREFERRED_VERSION_openssl ?= "0.9.7g"
PREFERRED_VERSION_openssl-native ?= "0.9.7g"
PREFERRED_VERSION_openswan ?= "2.4.7"
-PREFERRED_VERSION_openttd ?= "0.4.0.1"
+PREFERRED_VERSION_openttd ?= "0.6.2"
PREFERRED_VERSION_openvpn ?= "2.0.9"
SRCREV_pn-opkg-native ?= "4640"
SRCREV_pn-opkg ?= "4640"
@@ -1775,7 +1775,6 @@ PREFERRED_VERSION_squid ?= "2.6.STABLE14"
PREFERRED_VERSION_sshfs-fuse ?= "1.8"
PREFERRED_VERSION_ssmtp ?= "2.61"
PREFERRED_VERSION_stagemanager-native ?= "0.0.1"
-PREFERRED_VERSION_starling ?= "0.2"
PREFERRED_VERSION_startup-monitor ?= "0.18-2"
PREFERRED_VERSION_startup-notification ?= "0.8"
PREFERRED_VERSION_stat ?= "3.3"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8958b764af..6add80f7b4 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -11,6 +11,7 @@
# you know what that means? like... a, b, c, d, e, f, g...
+SRCREV_pn-accelges ?= "206"
SRCREV_pn-aircrack-ng ?= "802"
SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
SRCREV_pn-assassin ?= "93"
@@ -79,7 +80,7 @@ SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "ca19d156400f817960efe0d14680324b2ea34171"
+SRCREV_pn-linux-openmoko ?= "968c41d0c32099d78927849a71e2ef3143cc05e7"
SRCREV_pn-linux-openmoko-devel ?= "e20ce2bd6fc6e711eed58a580ae117cb574abe96"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -93,7 +94,7 @@ SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27047"
+SRCREV_pn-mplayer ?= "27659"
SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-navit ?= "1096"
@@ -166,11 +167,14 @@ SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-remoko = "115"
+SRCREV_pn-remoko-server = "115"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-sjf2410-linux-native ?= "4268"
SRCREV_pn-sphyrna-python ?= "45"
+SRCREV_pn-starling ?= "9574"
SRCREV_pn-tichy ?= "168"
SRCREV_pn-tmut ?= "60"
SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"