Skip to content

Commit f54e111

Browse files
jadonkjadonk
committed
ec2build.sh: don't recall
1 parent 8c2437f commit f54e111

File tree

1 file changed

+48
-42
lines changed

1 file changed

+48
-42
lines changed

‎ec2build.sh

+48-42
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ source $HOME/secret/setup_env.sh
1616

1717
# These are the git commit ids we want to use to build
1818
ANGSTROM_SCRIPT_ID=f593f1c023cd991535c748682ab21154c807385e
19-
ANGSTROM_REPO_ID=48bd2ee153f86d36946f9ccf483d07dca1b864ec
19+
ANGSTROM_REPO_ID=a5dceb144318bd73ff903aff7ae8c396615e81d0
2020
HALT="no"
2121

2222
# Setup DEFAULT_AMI
@@ -35,7 +35,7 @@ MACH_TYPE=m1.xlarge
3535
DOWNLOAD_EBS=vol-08374961
3636
ANGSTROM_EBS=vol-24fa964d
3737
DOWNLOAD_DIR=/mnt/downloads
38-
TMPFS_DIR=$HOME/angstrom-setup-scripts
38+
OEBB_DIR=/mnt/angstrom-setup-scripts
3939
S3_DEPLOY_DIR=/mnt/s3/deploy/$DATE
4040

4141
THIS_FILE=$0
@@ -191,22 +191,25 @@ sudo aptitude install ia32-libs -y
191191
# target local
192192
# about 5 minutes
193193
function install-oe {
194-
mkdir -p $HOME/angstrom-setup-scripts
195-
sudo mount -t ramfs -o size=10G ramfs $HOME/angstrom-setup-scripts
196-
sudo chown ubuntu.ubuntu $HOME/angstrom-setup-scripts
197-
git clone git://gitorious.org/angstrom/angstrom-setup-scripts.git
198-
cd $HOME/angstrom-setup-scripts
194+
#mkdir -p $OEBB_DIR
195+
#sudo mount -t ramfs -o size=10G ramfs $OEBB_DIR
196+
rm -rf $HOME/.oe
197+
sudo rm -rf $OEBB_DIR
198+
sudo mkdir -p $OEBB_DIR
199+
sudo chown ubuntu.ubuntu $OEBB_DIR
200+
git clone git://gitorious.org/angstrom/angstrom-setup-scripts.git $OEBB_DIR
201+
cd $OEBB_DIR
199202
git checkout -b install $ANGSTROM_SCRIPT_ID
200203
./oebb.sh config beagleboard
201204
./oebb.sh update
202-
perl -pe 's/^(INHERIT\s*\+=\s*"rm_work"/#$1/' -i.bak1 $HOME/angstrom-setup-scripts/build/conf/local.conf
203-
perl -pe 's/^(#)?PARALLEL_MAKE\s*=\s*"-j\d+"/PARALLEL_MAKE = "-j60"/' -i.bak2 $HOME/angstrom-setup-scripts/build/conf/local.conf
204-
perl -pe 's/BB_NUMBER_THREADS\s*=\s*"\d+"/BB_NUMBER_THREADS = "8"/' -i.bak3 $HOME/angstrom-setup-scripts/build/conf/local.conf
205+
perl -pe 's/^(INHERIT\s*\+=\s*"rm_work")/#$1/' -i.bak1 $OEBB_DIR/build/conf/local.conf
206+
perl -pe 's/^(#)?PARALLEL_MAKE\s*=\s*"-j\d+"/PARALLEL_MAKE = "-j60"/' -i.bak2 $OEBB_DIR/build/conf/local.conf
207+
perl -pe 's/BB_NUMBER_THREADS\s*=\s*"\d+"/BB_NUMBER_THREADS = "8"/' -i.bak3 $OEBB_DIR/build/conf/local.conf
205208
}
206209

207210
# target local
208211
function oebb {
209-
cd $HOME/angstrom-setup-scripts
212+
cd $OEBB_DIR
210213
./oebb.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
211214
}
212215

