From d444ee917d61834f52fefa57ee026a114c87e5cc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 20 Dec 2011 14:44:51 -0500 Subject: [PATCH] gnomeos: Rename images to "runtime" and "devel" They're just better names, and this matches what the default artifact splitter is doing now. --- gnomeos/yocto/gnomeos-run.sh | 4 ++-- .../{gnomeos-contents-dev.bb => gnomeos-contents-devel.bb} | 0 .../{gnomeos-contents-base.bb => gnomeos-contents-runtime.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename gnomeos/yocto/recipies-core/images/{gnomeos-contents-dev.bb => gnomeos-contents-devel.bb} (100%) rename gnomeos/yocto/recipies-core/images/{gnomeos-contents-base.bb => gnomeos-contents-runtime.bb} (100%) diff --git a/gnomeos/yocto/gnomeos-run.sh b/gnomeos/yocto/gnomeos-run.sh index b4d34290..eb556651 100755 --- a/gnomeos/yocto/gnomeos-run.sh +++ b/gnomeos/yocto/gnomeos-run.sh @@ -76,7 +76,7 @@ if ! test -d ostree; then fi cd ostree ostree --repo=${OSTREE_REPO} local-clone repo -for branch in base dev; do +for branch in runtime devel; do rev=$(ostree --repo=repo rev-parse ${BRANCH_PREFIX}${branch}); if ! test -d ${BRANCH_PREFIX}${branch}-${rev}; then ostree --repo=repo checkout ${rev} ${BRANCH_PREFIX}${branch}-${rev} @@ -101,7 +101,7 @@ if ! echo $ARGS | grep -q 'root='; then ARGS="root=/dev/hda $ARGS" fi if ! echo $ARGS | grep -q 'ostree='; then - ARGS="ostree=${BRANCH_PREFIX}base-current $ARGS" + ARGS="ostree=${BRANCH_PREFIX}runtime-current $ARGS" fi exec qemu-kvm -kernel ./tmp-eglibc/deploy/images/bzImage-qemux86.bin -hda gnomeos-fs.img -net user -net nic,model=virtio -append "$ARGS" diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb similarity index 100% rename from gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb rename to gnomeos/yocto/recipies-core/images/gnomeos-contents-devel.bb diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-runtime.bb similarity index 100% rename from gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb rename to gnomeos/yocto/recipies-core/images/gnomeos-contents-runtime.bb