packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnomeos: Check out both -base and -dev roots 

This makes it easier to boot into either.
This commit is contained in:
Colin Walters 2011-11-20 20:50:14 -05:00
parent fb98d0bf24
commit ff77a1bd7d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnomeos/yocto/gnomeos-run.sh
View File

@ -42,8 +42,7 @@ shift
test -n "$OSTREE_REPO" || usage test -n "$OSTREE_REPO" || usage
ARCH=x86 ARCH=x86
BRANCH_PREFIX="gnomeos-${ARCH}-"
BRANCH="gnomeos-${ARCH}-base"
OBJ=gnomeos-fs.img OBJ=gnomeos-fs.img
if (! test -f ${OBJ}); then if (! test -f ${OBJ}); then
@ -69,13 +68,15 @@ if (! test -f ${OBJ}); then
mkdir repo mkdir repo
ostree --repo=repo init ostree --repo=repo init
ostree --repo=${OSTREE_REPO} local-clone repo ostree --repo=${OSTREE_REPO} local-clone repo
rev=$(ostree --repo=repo rev-parse ${BRANCH}); for branch in base dev; do
ostree --repo=repo checkout ${rev} ${BRANCH}-${rev} rev=$(ostree --repo=repo rev-parse ${BRANCH_PREFIX}${branch});
ln -s ${BRANCH}-${rev} current ostree --repo=repo checkout ${rev} ${BRANCH_PREFIX}${branch}-${rev}
ln -s ${BRANCH_PREFIX}${branch}-${rev} ${BRANCH_PREFIX}${branch}-current
done
cd .. cd ..
mkdir proc # needed for ostree-init mkdir proc # needed for ostree-init
cp -a ./ostree/current/usr/sbin/ostree-init . cp -a ./ostree/${BRANCH_PREFIX}base-current/usr/sbin/ostree-init .
cd ${WORKDIR} cd ${WORKDIR}
@ -92,7 +93,7 @@ if ! echo $ARGS | grep -q 'root='; then
ARGS="root=/dev/hda $ARGS" ARGS="root=/dev/hda $ARGS"
fi fi
if ! echo $ARGS | grep -q 'ostree='; then if ! echo $ARGS | grep -q 'ostree='; then
ARGS="ostree=current $ARGS" ARGS="ostree=${BRANCH_PREFIX}base-current $ARGS"
fi fi
exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS" exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -append "$ARGS"