@@ -290,31 +293,31 @@ function restore-angstrom {
290293
attach-ebs-ami $ANGSTROM_EBS /dev/sde
291294
mount-ebs-ami $ANGSTROM_EBS /dev/sde /mnt/angstrom
292295
sudo chown ubuntu.ubuntu /mnt/angstrom
293-
mkdir -p $HOME/angstrom-setup-scripts
294-
sudo mount -t ramfs -o size=10G ramfs $HOME/angstrom-setup-scripts
295-
sudo chown ubuntu.ubuntu $HOME/angstrom-setup-scripts
296-
rsync -a /mnt/angstrom/* $HOME/angstrom-setup-scripts/
296+
mkdir -p $OEBB_DIR
297+
sudo mount -t ramfs -o size=10G ramfs $OEBB_DIR
298+
sudo chown ubuntu.ubuntu $OEBB_DIR
299+
rsync -a /mnt/angstrom/* $OEBB_DIR/
297300
}
298301

299302
function preserve-angstrom {
300-
rsync -a $HOME/angstrom-setup-scripts/* /mnt/angstrom/
303+
rsync -a $OEBB_DIR/* /mnt/angstrom/
301304
}
302305

303306
function rsync-downloads-to-s3 {
304307
mkdir -p /mnt/s3/downloads
305308
cp /mnt/s3/scripts/list.html /mnt/s3/downloads/
306-
rsync -a $HOME/angstrom-setup-scripts/sources/downloads/ /mnt/s3/downloads/
309+
rsync -a $OEBB_DIR/sources/downloads/ /mnt/s3/downloads/
307310
}
308311

309312
function rsync-downloads-from-s3 {
310-
mkdir -p $HOME/angstrom-setup-scripts/sources/downloads
311-
rsync -a /mnt/s3/downloads/ $HOME/angstrom-setup-scripts/sources/downloads/
313+
mkdir -p $OEBB_DIR/sources/downloads
314+
rsync -a /mnt/s3/downloads/ $OEBB_DIR/sources/downloads/
312315
}
313316

314317
function mount-tmp {
315-
mkdir -p $TMPFS_DIR
316-
sudo mount -t tmpfs -o size=30G,nr_inodes=30M,noatime,nodiratime tmpfs $TMPFS_DIR
317-
sudo chown ubuntu.ubuntu $TMPFS_DIR
318+
mkdir -p $OEBB_DIR
319+
sudo mount -t tmpfs -o size=30G,nr_inodes=30M,noatime,nodiratime tmpfs $OEBB_DIR
320+
sudo chown ubuntu.ubuntu $OEBB_DIR
318321
}
319322

320323
# http://xentek.net/articles/448/installing-fuse-s3fs-and-sshfs-on-ubuntu/
@@ -347,9 +350,9 @@ IMAGE_NAME=beagleboard-validation-$DATE
347350
echo IMAGE_NAME=$IMAGE_NAME
348351
sudo mkdir -p $DOWNLOAD_DIR
349352
sudo chown ubuntu.ubuntu $DOWNLOAD_DIR
350-
mkdir -p $TMPFS_DIR
353+
mkdir -p $OEBB_DIR
351354
sudo mv /mnt/$IMAGE_NAME $IMAGE_NAME.$$
352-
sudo ec2-bundle-vol -c $EC2_CERT -k $EC2_PRIVATE_KEY -u $EC2_ID -r x86_64 -d /mnt -e /mnt,/home/ubuntu/secret,$DOWNLOAD_DIR,$TMPFS_DIR -p $IMAGE_NAME
355+
sudo ec2-bundle-vol -c $EC2_CERT -k $EC2_PRIVATE_KEY -u $EC2_ID -r x86_64 -d /mnt -e /mnt,/home/ubuntu/secret,$DOWNLOAD_DIR,$OEBB_DIR -p $IMAGE_NAME
353356
ec2-upload-bundle -b $S3_BUCKET -m /mnt/$IMAGE_NAME.manifest.xml -a $AWS_ID -s $AWS_PASSWORD
354357
ec2-register -n $IMAGE_NAME $S3_BUCKET/$IMAGE_NAME.manifest.xml
355358
#IMAGE ami-954fa4fc beagleboard-validation/beagleboard-validation-20100804.manifest.xml 283181587 744 available private x86_64 machine aki-0b4aa462
@@ -387,7 +390,7 @@ mkdir -p $S3_DEPLOY_DIR/sd/
387390
sudo mkdir -p /mnt/sd_image1
388391
sudo mkdir -p /mnt/sd_image2
389392
pushd $S3_DEPLOY_DIR/sd/
390-
DEPLOY_DIR=$HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/deploy/glibc/images/beagleboard
393+
DEPLOY_DIR=$OEBB_DIR/build/tmp-angstrom_2008_1/deploy/glibc/images/beagleboard
391394
cp $DEPLOY_DIR/MLO-beagleboard MLO
392395
cp $DEPLOY_DIR/u-boot-beagleboard.bin u-boot.bin
393396
cp $DEPLOY_DIR/uImage-beagleboard.bin uImage
@@ -396,7 +399,7 @@ cp $DEPLOY_DIR/beagleboard-test-image-beagleboard.cpio.gz.u-boot ramfs.img
396399
cp $DEPLOY_DIR/uboot-beagleboard-validation-boot.cmd.scr boot.scr
397400
cp $DEPLOY_DIR/uboot-beagleboard-validation-user.cmd.scr user.scr
398401
cp $DEPLOY_DIR/beagleboard-demo-image-beagleboard.tar.bz2 demo-$DATE.tar.bz2
399-
cp $THIS_FILE .
402+
cp $HOME/ec2build.sh .
400403
cp /mnt/s3/scripts/list.html .
401404

402405
FILES="MLO u-boot.bin uImage ramdisk.gz boot.scr user.scr ramfs.img"
@@ -451,50 +454,53 @@ mkdir -p $S3_DEPLOY_DIR
451454
cp /mnt/s3/scripts/list.html $S3_DEPLOY_DIR
452455
mkdir -p $S3_DEPLOY_DIR/glibc
453456
cp /mnt/s3/scripts/list.html $S3_DEPLOY_DIR/glibc
454-
rsync -a $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/deploy/glibc $S3_DEPLOY_DIR
457+
rsync -a $OEBB_DIR/build/tmp-angstrom_2008_1/deploy/glibc $S3_DEPLOY_DIR
455458
}
456459

457460
function rsync-pstage-to-s3 {
458461
mkdir -p /mnt/s3/pstage
459462
cp /mnt/s3/scripts/list.html /mnt/s3/pstage/
460463
# The quilt-native pstage package is bad
461-
rm $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/*/*quilt-native*
464+
rm $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/*/*quilt-native*
462465
# TI components may have non-free licenses
463-
#rm $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/*/*ti-*
464-
rsync -a $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/ /mnt/s3/pstage/
466+
#rm $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/*/*ti-*
467+
rsync -a $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/ /mnt/s3/pstage/
465468
}
466469

