[oe-commits] org.oe.dev merge of '4f12086dd4becc0837a2479c289abb8ce97cc931'

[pfalcon commit]

merge of '4f12086dd4becc0837a2479c289abb8ce97cc931'
     and '8c69b6f5a69bd9c930b72d9ba3949a8f629a5721'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 84ca9f2e827e4279aedbe892643f7a992b5c68c0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=84ca9f2e827e4279aedbe892643f7a992b5c68c0
Files:
1
conf/distro/include/angstrom.inc
packages/qte/qte-mt-static_2.3.10.bb
Diffs:

#
# mt diff -r4f12086dd4becc0837a2479c289abb8ce97cc931 -r84ca9f2e827e4279aedbe892643f7a992b5c68c0
#
# 
# 
# patch "conf/distro/include/angstrom.inc"
#  from [314e54232030fd4279f9794dc77445d68a4fa3ba]
#    to [a2a82e18304dfe7b293702a9f4e750a8b9793d6a]
# 
============================================================
--- conf/distro/include/angstrom.inc	314e54232030fd4279f9794dc77445d68a4fa3ba
+++ conf/distro/include/angstrom.inc	a2a82e18304dfe7b293702a9f4e750a8b9793d6a
@@ -16,6 +16,11 @@ ANGSTROM_URI ?= "http://www.angstrom-dis
 #Use this variable in feeds and other parts that need a URI
 ANGSTROM_URI ?= "http://www.angstrom-distribution.org"
 
+#Use this variable to select which recipe you want to use to get feed configs (/etc/ipkg/*, /etc/apt/sources.list)
+# usefull for derivative distros and local testing
+# As this is runtime we can't and won't use virtual/feed-configs
+ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs"
+
 #Set the default maintainer to angstrom-dev
 MAINTAINER = "Angstrom Developers <angstrom-distro-devel at linuxtogo.org>"
 


#
# mt diff -r8c69b6f5a69bd9c930b72d9ba3949a8f629a5721 -r84ca9f2e827e4279aedbe892643f7a992b5c68c0
#
# 
# 
# patch "packages/qte/qte-mt-static_2.3.10.bb"
#  from [cba36c3850ac2b08dab6647b33bf4f0538bf1ba5]
#    to [0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5]
# 
============================================================
--- packages/qte/qte-mt-static_2.3.10.bb	cba36c3850ac2b08dab6647b33bf4f0538bf1ba5
+++ packages/qte/qte-mt-static_2.3.10.bb	0e4fb9a326b0c9f986910827e9c39d1d1cddf0b5
@@ -1,6 +1,8 @@ PR = "r8"
 require qte-common_${PV}.inc
 PR = "r8"
 
+DEFAULT_PREFERENCE = "-1"
+
 EXTRA_OECONF += "-static -thread"
 
 do_stage() {