gnomeos-make-image.sh: Support out of tree ostree

This commit is contained in:
Colin Walters 2011-10-26 14:42:58 -04:00
parent bb833ea347
commit f8b178b452
1 changed files with 5 additions and 4 deletions

View File

@ -18,13 +18,14 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
set -e set -e
set -x set -x
SRCDIR=`dirname $0` SRCDIR=`dirname $0`
WORKDIR=`pwd` WORKDIR=`pwd`
OSTREE=${OSTREE:-ostree}
case `uname -p` in case `uname -p` in
x86_64) x86_64)
ARCH=amd64 ARCH=amd64
@ -100,12 +101,12 @@ if ! test -f ${OBJ}; then
rm ostree/gnomeos-origin/debian-setup.sh rm ostree/gnomeos-origin/debian-setup.sh
ostree init --repo=ostree/repo 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 -s 'Initial import' --repo=../repo --from-stdin)
rm -rf ostree/gnomeos-origin rm -rf ostree/gnomeos-origin
(cd ostree; (cd ostree;
rev=`cat repo/HEAD` rev=`cat repo/HEAD`
ostree checkout --repo=repo HEAD gnomeos-${rev} $OSTREE checkout --repo=repo HEAD gnomeos-${rev}
ostree run-triggers --repo=repo current $OSTREE run-triggers --repo=repo current
ln -s gnomeos-${rev} current) ln -s gnomeos-${rev} current)
) )
umount fs umount fs