[oe-commits] org.oe.dev merge of '0d687ebf73328d86c69750e15499ae073b7b80f6'

[jeremy_laine commit]

merge of '0d687ebf73328d86c69750e15499ae073b7b80f6'
     and '105955293719b2a1414f1b03af410b8ff8dbdb1b'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: c897b9aae765097d608e7db4e7cd208c40f9ee74
ViewMTN: http://monotone.openembedded.org/revision/info/c897b9aae765097d608e7db4e7cd208c40f9ee74
Files:
1
conf/distro/angstrom-2007.1.conf
Diffs:

#
# mt diff -r0d687ebf73328d86c69750e15499ae073b7b80f6 -rc897b9aae765097d608e7db4e7cd208c40f9ee74
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [a59b4bdff5fea83e852628a968abbeb155999248]
#    to [781a9a9775be71ff7f91c9abe1fb7a8c7af4b061]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	a59b4bdff5fea83e852628a968abbeb155999248
+++ conf/distro/angstrom-2007.1.conf	781a9a9775be71ff7f91c9abe1fb7a8c7af4b061
@@ -237,7 +237,7 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
     angstrom-version \
-    ipkg ipkg-collateral angstrom-feed-configs \
+    ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \


#
# mt diff -r105955293719b2a1414f1b03af410b8ff8dbdb1b -rc897b9aae765097d608e7db4e7cd208c40f9ee74
#
# 
# no changes
#