summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-04-01 18:21:49 +0000
committerJavier Jardón <jjardon@gnome.org>2016-04-04 12:30:23 +0000
commit617505f2d79614442f2f360ea520430afa03f3c6 (patch)
treeea86a61e660b40afdec46235d3a90cb2d045a835
parent6d978781931c9ee6f83af5baf9d44737a1fd1363 (diff)
downloaddefinitions-617505f2d79614442f2f360ea520430afa03f3c6.tar.gz
Move libarchive to foundation
Its a common dependency between gnome and genivi strata, also a optional one for the ostree stratum Change-Id: I19f5df84e1f10319d3a7268a9da729545d52fd55
-rw-r--r--strata/foundation.morph5
-rw-r--r--strata/foundation/libarchive.morph (renamed from strata/genivi/libarchive.morph)0
-rw-r--r--strata/genivi.morph6
-rw-r--r--strata/gnome.morph6
-rw-r--r--strata/gnome/libarchive.morph6
5 files changed, 5 insertions, 18 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index be87728b..399ed06c 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -120,3 +120,8 @@ chunks:
unpetrify-ref: v231
build-depends:
- systemd
+- name: libarchive
+ morph: strata/foundation/libarchive.morph
+ repo: upstream:libarchive
+ ref: 19f23e191f9d3e1dd2a518735046100419965804
+ unpetrify-ref: v3.1.2
diff --git a/strata/genivi/libarchive.morph b/strata/foundation/libarchive.morph
index bf840f58..bf840f58 100644
--- a/strata/genivi/libarchive.morph
+++ b/strata/foundation/libarchive.morph
diff --git a/strata/genivi.morph b/strata/genivi.morph
index 0195de87..b0442120 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -87,11 +87,6 @@ chunks:
build-depends:
- DLT-daemon
- persistence-client-library
-- name: libarchive
- morph: strata/genivi/libarchive.morph
- repo: upstream:libarchive
- ref: 19f23e191f9d3e1dd2a518735046100419965804
- unpetrify-ref: v3.1.2
- name: persistence-administrator
morph: strata/genivi/persistence-administrator.morph
repo: upstream:genivi/persistence-administrator
@@ -100,7 +95,6 @@ chunks:
build-depends:
- persistence-common-object
- DLT-daemon
- - libarchive
- node-state-manager
- name: node-health-monitor
repo: upstream:genivi/node-health-monitor
diff --git a/strata/gnome.morph b/strata/gnome.morph
index 39310946..5581747d 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -627,11 +627,6 @@ chunks:
build-depends:
- libcanberra
- libnotify
-- name: libarchive
- morph: strata/gnome/libarchive.morph
- repo: upstream:libarchive
- ref: 19f23e191f9d3e1dd2a518735046100419965804
- unpetrify-ref: v3.1.2
- name: gcab
repo: upstream:gnome/gcab
ref: e57dd3d1ddb0da91df9188c2a98d59d1050ac6cb
@@ -647,7 +642,6 @@ chunks:
build-system: autotools
build-depends:
- gcab
- - libarchive
- name: gnome-color-manager
morph: strata/gnome/gnome-color-manager.morph
repo: upstream:gnome/gnome-color-manager
diff --git a/strata/gnome/libarchive.morph b/strata/gnome/libarchive.morph
deleted file mode 100644
index bf840f58..00000000
--- a/strata/gnome/libarchive.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: libarchive
-kind: chunk
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --disable-acl