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

gnomeos: Add -x86 tag to builds 

Since later we'll want -x86_64 too.
This commit is contained in:
Colin Walters 2011-11-19 14:03:18 -05:00
parent 1dbf134946
commit 571787b14e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnomeos/yocto/commit-yocto-build.sh
View File

@ -22,14 +22,18 @@ BRANCH=$1
test -n "$BRANCH" || usage test -n "$BRANCH" || usage
shift shift
ARCH=x86
OSTREE_REPO=$WORKDIR/repo OSTREE_REPO=$WORKDIR/repo
BUILD_TAR=$WORKDIR/tmp-eglibc/deploy/images/gnomeos-contents-$BRANCH-qemux86.tar.gz BUILD_TAR=$WORKDIR/tmp-eglibc/deploy/images/gnomeos-contents-$BRANCH-qemu${ARCH}.tar.gz
BUILD_TIME=$(date -r $BUILD_TAR)
tempdir=`mktemp -d tmp-commit-yocto-build.XXXXXXXXXX` tempdir=`mktemp -d tmp-commit-yocto-build.XXXXXXXXXX`
cd $tempdir cd $tempdir
mkdir fs mkdir fs
cd fs cd fs
fakeroot -s ../fakeroot.db tar xf $BUILD_TAR fakeroot -s ../fakeroot.db tar xf $BUILD_TAR
fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build (need ostree git version here)" -b "gnomeos-$BRANCH" fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build ${BUILD_TIME}" -b "gnomeos-$ARCH-$BRANCH"
cd "${WORKDIR}" cd "${WORKDIR}"
rm -rf $tempdir rm -rf $tempdir

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

@ -41,6 +41,10 @@ OSTREE_REPO=$1
shift shift
test -n "$OSTREE_REPO" || usage test -n "$OSTREE_REPO" || usage
ARCH=x86
BRANCH="gnomeos-${ARCH}-base"
OBJ=gnomeos-fs.img OBJ=gnomeos-fs.img
if (! test -f ${OBJ}); then if (! test -f ${OBJ}); then
rm -f ${OBJ}.tmp rm -f ${OBJ}.tmp
@ -65,9 +69,9 @@ 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 gnomeos-base); rev=$(ostree --repo=repo rev-parse ${BRANCH});
ostree --repo=repo checkout ${rev} gnomeos-base-${rev} ostree --repo=repo checkout ${rev} ${BRANCH}-${rev}
ln -s gnomeos-base-${rev} current ln -s ${BRANCH}-${rev} current
cd .. cd ..
mkdir proc # needed for ostree-init mkdir proc # needed for ostree-init