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

gnomeos: Prefix branch names with -yocto to clarify their origin 

Also add git to the dev image.
This commit is contained in:
Colin Walters 2011-11-25 12:02:03 -05:00
parent 7d0a8bab6c
commit 9c4fc94266
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,9 @@ set -e
set -x set -x
WORKDIR=`pwd` WORKDIR=`pwd`
cd `dirname $0`
SCRIPT_SRCDIR=`pwd`
cd -
if test $(id -u) = 0; then if test $(id -u) = 0; then
cat <<EOF cat <<EOF
@ -24,6 +27,8 @@ shift
ARCH=x86 ARCH=x86
OSTREE_VER=$(cd $SCRIPT_SRCDIR && git describe)
BUILDDIR=$WORKDIR/tmp-eglibc BUILDDIR=$WORKDIR/tmp-eglibc
OSTREE_REPO=$WORKDIR/repo OSTREE_REPO=$WORKDIR/repo
@ -36,6 +41,6 @@ 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 ${BUILD_TIME}" -b "gnomeos-$ARCH-$BRANCH" fakeroot -i ../fakeroot.db ostree --repo=${OSTREE_REPO} commit -s "Build from OSTree ${OSTREE_VER}" -b "gnomeos-yocto-$ARCH-$BRANCH"
cd "${WORKDIR}" cd "${WORKDIR}"
rm -rf $tempdir rm -rf $tempdir

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

@ -42,7 +42,7 @@ shift
test -n "$OSTREE_REPO" || usage test -n "$OSTREE_REPO" || usage
ARCH=x86 ARCH=x86
BRANCH_PREFIX="gnomeos-${ARCH}-" BRANCH_PREFIX="gnomeos-yocto-${ARCH}-"
OBJ=gnomeos-fs.img OBJ=gnomeos-fs.img
if (! test -f ${OBJ}); then if (! test -f ${OBJ}); then
@ -96,4 +96,4 @@ if ! echo $ARGS | grep -q 'ostree='; then
ARGS="ostree=${BRANCH_PREFIX}base-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 -net user -net nic,model=virtio -append "$ARGS"

5
gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
View File

@ -7,4 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
inherit gnomeos-contents inherit gnomeos-contents
PACKAGE_INSTALL += "task-core-sdk" PACKAGE_INSTALL += "task-core-sdk \
bison flex \
git \
"