467470
function rsync-pstage-from-s3 {
468-
mkdir -p $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/
469-
rsync -a /mnt/s3/pstage/ $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/
471+
mkdir -p $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/
472+
rsync -a /mnt/s3/pstage/ $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/
470473
# The quilt-native pstage package is bad
471-
rm $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/*/*quilt-native*
474+
rm $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/*/*quilt-native*
472475
# TI components may have non-free licenses
473-
#rm $HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/pstage/*/*ti-*
476+
#rm $OEBB_DIR/build/tmp-angstrom_2008_1/pstage/*/*ti-*
474477
}
475478

476479
function copy-ti-tools {
477480
find-instance
478-
remote mkdir -p angstrom-setup-scripts/sources/downloads
479-
scp -i $KEYPAIR_FILE $HOME/ti-tools/ti_cgt_c6000_6.1.9_setup_linux_x86.bin ubuntu@$MACH_NAME:angstrom-setup-scripts/sources/downloads/ti_cgt_c6000_6.1.9_setup_linux_x86.bin
481+
remote mkdir -p $OEBB_DIR/sources/downloads
482+
scp -i $KEYPAIR_FILE $HOME/ti-tools/ti_cgt_c6000_6.1.9_setup_linux_x86.bin ubuntu@$MACH_NAME:$OEBB_DIR/sources/downloads/ti_cgt_c6000_6.1.9_setup_linux_x86.bin
480483
}
481484

482485
function setup-oe {
483-
if [ ! -x $HOME/angstrom-setup-scripts/oebb.sh ]; then install-oe; fi
484-
pushd $HOME/angstrom-setup-scripts
486+
if [ ! -x $OEBB_DIR/oebb.sh ]; then install-oe; fi
487+
pushd $OEBB_DIR
485488
git checkout $ANGSTROM_SCRIPT_ID
486-
popd
487-
pushd $HOME/angstrom-setup-scripts/sources/openembedded
489+
if [ ! -d sources/openembedded/.git ]; then
490+
./oebb.sh update
491+
fi
492+
pushd sources/openembedded
488493
git remote add myrepo git://gitorious.org/~Jadon/angstrom/jadon-openembedded.git
489494
git remote update
490495
git checkout $ANGSTROM_REPO_ID
491496
popd
497+
popd
492498
# I could never get the EBS volumes to mount in testing
493499
#remote restore-angstrom
494500
#remote mount-download-ebs
495501
if [ ! -x /mnt/s3/scripts/ec2build.sh ]; then mount-s3; fi
496502
rsync-downloads-from-s3
497-
rsync-pstage-from-s3
503+
#rsync-pstage-from-s3
498504
# pstage of quilt-native doesn't work
499505
#oebb bitbake -c clean quilt-native
500506
}
@@ -505,7 +511,7 @@ setup-oe
505511
oebb bitbake beagleboard-test-image
506512
oebb bitbake beagleboard-demo-image
507513
# about 90 seconds
508-
DEPLOY_DIR=$HOME/angstrom-setup-scripts/build/tmp-angstrom_2008_1/deploy/glibc/images/beagleboard
514+
DEPLOY_DIR=$OEBB_DIR/build/tmp-angstrom_2008_1/deploy/glibc/images/beagleboard
509515
if [ -e $DEPLOY_DIR/beagleboard-test-image-beagleboard.ext2.gz ]; then build-sd; fi
510516
# only about 5 minutes if there aren't many updates
511517
#rsync-downloads-to-s3

0 commit comments

Comments
 (0)