diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-03-21 23:54:15 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-03-21 23:54:15 +0000 |
| commit | 98cbb1de7c19b9822b091cd6f675950bdbb0ecea (patch) | |
| tree | ed146a214ac4292ee687dec6749a6f4113d29995 /conf/distro | |
| parent | 01009eb33cd0518969760724f08dd9b3400c748e (diff) | |
| parent | 507f5c47f31dc102d925959788af4ae8ddb5f6c9 (diff) | |
merge of '048900e1dc1296a50f90bf6b77b7be816922e4ac'
and '8f046513c054e5ae4400145d7f5e0288953f7fab'
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/angstrom-2008-preferred-versions.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a26c53173d..e326118a1a 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -3,5 +3,6 @@ PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.10" +PREFERRED_VERSION_pango = "1.18.3" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 21c1d3cf14..cb960d5168 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -57,7 +57,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1039" -SRCREV_pn-linux-openmoko ?= "4194-r4165" +SRCREV_pn-linux-openmoko ?= "4194" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index cd523f8482..b5d28f9024 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -80,3 +80,6 @@ INHERIT += "nslu2-mirrors" # - mwester 16 Dec 2006 # PREFERRED_VERSION_linux-libc-headers ?= "2.6.11.1" + +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc |