summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-22 14:01:03 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-26 13:46:18 +0000
commitb3f461c2c9e9868e6a7f25930a4afb1769192d25 (patch)
treecc857cd42cc701966af1a042162aeeca9b9306f5
parent1a4cdcf32aa65d0130dae882a7a13e69162274cb (diff)
downloaddefinitions-b3f461c2c9e9868e6a7f25930a4afb1769192d25.tar.gz
Rename coreutils to gnuutils and add findutils to it
Change-Id: I314e4cc7f02fbb2cb3ed7efbd1616c701551fac7
-rw-r--r--strata/foundation.morph2
-rw-r--r--strata/gnuutils.morph (renamed from strata/coreutils-common.morph)15
-rw-r--r--strata/gnuutils/coreutils.morph (renamed from strata/coreutils-common/coreutils.morph)0
-rw-r--r--strata/gnuutils/diff.morph (renamed from strata/coreutils-common/diff.morph)0
-rw-r--r--strata/gnuutils/findutils.morph5
-rw-r--r--strata/gnuutils/sed.morph (renamed from strata/coreutils-common/sed.morph)0
-rw-r--r--strata/gnuutils/tar.morph (renamed from strata/coreutils-common/tar.morph)0
-rw-r--r--systems/devel-system-armv7-chroot.morph4
-rw-r--r--systems/devel-system-armv7-highbank.morph4
-rw-r--r--systems/devel-system-armv7-versatile.morph4
-rw-r--r--systems/devel-system-armv7-wandboard.morph4
-rw-r--r--systems/devel-system-armv7b-chroot.morph4
-rw-r--r--systems/devel-system-armv7b-highbank.morph4
-rw-r--r--systems/devel-system-armv7lhf-chroot.morph4
-rw-r--r--systems/devel-system-armv7lhf-highbank.morph4
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph4
-rw-r--r--systems/devel-system-armv7lhf-wandboard.morph4
-rw-r--r--systems/devel-system-armv8b64.morph4
-rw-r--r--systems/devel-system-armv8l64.morph4
-rw-r--r--systems/devel-system-ppc64-chroot.morph4
-rw-r--r--systems/devel-system-ppc64-generic.morph4
-rw-r--r--systems/devel-system-x86_32-chroot.morph4
-rw-r--r--systems/devel-system-x86_32-generic.morph4
-rw-r--r--systems/devel-system-x86_64-chroot.morph4
-rw-r--r--systems/devel-system-x86_64-generic.morph4
-rw-r--r--systems/devel-system-x86_64-vagrant.morph4
-rw-r--r--systems/openstack-system-x86_64.morph4
-rw-r--r--systems/weston-system-armv7lhf-jetson.morph4
-rw-r--r--systems/weston-system-x86_64-generic.morph4
29 files changed, 60 insertions, 50 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 1be267ac..9a9a2b6f 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -2,7 +2,7 @@ name: foundation
kind: stratum
description: Basic userland runtime system
build-depends:
-- morph: strata/coreutils-common.morph
+- morph: strata/gnuutils.morph
chunks:
- name: bash-completion
repo: upstream:bash-completion
diff --git a/strata/coreutils-common.morph b/strata/gnuutils.morph
index 430e3fe5..60a09df1 100644
--- a/strata/coreutils-common.morph
+++ b/strata/gnuutils.morph
@@ -1,4 +1,4 @@
-name: coreutils-common
+name: gnuutils
kind: stratum
description: |
We need to split this so we can build stuff using coreutils but we can not
@@ -8,28 +8,33 @@ build-depends:
- morph: strata/core.morph
chunks:
- name: coreutils
- morph: strata/coreutils-common/coreutils.morph
+ morph: strata/gnuutils/coreutils.morph
repo: upstream:coreutils
ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
unpetrify-ref: baserock/8.23
- name: sed
- morph: strata/coreutils-common/sed.morph
+ morph: strata/gnuutils/sed.morph
repo: upstream:sed
ref: ed4b1d7c04f92b330b940d4f0d02cd51d2473ce9
unpetrify-ref: baserock/morph
build-depends:
- coreutils
- name: diff
- morph: strata/coreutils-common/diff.morph
+ morph: strata/gnuutils/diff.morph
repo: upstream:diffutils
ref: bd86eb1a1e87ab85a7c8dbb658fa829ce69c252e
unpetrify-ref: baserock/v3.3
build-depends:
- coreutils
- name: tar
- morph: strata/coreutils-common/tar.morph
+ morph: strata/gnuutils/tar.morph
repo: upstream:tar
ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37
unpetrify-ref: baserock/release_1_28
build-depends:
- coreutils
+- name: findutils
+ morph: strata/gnuutils/findutils.morph
+ repo: upstream:findutils
+ ref: ee6b25541336f9d74624ca814538ddc8c67f0732
+ unpetrify-ref: baserock/v4.5.14
diff --git a/strata/coreutils-common/coreutils.morph b/strata/gnuutils/coreutils.morph
index 19542d79..19542d79 100644
--- a/strata/coreutils-common/coreutils.morph
+++ b/strata/gnuutils/coreutils.morph
diff --git a/strata/coreutils-common/diff.morph b/strata/gnuutils/diff.morph
index 346f8635..346f8635 100644
--- a/strata/coreutils-common/diff.morph
+++ b/strata/gnuutils/diff.morph
diff --git a/strata/gnuutils/findutils.morph b/strata/gnuutils/findutils.morph
new file mode 100644
index 00000000..c9ba5ab6
--- /dev/null
+++ b/strata/gnuutils/findutils.morph
@@ -0,0 +1,5 @@
+name: findutils
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./import-gnulib.sh -d gnulib
diff --git a/strata/coreutils-common/sed.morph b/strata/gnuutils/sed.morph
index 92f6fa51..92f6fa51 100644
--- a/strata/coreutils-common/sed.morph
+++ b/strata/gnuutils/sed.morph
diff --git a/strata/coreutils-common/tar.morph b/strata/gnuutils/tar.morph
index 17d6a597..17d6a597 100644
--- a/strata/coreutils-common/tar.morph
+++ b/strata/gnuutils/tar.morph
diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph
index 620d8fb9..c0a4bf78 100644
--- a/systems/devel-system-armv7-chroot.morph
+++ b/systems/devel-system-armv7-chroot.morph
@@ -51,8 +51,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph
index a92561fe..3dda5897 100644
--- a/systems/devel-system-armv7-highbank.morph
+++ b/systems/devel-system-armv7-highbank.morph
@@ -54,8 +54,8 @@ strata:
morph: strata/ostree-core.morph
- name: unionfs-fuse-group
morph: strata/unionfs-fuse-group.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph
index 50588f66..9a882192 100644
--- a/systems/devel-system-armv7-versatile.morph
+++ b/systems/devel-system-armv7-versatile.morph
@@ -52,8 +52,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph
index e2c9e175..adbb7e3b 100644
--- a/systems/devel-system-armv7-wandboard.morph
+++ b/systems/devel-system-armv7-wandboard.morph
@@ -52,8 +52,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph
index 34bc04f1..d7db04a2 100644
--- a/systems/devel-system-armv7b-chroot.morph
+++ b/systems/devel-system-armv7b-chroot.morph
@@ -43,8 +43,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph
index cddd5ff4..5b172499 100644
--- a/systems/devel-system-armv7b-highbank.morph
+++ b/systems/devel-system-armv7b-highbank.morph
@@ -50,8 +50,8 @@ strata:
morph: strata/ostree-core.morph
- name: unionfs-fuse-group
morph: strata/unionfs-fuse-group.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph
index a8d46bd1..c70b8899 100644
--- a/systems/devel-system-armv7lhf-chroot.morph
+++ b/systems/devel-system-armv7lhf-chroot.morph
@@ -51,8 +51,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph
index 9722644c..6135e3c0 100644
--- a/systems/devel-system-armv7lhf-highbank.morph
+++ b/systems/devel-system-armv7lhf-highbank.morph
@@ -57,8 +57,8 @@ strata:
morph: strata/ostree-core.morph
- name: unionfs-fuse-group
morph: strata/unionfs-fuse-group.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index e3d1843d..3ff52dc6 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -55,8 +55,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph
index a47df980..644c6f85 100644
--- a/systems/devel-system-armv7lhf-wandboard.morph
+++ b/systems/devel-system-armv7lhf-wandboard.morph
@@ -55,8 +55,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph
index 6c5f23ee..662269d7 100644
--- a/systems/devel-system-armv8b64.morph
+++ b/systems/devel-system-armv8b64.morph
@@ -54,8 +54,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph
index cd7a1e44..8e173c43 100644
--- a/systems/devel-system-armv8l64.morph
+++ b/systems/devel-system-armv8l64.morph
@@ -54,8 +54,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph
index b92073a9..fc36751c 100644
--- a/systems/devel-system-ppc64-chroot.morph
+++ b/systems/devel-system-ppc64-chroot.morph
@@ -49,8 +49,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph
index 4d81ff5c..e936d071 100644
--- a/systems/devel-system-ppc64-generic.morph
+++ b/systems/devel-system-ppc64-generic.morph
@@ -52,8 +52,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph
index 7eb4fc01..15fb2258 100644
--- a/systems/devel-system-x86_32-chroot.morph
+++ b/systems/devel-system-x86_32-chroot.morph
@@ -51,8 +51,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph
index 1fd44086..f64cd2b2 100644
--- a/systems/devel-system-x86_32-generic.morph
+++ b/systems/devel-system-x86_32-generic.morph
@@ -56,8 +56,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph
index 48f23cd0..826e7304 100644
--- a/systems/devel-system-x86_64-chroot.morph
+++ b/systems/devel-system-x86_64-chroot.morph
@@ -53,8 +53,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph
index b49964dd..74a6fadf 100644
--- a/systems/devel-system-x86_64-generic.morph
+++ b/systems/devel-system-x86_64-generic.morph
@@ -56,8 +56,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph
index c6a5f6fe..4404e0d7 100644
--- a/systems/devel-system-x86_64-vagrant.morph
+++ b/systems/devel-system-x86_64-vagrant.morph
@@ -54,8 +54,8 @@ strata:
morph: strata/libsoup-common.morph
- name: ostree-core
morph: strata/ostree-core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
configuration-extensions:
- set-hostname
- add-config-files
diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph
index 8ab38bee..1a6d416f 100644
--- a/systems/openstack-system-x86_64.morph
+++ b/systems/openstack-system-x86_64.morph
@@ -17,8 +17,8 @@ strata:
morph: strata/foundation.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
- name: devtools
morph: strata/devtools.morph
- name: tools
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index ccb2c3ee..f81d3f2d 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -7,8 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-jetson
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index 6cef12ff..c0067869 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -7,8 +7,8 @@ strata:
morph: strata/build-essential.morph
- name: core
morph: strata/core.morph
-- name: coreutils-common
- morph: strata/coreutils-common.morph
+- name: gnuutils
+ morph: strata/gnuutils.morph
- name: foundation
morph: strata/foundation.morph
- name: bsp-x86_64-generic