diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2008-03-19 04:27:49 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2008-03-19 04:27:49 +0000 |
| commit | ebc0c581d446761ece1729a4b9b2c66359eb20dc (patch) | |
| tree | 27f604403ad94491fb31e383d46b3dc9d344fe15 /conf | |
| parent | 776b2b1a7bfdedb15ad376e28c098f76c9526f33 (diff) | |
| parent | c2af9efd62f1cf1dc2aafa39fdd68cfb8a14ac1e (diff) | |
merge of '173acf0910a1de8997f933a70422e802d5cea267'
and '26409b38a6c1f3c87a0e717bac4510cd2c57d12e'
Diffstat (limited to 'conf')
| -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" |