From 3f0866dc7939b42ec7dec13e6bf593da0f2c1a03 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 27 Nov 2011 20:43:44 -0500 Subject: [PATCH] gnomeos: Switch to using pseudo for commits This is noticeably faster. One side effect here is that xattrs are empty, which is actually a good thing. --- gnomeos/yocto/commit-yocto-build.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnomeos/yocto/commit-yocto-build.sh b/gnomeos/yocto/commit-yocto-build.sh index 64b988fc..99585b8d 100755 --- a/gnomeos/yocto/commit-yocto-build.sh +++ b/gnomeos/yocto/commit-yocto-build.sh @@ -1,3 +1,4 @@ +#!/bin/bash # Copyright (C) 2011 Colin Walters # @@ -31,6 +32,11 @@ OSTREE_VER=$(cd $SCRIPT_SRCDIR && git describe) BUILDDIR=$WORKDIR/tmp-eglibc +export PSEUDO_PREFIX=${BUILDDIR}/sysroots/$(uname -m)-linux +export PSEUDO_BINDIR=${PSEUDO_PREFIX}/usr/bin +export PSEUDO_LIBDIR=${PSEUDO_BINDIR}/../lib/pseudo/lib +FAKEROOT=${PSEUDO_BINDIR}/pseudo + OSTREE_REPO=$WORKDIR/repo BUILD_TAR=$BUILDDIR/deploy/images/gnomeos-contents-$BRANCH-qemu${ARCH}.tar.gz @@ -40,7 +46,7 @@ tempdir=`mktemp -d tmp-commit-yocto-build.XXXXXXXXXX` 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 from OSTree ${OSTREE_VER}" -b "gnomeos-yocto-$ARCH-$BRANCH" +$FAKEROOT tar xf $BUILD_TAR +$FAKEROOT ostree --repo=${OSTREE_REPO} commit -s "Build from OSTree ${OSTREE_VER}" -b "gnomeos-yocto-$ARCH-$BRANCH" cd "${WORKDIR}" rm -rf $tempdir