diff options
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-eglibc.inc | 8 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-package-deb.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-package-ipk.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 3 |
5 files changed, 12 insertions, 8 deletions
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 91afb658e3..6726710aa9 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,8 +1,8 @@ # eglibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" -PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" -PREFERRED_PROVIDER_virtual/libc ?= "eglibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial" +PREFERRED_PROVIDER_virtual/libiconv = "eglibc" +PREFERRED_PROVIDER_virtual/libintl = "eglibc" +PREFERRED_PROVIDER_virtual/libc = "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc index c7a460d7d1..3dbb175f93 100644 --- a/conf/distro/include/angstrom-package-deb.inc +++ b/conf/distro/include/angstrom-package-deb.inc @@ -1 +1,4 @@ INHERIT += "package_deb" + +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-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index b3f4ff64d6..a33a4ad2b4 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -1 +1,5 @@ INHERIT += "package_ipk" + +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 diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 75d078e02f..e5db7a9ceb 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -40,9 +40,6 @@ SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" -# OpenMoko -SRCDATE_uboot-openmoko = "20070820" - # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" |