From df630aef7c4558624511db5fb706cfba34407a20 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 31 Aug 2007 18:16:21 +0000 Subject: angstrom: more .deb integration --- conf/distro/include/angstrom-package-deb.inc | 4 ++-- conf/distro/include/angstrom.inc | 2 +- 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 -- cgit v1.2.3