diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-09-10 13:51:43 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-09-10 13:51:43 +0000 |
| commit | 81ffc8a27d12a2b657b579ff382fe1baa1f3b1f9 (patch) | |
| tree | d26c40287ed706a2e352450bd81c9d21b78c7b65 /conf | |
| parent | 03129ae071e7655514116ed870cccaae447ced19 (diff) | |
| parent | d7c51596650337b0f51c7a4ac2f6fae52bd01832 (diff) | |
merge of '89471c36d99620329016cb8c96d0637bd9403764'
and 'c74c9fb96051659da0f06ac95ab8f2656055d2a9'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 3f2c521224..a42e555c48 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1380,8 +1380,8 @@ PREFERRED_VERSION_openssl-native ?= "0.9.7g" PREFERRED_VERSION_openswan ?= "2.4.7" PREFERRED_VERSION_openttd ?= "0.4.0.1" PREFERRED_VERSION_openvpn ?= "2.0.9" -SRCREV_pn-opkg-native ?= "4488" -SRCREV_pn-opkg ?= "4488" +SRCREV_pn-opkg-native ?= "4640" +SRCREV_pn-opkg ?= "4640" PREFERRED_VERSION_oplinux-packages ?= "1.0" PREFERRED_VERSION_oprofile ?= "0.9.3" PREFERRED_VERSION_orage ?= "4.4.1" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 64753f5319..6428bfb0c0 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -146,9 +146,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4430" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "4564" -SRCREV_pn-opkg-native ?= "4564" -SRCREV_pn-opkg-sdk ?= "4564" +SRCREV_pn-opkg ?= "4640" +SRCREV_pn-opkg-native ?= "4640" +SRCREV_pn-opkg-sdk ?= "4640" SRCREV_pn-opkg-utils ?= "4534" SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" |