parallel-debian: Update for ostree changes
This commit is contained in:
1 parent
d6b3fb5118
commit
2d9d7454ee
1 file changed
+7
-7
@@ -120,8 +120,8 @@ if ! test -d ${OBJ}; then
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
$OSTREE init --repo=ostree/repo
|
$OSTREE --repo=ostree/repo init
|
||||||
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -b gnomeos -s 'Initial import' --repo=../repo --from-stdin)
|
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE --repo=../repo commit -b gnomeos -s 'Initial import' --from-stdin)
|
||||||
)
|
)
|
||||||
if test -d ${OBJ}; then
|
if test -d ${OBJ}; then
|
||||||
mv ${OBJ} ${OBJ}.old
|
mv ${OBJ} ${OBJ}.old
|
||||||
@@ -142,17 +142,17 @@ if ! test -d ${OBJ}; then
|
|||||||
cp ${SRCDIR}/debian-setup.sh ostree/gnomeos-origin/
|
cp ${SRCDIR}/debian-setup.sh ostree/gnomeos-origin/
|
||||||
chroot ostree/gnomeos-origin ./debian-setup.sh
|
chroot ostree/gnomeos-origin ./debian-setup.sh
|
||||||
rm ostree/gnomeos-origin/debian-setup.sh
|
rm ostree/gnomeos-origin/debian-setup.sh
|
||||||
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE commit -b gnomeos -s 'Run debian-setup.sh' --repo=../repo --from-stdin)
|
(cd ostree/gnomeos-origin; find . '!' -type p | grep -v '^.$' | $OSTREE --repo=../repo commit -b gnomeos -s 'Run debian-setup.sh' --from-stdin)
|
||||||
|
|
||||||
# This is the name for the real rootfs, not the chroot
|
# This is the name for the real rootfs, not the chroot
|
||||||
(cd ostree/gnomeos-origin;
|
(cd ostree/gnomeos-origin;
|
||||||
mkdir sysroot;
|
mkdir sysroot;
|
||||||
$OSTREE commit -b gnomeos -s 'Add sysroot' --repo=../repo --add=sysroot)
|
$OSTREE --repo=../repo commit -b gnomeos -s 'Add sysroot' --add=sysroot)
|
||||||
|
|
||||||
(cd ostree;
|
(cd ostree;
|
||||||
rev=$($OSTREE rev-parse --repo=repo gnomeos)
|
rev=$($OSTREE --repo=repo rev-parse gnomeos)
|
||||||
$OSTREE checkout --repo=repo ${rev} gnomeos-${rev}
|
$OSTREE --repo=repo checkout ${rev} gnomeos-${rev}
|
||||||
$OSTREE run-triggers --repo=repo gnomeos-${rev}
|
$OSTREE --repo=repo run-triggers gnomeos-${rev}
|
||||||
ln -s gnomeos-${rev} current
|
ln -s gnomeos-${rev} current
|
||||||
rm -rf gnomeos-origin)
|
rm -rf gnomeos-origin)
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in new issue
Block a user