nylon classes: update image type and mirror locations

diff --git a/classes/nylon-image.bbclass b/classes/nylon-image.bbclass
index 6d867eab48f35377ed452c59e7287b2a513aa357..e973bf7cf56ddad7d64ecf64683cd0ffbcdf5ab6 100644 (file)
--- 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 02fddc01ba2dddd0a3468233042eebac48967c04..11cc45ca0c9bd5d1e4e50982b7c357ab6dc32f09 100644 (file)
--- 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