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 <josh@linux.intel.com>
This commit is contained in:
parent
29ca893649
commit
369920107e
|
@ -5,7 +5,7 @@ LICENSE = "GPL"
|
|||
KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
|
||||
KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3-2"
|
||||
|
||||
inherit kernel
|
||||
inherit kernel deploy
|
||||
|
||||
RPROVIDES_kernel-image = "hostap-modules"
|
||||
|
||||
|
@ -34,13 +34,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
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
require dfu-util_${PV}.bb
|
||||
|
||||
inherit native
|
||||
inherit native deploy
|
||||
|
||||
DEPENDS = "libusb-native usbpath-native"
|
||||
|
||||
do_deploy() {
|
||||
install -d ${DEPLOY_DIR_IMAGE}
|
||||
install -m 0755 src/dfu-util_static ${DEPLOY_DIR_IMAGE}/dfu-util
|
||||
install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util
|
||||
}
|
||||
|
||||
addtask deploy before do_package after do_install
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
DEPLOYDIR = "${WORKDIR}/deploy-${PN}"
|
||||
SSTATETASKS += "do_deploy"
|
||||
do_deploy[sstate-name] = "deploy-${PN}"
|
||||
do_deploy[sstate-inputdirs] = "${DEPLOYDIR}"
|
||||
do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
|
||||
|
||||
python do_deploy_setscene () {
|
||||
sstate_setscene(d)
|
||||
}
|
||||
addtask do_deploy_setscene
|
||||
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
|
|
@ -16,7 +16,7 @@ python __anonymous () {
|
|||
bb.data.setVar("DEPENDS", depends, d)
|
||||
}
|
||||
|
||||
inherit kernel-arch
|
||||
inherit kernel-arch deploy
|
||||
|
||||
PACKAGES_DYNAMIC += "kernel-module-*"
|
||||
PACKAGES_DYNAMIC += "kernel-image-*"
|
||||
|
@ -475,34 +475,29 @@ KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME
|
|||
KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
|
||||
|
||||
do_deploy() {
|
||||
install -d ${DEPLOY_DIR_IMAGE}
|
||||
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
|
||||
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
|
||||
install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
|
||||
if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
|
||||
tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
|
||||
tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
|
||||
fi
|
||||
|
||||
if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
|
||||
if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
|
||||
${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
|
||||
uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
|
||||
uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
|
||||
rm -f linux.bin
|
||||
else
|
||||
${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
|
||||
rm -f linux.bin.gz
|
||||
gzip -9 linux.bin
|
||||
uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
|
||||
uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
|
||||
rm -f linux.bin.gz
|
||||
fi
|
||||
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
|
||||
fi
|
||||
|
||||
cd ${DEPLOY_DIR_IMAGE}
|
||||
cd ${DEPLOYDIR}
|
||||
rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
|
||||
ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
|
||||
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
|
||||
}
|
||||
|
||||
do_deploy[dirs] = "${B}"
|
||||
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
|
||||
|
||||
addtask deploy before do_package after do_install
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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() {
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
|
|
Loading…
Reference in New Issue