From 442e2a6453ec380bf9d64f6be50e57d54ddf93d3 Mon Sep 17 00:00:00 2001
From: Daniel Firth <dan.firth@codethink.co.uk>
Date: Thu, 7 Nov 2013 17:33:48 +0000
Subject: Converted morphologies to yaml

---
 fhs-dirs.morph             | 114 +++++++++++++++++++------------------------
 fhs-dirs.morph.yaml        |  56 ---------------------
 stage2-fhs-dirs.morph      | 118 ++++++++++++++++++++-------------------------
 stage2-fhs-dirs.morph.yaml |  72 ---------------------------
 4 files changed, 102 insertions(+), 258 deletions(-)
 delete mode 100644 fhs-dirs.morph.yaml
 delete mode 100644 stage2-fhs-dirs.morph.yaml

diff --git a/fhs-dirs.morph b/fhs-dirs.morph
index 1ab6ede..aaf9ec6 100644
--- a/fhs-dirs.morph
+++ b/fhs-dirs.morph
@@ -1,64 +1,50 @@
-{
-    "name": "fhs-dirs",
-    "kind": "chunk",
-    "decription": "create the FHS 2.3 directory hierarchy and the usual files",
-    "install-commands": [
-        "sh ./create-fhs-dirs \"$DESTDIR\"",
-        "install -m 644 passwd \"$DESTDIR/etc/passwd\"",
-        "install -m 600 shadow \"$DESTDIR/etc/shadow\"",
-        "install -m 644 interfaces \"$DESTDIR/etc/network/interfaces\"",
-        "install -m 644 group \"$DESTDIR/etc/group\"",
-        "install -m 644 ld.so.conf \"$DESTDIR/etc/ld.so.conf\"",
-        "install -m 644 issue \"$DESTDIR/etc/issue\"",
-        "install -m 644 services \"$DESTDIR/etc/services\"",
-        "install -m 644 protocols \"$DESTDIR/etc/protocols\"",
-        "echo baserock > \"$DESTDIR\"/etc/hostname"
-    ],
-    "devices": [
-        {
-            "filename": "/dev/console",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 5,
-            "minor": 1,
-            "permissions": "0600"
-        },
-        {
-            "filename": "/dev/full",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 7,
-            "permissions": "0666"
-        },
-        {
-            "filename": "/dev/null",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 3,
-            "permissions": "0666"
-        },
-        {
-            "filename": "/dev/urandom",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 9,
-            "permissions": "0666"
-        },
-        {
-            "filename": "/dev/zero",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 5,
-            "permissions": "0666"
-        }
-    ]
-}
+name: fhs-dirs
+kind: chunk
+decription: create the FHS 2.3 directory hierarchy and the usual files
+install-commands:
+- sh ./create-fhs-dirs "$DESTDIR"
+- install -m 644 passwd "$DESTDIR/etc/passwd"
+- install -m 600 shadow "$DESTDIR/etc/shadow"
+- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
+- install -m 644 group "$DESTDIR/etc/group"
+- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
+- install -m 644 issue "$DESTDIR/etc/issue"
+- install -m 644 services "$DESTDIR/etc/services"
+- install -m 644 protocols "$DESTDIR/etc/protocols"
+- echo baserock > "$DESTDIR"/etc/hostname
+devices:
+- filename: /dev/console
+  uid: 0
+  gid: 0
+  type: c
+  major: 5
+  minor: 1
+  permissions: '0600'
+- filename: /dev/full
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 7
+  permissions: '0666'
+- filename: /dev/null
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 3
+  permissions: '0666'
+- filename: /dev/urandom
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 9
+  permissions: '0666'
+- filename: /dev/zero
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 5
+  permissions: '0666'
diff --git a/fhs-dirs.morph.yaml b/fhs-dirs.morph.yaml
deleted file mode 100644
index 5b8d22e..0000000
--- a/fhs-dirs.morph.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: fhs-dirs
-kind: chunk
-decription: create the FHS 2.3 directory hierarchy and the usual files
-
-install-commands:
-    - sh ./create-fhs-dirs "$DESTDIR"
-    - install -m 644 passwd "$DESTDIR/etc/passwd"
-    - install -m 600 shadow "$DESTDIR/etc/shadow"
-    - install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
-    - install -m 644 group "$DESTDIR/etc/group"
-    - install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
-    - install -m 644 issue "$DESTDIR/etc/issue"
-    - install -m 644 services "$DESTDIR/etc/services"
-    - install -m 644 protocols "$DESTDIR/etc/protocols"
-    - echo baserock > "$DESTDIR"/etc/hostname
-
-devices:
-    - filename: /dev/console
-      uid: 0
-      gid: 0
-      type: c
-      major: 5
-      minor: 1
-      permissions: '0600'
-
-    - filename: /dev/full
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 7
-      permissions: '0666'
-
-    - filename: /dev/null
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 3
-      permissions: '0666'
-
-    - filename: /dev/urandom
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 9
-      permissions: '0666'
-
-    - filename: /dev/zero
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 5
-      permissions: '0666'
diff --git a/stage2-fhs-dirs.morph b/stage2-fhs-dirs.morph
index 0c2f56b..1907a10 100644
--- a/stage2-fhs-dirs.morph
+++ b/stage2-fhs-dirs.morph
@@ -1,66 +1,52 @@
-{
-    "name": "stage2-fhs-dirs",
-    "kind": "chunk",
-    "decription": "create the FHS 2.3 directory hierarchy and the usual files",
-    "install-commands": [
-        "sh ./create-fhs-dirs \"$DESTDIR\"",
-        "rmdir \"$DESTDIR/bin\"",
-        "ln -s \"$PREFIX/bin\" \"$DESTDIR/bin\"",
-        "install -m 644 passwd \"$DESTDIR/etc/passwd\"",
-        "install -m 600 shadow \"$DESTDIR/etc/shadow\"",
-        "install -m 644 interfaces \"$DESTDIR/etc/network/interfaces\"",
-        "install -m 644 group \"$DESTDIR/etc/group\"",
-        "install -m 644 ld.so.conf \"$DESTDIR/etc/ld.so.conf\"",
-        "install -m 644 issue \"$DESTDIR/etc/issue\"",
-        "install -m 644 services \"$DESTDIR/etc/services\"",
-        "install -m 644 protocols \"$DESTDIR/etc/protocols\"",
-        "echo baserock > \"$DESTDIR\"/etc/hostname"
-    ],
-    "devices": [
-        {
-            "filename": "/dev/console",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 5,
-            "minor": 1,
-            "permissions": "0600"
-        },
-        {
-            "filename": "/dev/full",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 7,
-            "permissions": "0666"
-        },
-        {
-            "filename": "/dev/null",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 3,
-            "permissions": "0666"
-        },
-        {
-            "filename": "/dev/urandom",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 9,
-            "permissions": "0666"
-        },
-        {
-            "filename": "/dev/zero",
-            "uid": 0,
-            "gid": 0,
-            "type": "c",
-            "major": 1,
-            "minor": 5,
-            "permissions": "0666"
-        }
-    ]
-}
+name: stage2-fhs-dirs
+kind: chunk
+decription: create the FHS 2.3 directory hierarchy and the usual files
+install-commands:
+- sh ./create-fhs-dirs "$DESTDIR"
+- rmdir "$DESTDIR/bin"
+- ln -s "$PREFIX/bin" "$DESTDIR/bin"
+- install -m 644 passwd "$DESTDIR/etc/passwd"
+- install -m 600 shadow "$DESTDIR/etc/shadow"
+- install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
+- install -m 644 group "$DESTDIR/etc/group"
+- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
+- install -m 644 issue "$DESTDIR/etc/issue"
+- install -m 644 services "$DESTDIR/etc/services"
+- install -m 644 protocols "$DESTDIR/etc/protocols"
+- echo baserock > "$DESTDIR"/etc/hostname
+devices:
+- filename: /dev/console
+  uid: 0
+  gid: 0
+  type: c
+  major: 5
+  minor: 1
+  permissions: '0600'
+- filename: /dev/full
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 7
+  permissions: '0666'
+- filename: /dev/null
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 3
+  permissions: '0666'
+- filename: /dev/urandom
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 9
+  permissions: '0666'
+- filename: /dev/zero
+  uid: 0
+  gid: 0
+  type: c
+  major: 1
+  minor: 5
+  permissions: '0666'
diff --git a/stage2-fhs-dirs.morph.yaml b/stage2-fhs-dirs.morph.yaml
deleted file mode 100644
index a233b62..0000000
--- a/stage2-fhs-dirs.morph.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: stage2-fhs-dirs
-kind: chunk
-decription: create the FHS 2.3 directory hierarchy and the usual files
-
-install-commands:
-    # We tweak this a little for stage 2 because everything is installed into
-    # the one sysroot (/tools). We use symlinked versions of /bin, to make
-    # happy things that hardcode /bin/sh (i.e. everyone). There are probably
-    # assorted other hardcoded references to things in /bin so the symlink
-    # is a nice solution.
-
-    - sh ./create-fhs-dirs "$DESTDIR"
-    - rmdir "$DESTDIR/bin"
-    - ln -s "$PREFIX/bin" "$DESTDIR/bin"
-
-    # A symlinked /lib isn't an option though, because the eglibc chunk
-    # in stage 3 installs files there, and other chunks in stage 3 depend
-    # on it. To work around this, the stage2-gcc morphology manually
-    # creates symlinks for the libraries it installs into /tools/lib so
-    # that they can be found during stage 3 builds, and stage2-eglibc
-    # likewise installs a symlink for the program loader (ld.so).
-
-    - install -m 644 passwd "$DESTDIR/etc/passwd"
-    - install -m 600 shadow "$DESTDIR/etc/shadow"
-    - install -m 644 interfaces "$DESTDIR/etc/network/interfaces"
-    - install -m 644 group "$DESTDIR/etc/group"
-    - install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf"
-    - install -m 644 issue "$DESTDIR/etc/issue"
-    - install -m 644 services "$DESTDIR/etc/services"
-    - install -m 644 protocols "$DESTDIR/etc/protocols"
-    - echo baserock > "$DESTDIR"/etc/hostname
-
-devices:
-    - filename: /dev/console
-      uid: 0
-      gid: 0
-      type: c
-      major: 5
-      minor: 1
-      permissions: '0600'
-
-    - filename: /dev/full
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 7
-      permissions: '0666'
-
-    - filename: /dev/null
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 3
-      permissions: '0666'
-
-    - filename: /dev/urandom
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 9
-      permissions: '0666'
-
-    - filename: /dev/zero
-      uid: 0
-      gid: 0
-      type: c
-      major: 1
-      minor: 5
-      permissions: '0666'
-- 
cgit v1.2.1