[oe-commits] Martin Dietze : nylon classes: update image type and mirror locations

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7ef692efa306973b2a204cfc227d872cd1bee69c
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7ef692efa306973b2a204cfc227d872cd1bee69c

Author: Martin Dietze <di at fh-wedel.de>
Date:   Tue May 19 15:53:54 2009 +0200

nylon classes: update image type and mirror locations

---

 classes/nylon-image.bbclass   |    3 +--
 classes/nylon-mirrors.bbclass |    8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass
index 6d867ea..e973bf7 100644
--- a/classes/nylon-image.bbclass
+++ b/classes/nylon-image.bbclass
@@ -9,11 +9,10 @@ nylon_create_imgz() {
 	
         # copy the kernel (for mips on flash) into tmp  
         FLASH_BIN=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin  
-        test -f ${FLASH_BIN} && \ 
         cp ${FLASH_BIN} ${DEPLOY_DIR_IMAGE}/tmp/zImage.flash 
  
         # copy rootfs.jffs (or so) into tmp 
-	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/tmp/rootfs.${type}
+	cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${DEPLOY_DIR_IMAGE}/tmp/rootfs.jffs2
 
 	# make an imgz out of tmp
 	( cd ${DEPLOY_DIR_IMAGE}/tmp; tar cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.imgz * )
diff --git a/classes/nylon-mirrors.bbclass b/classes/nylon-mirrors.bbclass
index 02fddc0..11cc45c 100644
--- a/classes/nylon-mirrors.bbclass
+++ b/classes/nylon-mirrors.bbclass
@@ -1,6 +1,6 @@
 MIRRORS_append () {
-ftp://.*/.*	http://meshcube.org/nylon/stable/sources/
-https?://.*/.*	http://meshcube.org/nylon/stable/sources/
-ftp://.*/.*	http://meshcube.org/nylon/unstable/sources/
-https?://.*/.*	http://meshcube.org/nylon/unstable/sources/
+ftp://.*/.*/	http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/
+http://.*/.*/	http://download.berlin.freifunk.net/meshcube.org/nylon/stable/sources/
+ftp://.*/.*/	http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/
+http://.*/.*/	http://download.berlin.freifunk.net/meshcube.org/nylon/unstable/sources/
 }
\ No newline at end of file