[oe-commits] org.oe.dev merge of '22b3c11cec3f962a441e5c6f686eebd66184dfa0'

[openmoko commit]

merge of '22b3c11cec3f962a441e5c6f686eebd66184dfa0'
     and '3f5ee415e40f92763b72400da3741a3279871d69'

Author: openmoko at openembedded.org
Branch: org.openembedded.dev
Revision: cc5f9c504c8d6937a010f74dd3804541e62b0fc2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cc5f9c504c8d6937a010f74dd3804541e62b0fc2
Files:
1
conf/distro/include/angstrom-package-deb.inc
conf/distro/include/angstrom.inc
packages/vte/vte_0.11.15.bb
packages/vte/vte_0.16.8.bb
Diffs:

#
# mt diff -r22b3c11cec3f962a441e5c6f686eebd66184dfa0 -rcc5f9c504c8d6937a010f74dd3804541e62b0fc2
#
# 
# 
# patch "conf/distro/include/angstrom-package-deb.inc"
#  from [be11d0b7af5f39c3d0c5c078b8cc3e094902401f]
#    to [17375dd9a7e8dd930e8f609ff5147e6319af9b18]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [bc404e4b107f132331ca124ae5f643298bdf3840]
#    to [b77bf1ae8065f62d290b081224c4460ffb79335e]
# 
============================================================
--- conf/distro/include/angstrom-package-deb.inc	be11d0b7af5f39c3d0c5c078b8cc3e094902401f
+++ conf/distro/include/angstrom-package-deb.inc	17375dd9a7e8dd930e8f609ff5147e6319af9b18
@@ -1,4 +1,4 @@ INHERIT += "package_deb"
 INHERIT += "package_deb"
 
+PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-dpkg-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-dpkg"
============================================================
--- conf/distro/include/angstrom.inc	bc404e4b107f132331ca124ae5f643298bdf3840
+++ conf/distro/include/angstrom.inc	b77bf1ae8065f62d290b081224c4460ffb79335e
@@ -204,7 +204,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oa
 
 
 #Name the generated images in a sane way
-IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${DISTRO_VERSION}-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${ANGSTROM_MODE}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 


#
# mt diff -r3f5ee415e40f92763b72400da3741a3279871d69 -rcc5f9c504c8d6937a010f74dd3804541e62b0fc2
#
# 
# 
# rename "packages/vte/vte_0.11.15.bb"
#     to "packages/vte/vte_0.16.8.bb"
#