[oe-commits] org.oe.dev merge of '065abdf242661efc1f87ef660245679039448d20'

[jeremy_laine commit]

merge of '065abdf242661efc1f87ef660245679039448d20'
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'

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

#
# mt diff -r065abdf242661efc1f87ef660245679039448d20 -r34022eff29a839f8a6463586208fafbffd94e083
#
# 
# 
# patch "conf/sanity.conf"
#  from [9ad5f1d9953217df59e03a3c6727b8246f383334]
#    to [0ca4f223707a3e2792c4eb0b4ab4ada4461ee385]
# 
============================================================
--- conf/sanity.conf	9ad5f1d9953217df59e03a3c6727b8246f383334
+++ conf/sanity.conf	0ca4f223707a3e2792c4eb0b4ab4ada4461ee385
@@ -1,8 +1,8 @@
 # Sanity checks for common user misconfigurations
 #
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.8.8"
+BB_MIN_VERSION = "1.8.9"
 INHERIT += "sanity"
 


#
# mt diff -re94fdfc4cfd1145195d512ee0bbf48e1ecaa41be -r34022eff29a839f8a6463586208fafbffd94e083
#
# 
# 
# 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} \