[gnome-ostree] 3.6: Build ostree-triggers early, don't build libacl/libattr
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-ostree] 3.6: Build ostree-triggers early, don't build libacl/libattr
- Date: Sun, 26 Aug 2012 20:50:04 +0000 (UTC)
commit 78127f871d1ea2f167e153d559c0dedad72a94d6
Author: Colin Walters <walters verbum org>
Date: Sun Aug 26 16:46:01 2012 -0400
3.6: Build ostree-triggers early, don't build libacl/libattr
A recent Poky commit dropped ostree from the build root, because we
are rebuilding it here in gnome-ostree. However, we need to have the
ostree-run-triggers binary in the build root very early.
To accomplish this, move glib very early, and build ostree with a new
special --enable-triggers-only mode.
Also, drop libattr/libacl, since we aren't doing CI on them.
Finally, drop gnome-ostree from here, because we are building it in
the Poky branch.
gnomeos-3.6.json | 32 +++++++--------------
patches/acl-2.2.39-build.patch | 54 -------------------------------------
patches/acl-add-autogen.patch | 55 --------------------------------------
patches/acl-makeinstall.patch | 28 -------------------
patches/acl-no-builddir.patch | 26 ------------------
patches/attr-2.4.32-build.patch | 56 ---------------------------------------
patches/attr-add-autogen.patch | 55 --------------------------------------
patches/attr-makeinstall.patch | 28 -------------------
patches/attr-no-builddir.patch | 26 ------------------
9 files changed, 11 insertions(+), 349 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index a60afe6..b6ad8af 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -37,6 +37,17 @@
"component": "devel",
"noarch": true},
+ {"src": "git:git://github.com/atgreen/libffi.git",
+ "tag": "v3.0.10"},
+
+ {"src": "gnome:glib",
+ "config-opts": ["--disable-modular-tests"]},
+
+ {"src": "gnome:ostree",
+ "name": "ostree-triggers",
+ "bootstrap": true,
+ "config-opts": ["--enable-triggers-only"]},
+
{"src": "gnome:gnome-common",
"component": "devel"},
@@ -68,30 +79,11 @@
"tag": "v005",
"patches": ["usbutils-autogen.patch"]},
- {"src": "git:git://github.com/atgreen/libffi.git",
- "tag": "v3.0.10"},
-
- {"src": "savannah:attr",
- "tag": "v2.4.46",
- "patches": ["attr-add-autogen.patch",
- "attr-no-builddir.patch",
- "attr-2.4.32-build.patch",
- "attr-makeinstall.patch"]},
-
- {"src": "savannah:acl",
- "tag": "v2.2.51",
- "patches": ["acl-add-autogen.patch",
- "acl-no-builddir.patch",
- "acl-2.2.39-build.patch",
- "attr-makeinstall.patch"]},
-
{"src": "fedora:hwdata.git",
"tag": "hwdata-0.225-1-40-g22495d9f53e572fdafd999dcfb0cb35166b232ab",
"patches": ["hwdata-buildapi.patch",
"hwdata-no-spec-file.patch"]},
- {"src": "gnome:glib"},
-
{"src": "gnome:gobject-introspection",
"config-opts": ["--disable-tests"]},
@@ -620,8 +612,6 @@
"config-opts": ["--disable-documentation",
"--with-soup-gnome"]},
- {"src": "gnome:gnome-ostree"},
-
{"src": "fd-gstreamer:gstreamer",
"name": "gstreamer-0.10",
"branch": "0.10",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]