diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/poky-autobuild-moblin | 24 | ||||
| -rwxr-xr-x | scripts/poky-autobuild-postprocess-moblin | 38 |
2 files changed, 47 insertions, 15 deletions
diff --git a/scripts/poky-autobuild-moblin b/scripts/poky-autobuild-moblin index 866206309..90ee931eb 100755 --- a/scripts/poky-autobuild-moblin +++ b/scripts/poky-autobuild-moblin @@ -21,15 +21,19 @@ SRVWORKDIR=/home/rpurdie TARGETDIR=$SRVWORKDIR/httpd/autobuild-output CURRDIR=`pwd` -if [ "$CURRDIR" = "$SRVWORKDIR/poky/full-shihtzu/build" ]; then +if [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/full-shihtzu/build" ]; then ABTARGET="poky" -elif [ "$CURRDIR" = "$SRVWORKDIR/poky/full-bleeding-shihtzu/build" ]; then +elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/full-bleeding-shihtzu/build" ]; then ABTARGET="poky-bleeding" -elif [ "$CURRDIR" = "$SRVWORKDIR/poky/toolchain-shihtzu/build" ]; then +elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/toolchain-shihtzu/build" ]; then ABTARGET="toolchain" -elif [ "$CURRDIR" = "$SRVWORKDIR/pokky/incremental-shihtzu/build" ]; then +elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/incremental-shihtzu/build" ]; then ABTARGET="incremental" -elif [ "$CURRDIR" = "$SRVWORKDIR/poky/full-darwin-shihtzu/build" ]; then +elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/moblin-incremental/build" ]; then + ABTARGET="moblin-incremental" +elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/moblin-full/build" ]; then + ABTARGET="moblin-full" +elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/full-darwin-shihtzu/build" ]; then ABTARGET="darwin" if [ ! -d "$CURRDIR/meta-darwin" ]; then svn co http://svn.o-hand.com/repos/poky/branches/experimental/meta-darwin $CURRDIR/meta-darwin @@ -43,7 +47,7 @@ fi if [ "xpreamble" = "x$1" ]; then mkdir -p ./build/tmp/deploy/images rm -f ./build/tmp/deploy/images/images-complete - #svn info > ./build/tmp/deploy/images/svninfo + git log -1 > ./build/tmp/deploy/images/svninfo exit 0 fi @@ -95,9 +99,9 @@ bitbake $@ retval=$? -if [ "x$POSTPROCESS" != "x" ]; then - cd .. - $POSTPROCESS $ABTARGET $TARGETDIR -fi +#if [ "x$POSTPROCESS" != "x" ]; then +# cd .. +# $POSTPROCESS $ABTARGET $TARGETDIR +#fi exit $retval diff --git a/scripts/poky-autobuild-postprocess-moblin b/scripts/poky-autobuild-postprocess-moblin index cbe5203fb..2de7f537d 100755 --- a/scripts/poky-autobuild-postprocess-moblin +++ b/scripts/poky-autobuild-postprocess-moblin @@ -23,9 +23,16 @@ TARGETDIR=$2 cd ./build/tmp/deploy/ -LASTREV=`tail images/svninfo | grep Revision | cut -f 2 -d ' '` -DEST=$TARGETDIR/$ABTARGET/$LASTREV/ +DEST=$TARGETDIR/$ABTARGET/ +BASE=`date +%Y%m%d` +REV=1 +while [ -d "$DEST$FOO$BASE-$REV" ] +do + REV=`expr $REV + 1` +done + +DEST="$DEST$FOO$BASE-$REV" mkdir -p $DEST COMPRESS_FILES=() @@ -37,7 +44,7 @@ if [ "x$ABTARGET" = "xpoky-bleeding" ]; then ) FILES=( - svninfo + gitinfo `readlink images/zImage-akita.bin` `readlink images/zImage-qemuarm.bin` updater.sh.akita @@ -48,7 +55,7 @@ fi if [ "x$ABTARGET" = "xtoolchain" ]; then FILES=( - svninfo + gitinfo poky-*-toolchain-*.tar.bz2 ) fi @@ -63,7 +70,7 @@ if [ "x$ABTARGET" = "xpoky" ]; then ) FILES=( - svninfo + gitinfo `readlink images/zImage-akita.bin` `readlink images/zImage-c7x0.bin` `readlink images/zImage-qemuarm.bin` @@ -111,6 +118,27 @@ if [ "x$ABTARGET" = "xpoky" ]; then ) fi +if [ "x$ABTARGET" = "xmoblin-incremental" -o "x$ABTARGET" = "xmoblin-full" ]; then + COMPRESS_FILES=( + moblin-image-live-netbook-*.hddimg + moblin-image-live-netbook-*.iso + moblin-image-netbook-netbook-*.ext3 + moblin-image-sdk-live-netbook-*.hddimg + moblin-image-sdk-live-netbook-*.iso + moblin-image-sdk-netbook-*.ext3 + ) + + FILES=( + gitinfo + `readlink images/bImage-netbook.bin` + moblin-image-netbook-netbook-*.cpio.gz + moblin-image-netbook-netbook-*.jffs2 + moblin-image-sdk-netbook-*.cpio.gz + moblin-image-sdk-netbook-*.jffs2 + ) +fi + + for FILE in ${FILES[@]}; do for FILE2 in `find -name $FILE`; do if [ ! -e "$DEST/$FILE2" ]; then |