diff options
| author | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-08-31 23:36:45 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-08-31 23:36:45 +0000 |
| commit | 4c4356e00c9bf163e6417dfacee54de5afa06bf1 (patch) | |
| tree | 24f560342ce276526090d5ee09fd3ba5da480844 | |
| parent | 5f374d0cf71e702a1fc0d6d97fb796025d516395 (diff) | |
| parent | df630aef7c4558624511db5fb706cfba34407a20 (diff) | |
merge of '22b3c11cec3f962a441e5c6f686eebd66184dfa0'
and '3f5ee415e40f92763b72400da3741a3279871d69'
| -rw-r--r-- | conf/distro/include/angstrom-package-deb.inc | 4 | ||||
| -rw-r--r-- | 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 |