From: Bruno Randolf <br1@subnet.at>
Date: Wed, 22 Dec 2004 13:40:51 +0000 (+0000)
Subject: Merge http://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15615
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19e74722f3b3631481e38033a111d6284cb793b4;p=openembedded.git

Merge oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/oe/openembedded

2004/12/22 14:40:19+01:00 (none)!br1
nylon: better image names

BKrev: 41c97963CwJwl09o746HOLNjwaETGg
---

diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 8f0461395f..6ba3af746e 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -35,6 +35,10 @@ PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
 PREFERRED_VERSION_usbutils = "0.11"
 
 # use meshcub.org mirrors
-CVS_TARBALL_STASH = "http://meshcube.org/nylon/unstable/sources/"
+CVS_TARBALL_STASH = "http://meshcube.org/nylon/${NYLON_RELEASE}/sources/"
 INHERIT += "nylon-mirrors"
 
+export FEED_URIS="nylon##http://meshcube.org/nylon/${NYLON_RELEASE}/feed"
+
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}"
+KERNEL_IMAGE_NAME = "kernel-${KV}-${MACHINE}_${BUILDNAME}"
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index 98b59b71bf..35930986e5 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -57,9 +57,9 @@ FILES_kernel += " /tmp"
 
 do_deploy() {
         install -d ${DEPLOY_DIR}/images
-	install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/kernel-${KV}-${MACHINE}-${DATETIME}.flash.bin
-        install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/kernel-${KV}-${MACHINE}-${DATETIME}.flash.srec
-	install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/kernel-${KV}-${MACHINE}-${DATETIME}.ram.srec
+	install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin
+        install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec
+	install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec
 }
 
 do_deploy[dirs] = "${S}"