[gnome-ostree] build-yocto: Do the commit from here, rather than inside yocto buildsystem
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] build-yocto: Do the commit from here, rather than inside yocto buildsystem
- Date: Fri, 21 Dec 2012 19:20:39 +0000 (UTC)
commit 0a5b055c0ce4c60b99c486969e9ddb93de1fe8d4
Author: Colin Walters <walters verbum org>
Date: Thu Dec 20 14:37:19 2012 -0500
build-yocto: Do the commit from here, rather than inside yocto buildsystem
See commit https://github.com/cgwalters/poky/commit/fa614855bd565dd7468e841d0768735a471de27f
install/ostree.modules | 2 +-
src/ostbuild/js/build.js | 13 +++++++++++++
src/ostbuild/ostree-build-yocto | 4 ++++
3 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/install/ostree.modules b/install/ostree.modules
index 0823a45..1d18e56 100644
--- a/install/ostree.modules
+++ b/install/ostree.modules
@@ -46,7 +46,7 @@
<dep package="glib-networking"/>
</suggests>
</autotools>
- <autotools id="ostree" autogenargs="--disable-documentation --disable-libarchive --with-soup=yes">
+ <autotools id="ostree" autogenargs="--disable-documentation --enable-libarchive --with-soup=yes">
<branch/>
<dependencies>
<dep package="glib"/>
diff --git a/src/ostbuild/js/build.js b/src/ostbuild/js/build.js
index 80f62ad..0d64109 100644
--- a/src/ostbuild/js/build.js
+++ b/src/ostbuild/js/build.js
@@ -598,6 +598,19 @@ const Build = new Lang.Class({
env['DL_DIR'] = downloads.get_path();
env['SSTATE_DIR'] = sstateDir.get_path();
ProcUtil.runSync(cmd, cancellable, {env:ProcUtil.objectToEnvironment(env)});
+
+ let componentTypes = ['runtime', 'devel'];
+ for (let i = 0; i < componentTypes.length; i++) {
+ let componentType = componentTypes[i];
+ let treename = Format.vprintf('bases/yocto/%s-%s-%s', [this.prefix, architecture, componentType]);
+ let tarPath = builddir.get_child(Format.vprintf('gnomeos-contents-%s-%s.tar.gz', [componentType, architecture]));
+ ProcUtil.runSync(['ostree', '--repo=' + this.repo.get_path(),
+ 'commit', '-s', 'Build', '--skip-if-unchanged',
+ '-b', treename, '--tree=tar=' + tarPath.get_path()],
+ cancellable,
+ {logInitiation: true});
+ GSystem.file_unlink(tarPath, cancellable);
+ }
},
execute: function(argv) {
diff --git a/src/ostbuild/ostree-build-yocto b/src/ostbuild/ostree-build-yocto
index 950d1d2..e7d3199 100644
--- a/src/ostbuild/ostree-build-yocto
+++ b/src/ostbuild/ostree-build-yocto
@@ -95,6 +95,10 @@ ln -sf ${repo_path} ${IMAGEDIR}/repo
echo "Building ${src_gitrev}"
bitbake gnomeos-contents-{runtime,devel}
+for basetype in runtime devel; do
+ ln -sf ${builddir}/tmp-eglibc/deploy/images/gnomeos-contents-${basetype}-${MACHINE}.tar.gz gnomeos-contents-${basetype}-${architecture}.tar.gz
+done
+
echo ${src_gitrev} > ${built_gitrev_path}.tmp
mv ${built_gitrev_path}.tmp ${built_gitrev_path}
exit 0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]