diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-20 12:47:59 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-20 12:47:59 +0400 |
| commit | 1f145b6b4187fbb451dde8c1a1e8c81bb691a672 (patch) | |
| tree | 08a7f737f4a360448c693908d89bf750e3a7d5e2 /classes | |
| parent | bfec41f79e1177aa047eb46e376752cee969287a (diff) | |
| parent | cb70efeb71b3a1e5e8786d3488e4ec3a1580d45a (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/nylon-image.bbclass | 3 | ||||
| -rw-r--r-- | 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 6d867eab48..e973bf7cf5 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 02fddc01ba..11cc45ca0c 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 |