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

Don't default to "master", require a branch

Browse Source 
It doesn't really make sense to have a default branch, since we expect
people to have multiple roots.  Thus, require a branch
specification always.
This commit is contained in:
Colin Walters committed 2011-10-27 21:42:44 -04:00
1 parent d145b0426c
commit ee4edf114b
15 files changed
+105 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

parallel-debian/gnomeos-make-image.sh
+4 -4
View File
@@ -121,7 +121,7 @@ if ! test -d ${OBJ}; then
done
$OSTREE init --repo=ostree/repo
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -s 'Initial import' --repo=../repo --from-stdin)
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -b gnomeos -s 'Initial import' --repo=../repo --from-stdin)
)
if test -d ${OBJ}; then
mv ${OBJ} ${OBJ}.old
@@ -142,15 +142,15 @@ if ! test -d ${OBJ}; then
cp ${SRCDIR}/debian-setup.sh ostree/gnomeos-origin/
chroot ostree/gnomeos-origin ./debian-setup.sh
rm ostree/gnomeos-origin/debian-setup.sh
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -s 'Run debian-setup.sh' --repo=../repo --from-stdin)
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -b gnomeos -s 'Run debian-setup.sh' --repo=../repo --from-stdin)
# This is the name for the real rootfs, not the chroot
(cd ostree/gnomeos-origin;
mkdir sysroot;
$OSTREE commit -s 'Add sysroot' --repo=../repo --add=sysroot)
$OSTREE commit -b gnomeos -s 'Add sysroot' --repo=../repo --add=sysroot)
(cd ostree;
rev=$($OSTREE rev-parse --repo=repo master)
rev=$($OSTREE rev-parse --repo=repo gnomeos)
$OSTREE checkout --repo=repo ${rev} gnomeos-${rev}
$OSTREE run-triggers --repo=repo gnomeos-${rev}
ln -s gnomeos-${rev} current