mirror of
https://github.com/ostreedev/ostree.git
synced 2024-12-25 01:34:34 +03:00
gnomeos: Prefix branch names with -yocto to clarify their origin
Also add git to the dev image.
This commit is contained in:
parent
7d0a8bab6c
commit
9c4fc94266
@ -5,6 +5,9 @@ set -e
|
||||
set -x
|
||||
|
||||
WORKDIR=`pwd`
|
||||
cd `dirname $0`
|
||||
SCRIPT_SRCDIR=`pwd`
|
||||
cd -
|
||||
|
||||
if test $(id -u) = 0; then
|
||||
cat <<EOF
|
||||
@ -24,6 +27,8 @@ shift
|
||||
|
||||
ARCH=x86
|
||||
|
||||
OSTREE_VER=$(cd $SCRIPT_SRCDIR && git describe)
|
||||
|
||||
BUILDDIR=$WORKDIR/tmp-eglibc
|
||||
|
||||
OSTREE_REPO=$WORKDIR/repo
|
||||
@ -36,6 +41,6 @@ cd $tempdir
|
||||
mkdir fs
|
||||
cd fs
|
||||
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}"
|
||||
rm -rf $tempdir
|
||||
|
@ -42,7 +42,7 @@ shift
|
||||
test -n "$OSTREE_REPO" || usage
|
||||
|
||||
ARCH=x86
|
||||
BRANCH_PREFIX="gnomeos-${ARCH}-"
|
||||
BRANCH_PREFIX="gnomeos-yocto-${ARCH}-"
|
||||
|
||||
OBJ=gnomeos-fs.img
|
||||
if (! test -f ${OBJ}); then
|
||||
@ -96,4 +96,4 @@ if ! echo $ARGS | grep -q 'ostree='; then
|
||||
ARGS="ostree=${BRANCH_PREFIX}base-current $ARGS"
|
||||
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"
|
||||
|
@ -7,4 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
|
||||
|
||||
inherit gnomeos-contents
|
||||
|
||||
PACKAGE_INSTALL += "task-core-sdk"
|
||||
PACKAGE_INSTALL += "task-core-sdk \
|
||||
bison flex \
|
||||
git \
|
||||
"
|
||||
|
Loading…
Reference in New Issue
Block a user