From 369920107edd8ae2487d71a324072fcfaba0731e Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 5 Aug 2010 13:25:20 +0000 Subject: deploy.bbclass: use new style staging for deploy tasks All tasks which implement a do_deploy should inherit this class to have the changes in the deploy task staged. Update recipes which include a do_deploy function to inherit this class and to use DEPLOYDIR rather than DEPLOY_DIR_IMAGE. Signed-off-by: Joshua Lock --- meta/packages/linux/linux-mx31.inc | 11 ++++------- meta/packages/linux/linux-omap.inc | 11 ++++------- meta/packages/linux/linux-simtec.inc | 11 +++++------ meta/packages/linux/linux-zylonite.inc | 13 +++++-------- meta/packages/uboot/u-boot.inc | 10 ++++------ meta/packages/x-load/x-load.inc | 14 +++++--------- meta/packages/zaurus-updater/zaurus-updater.bb | 7 ++++--- 7 files changed, 31 insertions(+), 46 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/linux/linux-mx31.inc b/meta/packages/linux/linux-mx31.inc index 0f83ac7a4..520229cf7 100644 --- a/meta/packages/linux/linux-mx31.inc +++ b/meta/packages/linux/linux-mx31.inc @@ -4,7 +4,7 @@ LICENSE = "GPL" KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" -inherit kernel +inherit kernel deploy COMPATIBLE_MACHINE = "mx31litekit|mx31ads|mx31phy" @@ -29,13 +29,10 @@ do_configure_prepend() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - cd ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + cd ${DEPLOYDIR} ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib + tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } -do_deploy[dirs] = "${S}" - addtask deploy before do_populate_sysroot after do_install diff --git a/meta/packages/linux/linux-omap.inc b/meta/packages/linux/linux-omap.inc index 6668deb15..e164bad59 100644 --- a/meta/packages/linux/linux-omap.inc +++ b/meta/packages/linux/linux-omap.inc @@ -4,7 +4,7 @@ LICENSE = "GPL" KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" -inherit kernel +inherit kernel deploy COMPATIBLE_MACHINE = "omap-zoom" @@ -29,14 +29,11 @@ do_configure_prepend() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - cd ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + cd ${DEPLOYDIR} ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib + tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } -do_deploy[dirs] = "${S}" - addtask deploy before do_populate_sysroot after do_install diff --git a/meta/packages/linux/linux-simtec.inc b/meta/packages/linux/linux-simtec.inc index b9a65cc26..2b7a5cc07 100644 --- a/meta/packages/linux/linux-simtec.inc +++ b/meta/packages/linux/linux-simtec.inc @@ -1,5 +1,7 @@ require linux.inc +inherit deploy + do_prepdefconfig() { cp ${S}/arch/arm/configs/s3c24xx_simtec_defconfig ${WORKDIR}/defconfig if test -e ${WORKDIR}/${MACHINE}-defconfig-append; then @@ -10,13 +12,10 @@ do_prepdefconfig() { addtask prepdefconfig before do_configure after do_patch do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - cd ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + cd ${DEPLOYDIR} ln -sf ${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${KERNEL_IMAGETYPE}-${MACHINE}.bin - tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib + tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } -do_deploy[dirs] = "${S}" - addtask deploy before do_populate_sysroot after do_install diff --git a/meta/packages/linux/linux-zylonite.inc b/meta/packages/linux/linux-zylonite.inc index 81e80622b..5cf23bf6d 100644 --- a/meta/packages/linux/linux-zylonite.inc +++ b/meta/packages/linux/linux-zylonite.inc @@ -5,7 +5,7 @@ LICENSE = "GPL" KERNEL_IMAGETYPE = "zImage" KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}" -inherit kernel +inherit kernel deploy RPROVIDES_kernel-image = "hostap-modules" @@ -33,13 +33,10 @@ do_configure_prepend() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin - rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin - ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin - #tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + rm -f ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + ln -s ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOYDIR}/${KERNEL_IMAGETYPE}-${MACHINE}.bin + #tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } -do_deploy[dirs] = "${S}" - addtask deploy before do_build after do_install diff --git a/meta/packages/uboot/u-boot.inc b/meta/packages/uboot/u-boot.inc index 3e926a4ea..889f6215e 100644 --- a/meta/packages/uboot/u-boot.inc +++ b/meta/packages/uboot/u-boot.inc @@ -5,6 +5,8 @@ PRIORITY = "optional" LICENSE = "GPL" PROVIDES = "virtual/bootloader" +inherit deploy + PARALLEL_MAKE="" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" @@ -22,16 +24,12 @@ do_compile () { } do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} + install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE} - cd ${DEPLOY_DIR_IMAGE} + cd ${DEPLOYDIR} rm -f ${UBOOT_SYMLINK} ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK} } -do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile do_install() { diff --git a/meta/packages/x-load/x-load.inc b/meta/packages/x-load/x-load.inc index 01db413b1..7073b13fe 100644 --- a/meta/packages/x-load/x-load.inc +++ b/meta/packages/x-load/x-load.inc @@ -3,6 +3,8 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" +inherit deploy + DEPENDS = "signgp-native" PARALLEL_MAKE="" @@ -27,20 +29,14 @@ do_compile () { do_deploy () { signGP ${S}/x-load.bin - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} - install ${S}/x-load.bin.ift ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_IMAGE} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_IMAGE} + install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE} + install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE} - cd ${DEPLOY_DIR_IMAGE} + cd ${DEPLOYDIR} rm -f ${XLOAD_SYMLINK} ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK} rm -f ${MLO_SYMLINK} ln -sf ${MLO_IMAGE} ${MLO_SYMLINK} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${XLOAD_SYMLINK} - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${MLO_SYMLINK} } -do_deploy[dirs] = "${S}" addtask deploy before do_build after do_compile diff --git a/meta/packages/zaurus-updater/zaurus-updater.bb b/meta/packages/zaurus-updater/zaurus-updater.bb index 4ab6fc43c..a621761d6 100644 --- a/meta/packages/zaurus-updater/zaurus-updater.bb +++ b/meta/packages/zaurus-updater/zaurus-updater.bb @@ -11,6 +11,8 @@ SRC_URI = "file://updater.sh \ file://gnu-tar.gz" S = "${WORKDIR}" +inherit deploy + do_configure() { sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh" } @@ -20,12 +22,11 @@ do_compile() { } do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 updater.sh ${DEPLOY_DIR_IMAGE}/updater.sh.${MACHINE} + install -m 0755 updater.sh ${DEPLOYDIR}/updater.sh.${MACHINE} case ${MACHINE} in spitz ) - install -m 0755 gnu-tar ${DEPLOY_DIR_IMAGE}/gnu-tar + install -m 0755 gnu-tar ${DEPLOYDIR}/gnu-tar ;; *) ;; -- cgit v1.2.3