summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-11-30 14:14:53 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-11-30 14:14:53 +0000
commit89ba1da42a5b7effe8653782eb7f8abfb9222dcd (patch)
treee4891c48e491928598492b1b35deb4748f104ea0 /classes
parent37b5214d02ac06525ec6a9fa817ec8862d16eeb2 (diff)
parent22d8e49c3956522d7dba6e885c7ca04f06aea97c (diff)
merge of '3948c8054b50f67afee06a66abbab4a35915d297'
and 'cefef520b1840df3899cd9fc5a4fc3cb9faa38ce'
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass7
-rw-r--r--classes/nslu2-image.bbclass38
2 files changed, 25 insertions, 20 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 06a49814d2..1794382699 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -508,6 +508,13 @@ base_do_fetchall() {
:
}
+addtask buildall after do_build
+do_buildall[recrdeptask] = "do_build"
+base_do_buildall() {
+ :
+}
+
+
def oe_unpack_file(file, data, url = None):
import bb, os
if not url:
diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass
index edd23ae07f..33caa54b21 100644
--- a/classes/nslu2-image.bbclass
+++ b/classes/nslu2-image.bbclass
@@ -1,25 +1,23 @@
nslu2_pack_image () {
- install -d ${DEPLOY_DIR_IMAGE}/slug
- install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
- ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
- ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
- ${STAGING_LOADER_DIR}/apex-nslu2.bin \
- ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \
- ${DEPLOY_DIR_IMAGE}/slug/
- install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-ixp4xx${SITEINFO_ENDIANESS} \
- ${DEPLOY_DIR_IMAGE}/slug/vmlinuz
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
- ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
- install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/
- cd ${DEPLOY_DIR_IMAGE}/slug
- slugimage -p -b RedBoot -s SysConf -k vmlinuz -L apex-nslu2.bin \
- -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+ slugimage -p \
+ -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
+ -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+ -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \
+ -L ${STAGING_LOADER_DIR}/apex-nslu2.bin \
+ -r Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -m ${STAGING_FIRMWARE_DIR}/NPE-B \
+ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
- slugimage -F -p -b RedBoot -s SysConf -k vmlinuz -L apex-nslu2-16mb.bin \
- -r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+ slugimage -F -p \
+ -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
+ -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+ -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \
+ -L ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \
+ -r Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+ -m ${STAGING_FIRMWARE_DIR}/NPE-B \
+ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
- rm -rf ${DEPLOY_DIR_IMAGE}/slug
}
-EXTRA_IMAGEDEPENDS_nslu2 += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
-IMAGE_POSTPROCESS_COMMAND_nslu2 += "nslu2_pack_image; "
+EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb'
+IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; "