summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf5
-rw-r--r--conf/distro/include/moko-autorev.inc3
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.3.inc2
-rw-r--r--conf/distro/include/sane-srcrevs.inc15
4 files changed, 16 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index cdf2970201..046c63ad54 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -8,7 +8,7 @@
# Use Xorg R7.3 release
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
# This is a testbed for unstable and/or untested things, while angstrom-2007.1
@@ -45,3 +45,6 @@ PREFERRED_VERSION_pango = "1.18.1"
# prefer newest for speed and fun
PREFERRED_VERSION_udev = "115"
+# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable
+PREFERRED_VERSION_busybox = "1.7.2"
+
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index c4d478ccde..0cba28de58 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -61,3 +61,6 @@ SRCREV_pn-openocd ?= "${AUTOREV}"
SRCREV_pn-openocd-native ?= "${AUTOREV}"
SRCREV_pn-uboot-openmoko ?= "${AUTOREV}"
+SRCREV_pn-dfu-util ?= "${AUTOREV}"
+SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
+
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
index 19ee48174d..d7e19284bc 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc
@@ -71,7 +71,7 @@ PREFERRED_VERSION_xcursorgen ?= "1.0.2"
PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
PREFERRED_VERSION_xditview ?= "1.0.1"
PREFERRED_VERSION_xdm ?= "1.1.6"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.1"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
PREFERRED_VERSION_xdriinfo ?= "1.0.2"
PREFERRED_VERSION_xedit ?= "1.0.2"
PREFERRED_VERSION_xev ?= "1.0.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 008881ed99..f46177620e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -20,9 +20,9 @@ SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-hildon-1 ?= "14173"
SRCREV_pn-libgsmd ?= "3074"
SRCREV_pn-libmokogsmd2 ?= "2950"
-SRCREV_pn-libmokojournal2 ?= "2780"
+SRCREV_pn-libmokojournal2 ?= "3118"
SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "3064"
+SRCREV_pn-libmokoui2 ?= "3111"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -30,10 +30,10 @@ SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "108"
SRCREV_pn-matchbox-desktop-2 ?= "1649"
-SRCREV_pn-matchbox-keyboard ?= "1675"
-SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
+SRCREV_pn-matchbox-keyboard ?= "1739"
+SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3069"
+SRCREV_pn-moko-gtk-engine ?= "3146"
SRCREV_pn-neod ?= "2956"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
@@ -48,11 +48,11 @@ SRCREV_pn-openmoko-calculator2 ?= "2789"
SRCREV_pn-openmoko-common ?= "397"
SRCREV_pn-openmoko-common2 ?= "2679"
SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "350"
+SRCREV_pn-openmoko-contacts2 ?= "358"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "617"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3073"
+SRCREV_pn-openmoko-dialer2 ?= "3141"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "2873"
@@ -100,4 +100,5 @@ SRCREV_pn-xoo ?= "1623"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-networkmanager ?= "2887"
SRCREV_pn-networkmanager-applet ?= "200"
+SRCREV_pn-libw100 ?= "47"