summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-08-31 18:16:21 +0000
committerKoen Kooi <koen@openembedded.org>2007-08-31 18:16:21 +0000
commitdf630aef7c4558624511db5fb706cfba34407a20 (patch)
tree2bbe1460cfdc08b1697e820c2d3d48305dd1287c /conf
parente9bfebcf82900e8a091d97808709f5b3bcb15359 (diff)
angstrom: more .deb integration
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/angstrom-package-deb.inc4
-rw-r--r--conf/distro/include/angstrom.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
index 42223dc963..3dbb175f93 100644
--- a/conf/distro/include/angstrom-package-deb.inc
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -1,4 +1,4 @@
INHERIT += "package_deb"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-dpkg-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-dpkg"
+PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 7d364a5ee0..708159f4cb 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -204,7 +204,7 @@ PACKAGE_EXTRA_ARCHS_htcwallaby = "arm-oabi"
#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