diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-19 06:45:42 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-19 06:45:42 +0000 |
| commit | cc7571c8daffa499295e62c7a5c42c0e32f926ad (patch) | |
| tree | f8be261f4c78917a9f059e8309cdb75ab58b6a56 /conf/distro | |
| parent | 42fcd2ba5af8d6ebf10fc8a3d57a6fac30dc6a57 (diff) | |
| parent | ebc0c581d446761ece1729a4b9b2c66359eb20dc (diff) | |
merge of '3562d52be2dd03372ae3c01837858e920fe1b216'
and 'd791da1ae7aaac6a51195013e3c686e0c5172ad3'
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 921d12ec79..7d69484e91 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -210,7 +210,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - opkg-ipkg-compat ${ANGSTROM_FEED_CONFIGS} \ + opkg opkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${DEBUG_APPS} \ " diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d998928cd0..940c70a94e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -136,8 +136,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" -SRCREV_pn-opkg ?= "4142" -SRCREV_pn-opkg-native ?= "4142" +SRCREV_pn-opkg ?= "4209" +SRCREV_pn-opkg-native ?= "4209" +SRCREV_pn-opkg-sdk ?= "4209" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-pylgrim ?= "20" |