summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-autobuild8
-rwxr-xr-xscripts/poky-autobuild-postprocess39
2 files changed, 28 insertions, 19 deletions
diff --git a/scripts/poky-autobuild b/scripts/poky-autobuild
index 7e027ba9f..586a57eb5 100755
--- a/scripts/poky-autobuild
+++ b/scripts/poky-autobuild
@@ -31,10 +31,11 @@ if [ "xpreamble" = "x$1" ]; then
exit 0
fi
+POSTPROCESS=`which poky-autobuild-postprocess`
+
if [ "xcomplete" = "x$1" ]; then
touch ./build/tmp/deploy/images/images-complete
chmod a+w ./build/tmp/deploy/images/images-complete
- POSTPROCESS=`which poky-autobuild-postprocess`
if [ "x$POSTPROCESS" != "x" ]; then
$POSTPROCESS `pwd`
fi
@@ -59,3 +60,8 @@ shift
. ./scripts/poky-env-internal
bitbake $BBTARGET
+
+if [ "x$POSTPROCESS" != "x" ]; then
+ $POSTPROCESS `pwd`
+fi
+
diff --git a/scripts/poky-autobuild-postprocess b/scripts/poky-autobuild-postprocess
index 84ae25818..f46ce6ac1 100755
--- a/scripts/poky-autobuild-postprocess
+++ b/scripts/poky-autobuild-postprocess
@@ -30,7 +30,7 @@ FILES=()
if [ "x$DISTRO" = "xpoky-bleeding" ]; then
COMPRESS_FILES=(
- poky-image-sato-qemuarm-*.rootfs.ext2
+ images/poky-image-sato-qemuarm-*.rootfs.ext2
)
FILES=(
@@ -40,7 +40,6 @@ if [ "x$DISTRO" = "xpoky-bleeding" ]; then
images/updater.sh.akita
images/poky-image-sato-akita-*.rootfs.summary.jffs2
images/poky-image-sato-qemuarm-*.rootfs.tar.bz2
- images/poky-image-sato-qemuarm-*.rootfs.ext2
)
fi
@@ -53,11 +52,11 @@ fi
if [ "x$DISTRO" = "xpoky" ]; then
COMPRESS_FILES=(
- poky-image-sdk-qemuarm-*.rootfs.ext2
- poky-image-sdk-qemux86-*.rootfs.ext2
- poky-image-minimal-qemuarm-*.rootfs.ext2
- poky-image-minimal-qemux86-*.rootfs.ext2
- poky-image-sato-cd-*.iso
+ images/poky-image-sdk-qemuarm-*.rootfs.ext2
+ images/poky-image-sdk-qemux86-*.rootfs.ext2
+ images/poky-image-minimal-qemuarm-*.rootfs.ext2
+ images/poky-image-minimal-qemux86-*.rootfs.ext2
+ images/poky-image-sato-cd-*.iso
)
FILES=(
@@ -87,12 +86,8 @@ if [ "x$DISTRO" = "xpoky" ]; then
images/poky-image-sato-spitz-*.rootfs.tar.gz
images/poky-image-sdk-qemuarm-*.rootfs.tar.bz2
images/poky-image-sdk-qemux86-*.rootfs.tar.bz2
- images/poky-image-sdk-qemuarm-*.rootfs.ext2
- images/poky-image-sdk-qemux86-*.rootfs.ext2
images/poky-image-minimal-qemuarm-*.rootfs.tar.bz2
images/poky-image-minimal-qemux86-*.rootfs.tar.bz2
- images/poky-image-minimal-qemuarm-*.rootfs.ext2
- images/poky-image-minimal-qemux86-*.rootfs.ext2
images/poky-image-sdk-spitz-*.rootfs.tar.gz
images/poky-image-sdk-nokia800-*.rootfs.jffs2
images/poky-image-sato-nokia770-*.rootfs.jffs2
@@ -102,7 +97,6 @@ if [ "x$DISTRO" = "xpoky" ]; then
images/poky-image-sato-mx31litekit-*.rootfs.tar.gz
images/poky-image-sato-htcuniversal-*.rootfs.tar.gz
images/poky-image-sato-fic-gta01-*.rootfs.jffs2
- images/poky-image-sato-cd-*.iso
images/poky-image-sato-mx31phy-*.jffs2
images/poky-image-sato-mx31ads-*.jffs2
`readlink -f images/updater-em-x270.ext2`
@@ -110,15 +104,24 @@ if [ "x$DISTRO" = "xpoky" ]; then
fi
for FILE in ${FILES[@]}; do
- #echo "-i $KEY $FILE $DEST"
- cp $FILE $DEST
+ for $FILE2 in `find -name $FILE`; do
+ if [ ! -e "$DEST/$FILE2" ]; then
+ cp $FILE2 $DEST
+ fi
+ done
done
for FILE in ${COMPRESS_FILES[@]}; do
- bzip2 $DEST/$FILE
+ for $FILE2 in `find -name $FILE`; do
+ if [ ! -e "$DEST/$FILE2.bz2" ]; then
+ bzip2 $FILE2
+ cp $FILE2.bz2 $DEST
+ fi
+ done
done
-touch $DEST/complete
-
-#chgrp -R backup $DEST
+if [ -e ./images-complete ]; then
+ touch $DEST/complete
+fi
chmod a+w -R $DEST
+