summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-18 16:43:03 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-18 16:43:03 +0000
commit0f918b445e48ff1d45929251697f476c1053bc43 (patch)
tree9801edff0fd9ee296984deae325f3fe7969ec940
parentbe30e75511094aad232dda2678abca30132599cc (diff)
downloadpoky-0f918b445e48ff1d45929251697f476c1053bc43.tar.gz
scripts/poky-autobuild-moblin: Update to share moblin-incremental images
-rwxr-xr-xscripts/poky-autobuild-moblin24
-rwxr-xr-xscripts/poky-autobuild-postprocess-moblin38
2 files changed, 47 insertions, 15 deletions
diff --git a/scripts/poky-autobuild-moblin b/scripts/poky-autobuild-moblin
index 8662063095..90ee931eba 100755
--- a/scripts/poky-autobuild-moblin
+++ b/scripts/poky-autobuild-moblin
@@ -21,15 +21,19 @@
21SRVWORKDIR=/home/rpurdie 21SRVWORKDIR=/home/rpurdie
22TARGETDIR=$SRVWORKDIR/httpd/autobuild-output 22TARGETDIR=$SRVWORKDIR/httpd/autobuild-output
23CURRDIR=`pwd` 23CURRDIR=`pwd`
24if [ "$CURRDIR" = "$SRVWORKDIR/poky/full-shihtzu/build" ]; then 24if [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/full-shihtzu/build" ]; then
25 ABTARGET="poky" 25 ABTARGET="poky"
26elif [ "$CURRDIR" = "$SRVWORKDIR/poky/full-bleeding-shihtzu/build" ]; then 26elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/full-bleeding-shihtzu/build" ]; then
27 ABTARGET="poky-bleeding" 27 ABTARGET="poky-bleeding"
28elif [ "$CURRDIR" = "$SRVWORKDIR/poky/toolchain-shihtzu/build" ]; then 28elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/toolchain-shihtzu/build" ]; then
29 ABTARGET="toolchain" 29 ABTARGET="toolchain"
30elif [ "$CURRDIR" = "$SRVWORKDIR/pokky/incremental-shihtzu/build" ]; then 30elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/incremental-shihtzu/build" ]; then
31 ABTARGET="incremental" 31 ABTARGET="incremental"
32elif [ "$CURRDIR" = "$SRVWORKDIR/poky/full-darwin-shihtzu/build" ]; then 32elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/moblin-incremental/build" ]; then
33 ABTARGET="moblin-incremental"
34elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/moblin-full/build" ]; then
35 ABTARGET="moblin-full"
36elif [ "$CURRDIR" = "$SRVWORKDIR/poky-slave/full-darwin-shihtzu/build" ]; then
33 ABTARGET="darwin" 37 ABTARGET="darwin"
34 if [ ! -d "$CURRDIR/meta-darwin" ]; then 38 if [ ! -d "$CURRDIR/meta-darwin" ]; then
35 svn co http://svn.o-hand.com/repos/poky/branches/experimental/meta-darwin $CURRDIR/meta-darwin 39 svn co http://svn.o-hand.com/repos/poky/branches/experimental/meta-darwin $CURRDIR/meta-darwin
@@ -43,7 +47,7 @@ fi
43if [ "xpreamble" = "x$1" ]; then 47if [ "xpreamble" = "x$1" ]; then
44 mkdir -p ./build/tmp/deploy/images 48 mkdir -p ./build/tmp/deploy/images
45 rm -f ./build/tmp/deploy/images/images-complete 49 rm -f ./build/tmp/deploy/images/images-complete
46 #svn info > ./build/tmp/deploy/images/svninfo 50 git log -1 > ./build/tmp/deploy/images/svninfo
47 exit 0 51 exit 0
48fi 52fi
49 53
@@ -95,9 +99,9 @@ bitbake $@
95 99
96retval=$? 100retval=$?
97 101
98if [ "x$POSTPROCESS" != "x" ]; then 102#if [ "x$POSTPROCESS" != "x" ]; then
99 cd .. 103# cd ..
100 $POSTPROCESS $ABTARGET $TARGETDIR 104# $POSTPROCESS $ABTARGET $TARGETDIR
101fi 105#fi
102 106
103exit $retval 107exit $retval
diff --git a/scripts/poky-autobuild-postprocess-moblin b/scripts/poky-autobuild-postprocess-moblin
index cbe5203fb5..2de7f537d9 100755
--- a/scripts/poky-autobuild-postprocess-moblin
+++ b/scripts/poky-autobuild-postprocess-moblin
@@ -23,9 +23,16 @@ TARGETDIR=$2
23 23
24cd ./build/tmp/deploy/ 24cd ./build/tmp/deploy/
25 25
26LASTREV=`tail images/svninfo | grep Revision | cut -f 2 -d ' '` 26DEST=$TARGETDIR/$ABTARGET/
27DEST=$TARGETDIR/$ABTARGET/$LASTREV/ 27BASE=`date +%Y%m%d`
28REV=1
28 29
30while [ -d "$DEST$FOO$BASE-$REV" ]
31do
32 REV=`expr $REV + 1`
33done
34
35DEST="$DEST$FOO$BASE-$REV"
29mkdir -p $DEST 36mkdir -p $DEST
30 37
31COMPRESS_FILES=() 38COMPRESS_FILES=()
@@ -37,7 +44,7 @@ if [ "x$ABTARGET" = "xpoky-bleeding" ]; then
37 ) 44 )
38 45
39 FILES=( 46 FILES=(
40 svninfo 47 gitinfo
41 `readlink images/zImage-akita.bin` 48 `readlink images/zImage-akita.bin`
42 `readlink images/zImage-qemuarm.bin` 49 `readlink images/zImage-qemuarm.bin`
43 updater.sh.akita 50 updater.sh.akita
@@ -48,7 +55,7 @@ fi
48 55
49if [ "x$ABTARGET" = "xtoolchain" ]; then 56if [ "x$ABTARGET" = "xtoolchain" ]; then
50 FILES=( 57 FILES=(
51 svninfo 58 gitinfo
52 poky-*-toolchain-*.tar.bz2 59 poky-*-toolchain-*.tar.bz2
53 ) 60 )
54fi 61fi
@@ -63,7 +70,7 @@ if [ "x$ABTARGET" = "xpoky" ]; then
63 ) 70 )
64 71
65 FILES=( 72 FILES=(
66 svninfo 73 gitinfo
67 `readlink images/zImage-akita.bin` 74 `readlink images/zImage-akita.bin`
68 `readlink images/zImage-c7x0.bin` 75 `readlink images/zImage-c7x0.bin`
69 `readlink images/zImage-qemuarm.bin` 76 `readlink images/zImage-qemuarm.bin`
@@ -111,6 +118,27 @@ if [ "x$ABTARGET" = "xpoky" ]; then
111 ) 118 )
112fi 119fi
113 120
121if [ "x$ABTARGET" = "xmoblin-incremental" -o "x$ABTARGET" = "xmoblin-full" ]; then
122 COMPRESS_FILES=(
123 moblin-image-live-netbook-*.hddimg
124 moblin-image-live-netbook-*.iso
125 moblin-image-netbook-netbook-*.ext3
126 moblin-image-sdk-live-netbook-*.hddimg
127 moblin-image-sdk-live-netbook-*.iso
128 moblin-image-sdk-netbook-*.ext3
129 )
130
131 FILES=(
132 gitinfo
133 `readlink images/bImage-netbook.bin`
134 moblin-image-netbook-netbook-*.cpio.gz
135 moblin-image-netbook-netbook-*.jffs2
136 moblin-image-sdk-netbook-*.cpio.gz
137 moblin-image-sdk-netbook-*.jffs2
138 )
139fi
140
141
114for FILE in ${FILES[@]}; do 142for FILE in ${FILES[@]}; do
115 for FILE2 in `find -name $FILE`; do 143 for FILE2 in `find -name $FILE`; do
116 if [ ! -e "$DEST/$FILE2" ]; then 144 if [ ! -e "$DEST/$FILE2" ]; then