Merge branch 'baserock/richardmaw/S8564/ro-staging-area' into baserock/build-essential

Reviewed-by: Lars Wirzenius

6 files changed, 49 insertions, 79 deletions

diff --git a/binutils.morph b/binutils.morph
index aada71101a..95b6a780ce 100644
--- a/binutils.morph
+++ b/binutils.morph
@@ -1,8 +1,8 @@
-{
-    "name": "binutils",
-    "kind": "chunk",
-    "build-system": "autotools",
-    "configure-commands": [
-        "./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n  --with-system-zlib\n"
-    ]
-}
+name: binutils
+kind: chunk
+build-system: autotools
+
+configure-commands:
+    - |
+      ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+        --with-system-zlib
diff --git a/binutils.morph.yaml b/binutils.morph.yaml
deleted file mode 100644
index 95b6a780ce..0000000000
--- a/binutils.morph.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-    - |
-      ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
-        --with-system-zlib
diff --git a/stage1-binutils.morph b/stage1-binutils.morph
index 49c469fbdc..1274243542 100644
--- a/stage1-binutils.morph
+++ b/stage1-binutils.morph
@@ -1,8 +1,17 @@
-{
-    "name": "stage1-binutils",
-    "kind": "chunk",
-    "build-system": "autotools",
-    "configure-commands": [
-        "./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n  --build=$(sh config.guess) \\\n  --host=$(sh config.guess) \\\n  --target=$TARGET_STAGE1 \\\n  --with-sysroot=\"/\" --with-lib-path=\"=$PREFIX/lib\"\n"
-    ]
-}
+name: stage1-binutils
+kind: chunk
+build-system: autotools
+
+configure-commands:
+    # We set the sysroot location dynamically at runtime by passing -B to GCC,
+    # so we configure with sysroot=/. Setting the lib path is vital to avoid
+    # the tools we build linking to the libraries on the host system; the '='
+    # makes the path we give relative to the sysroot, which we can then set
+    # at runtime by passing -Wl,--sysroot to GCC.
+
+    - |
+      ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+        --build=$(sh config.guess) \
+        --host=$(sh config.guess) \
+        --target=$TARGET_STAGE1 \
+        --with-sysroot="/" --with-lib-path="=$PREFIX/lib"
diff --git a/stage1-binutils.morph.yaml b/stage1-binutils.morph.yaml
deleted file mode 100644
index 1274243542..0000000000
--- a/stage1-binutils.morph.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: stage1-binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-    # We set the sysroot location dynamically at runtime by passing -B to GCC,
-    # so we configure with sysroot=/. Setting the lib path is vital to avoid
-    # the tools we build linking to the libraries on the host system; the '='
-    # makes the path we give relative to the sysroot, which we can then set
-    # at runtime by passing -Wl,--sysroot to GCC.
-
-    - |
-      ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
-        --build=$(sh config.guess) \
-        --host=$(sh config.guess) \
-        --target=$TARGET_STAGE1 \
-        --with-sysroot="/" --with-lib-path="=$PREFIX/lib"
diff --git a/stage2-binutils.morph b/stage2-binutils.morph
index 21b8e1ebb4..bdf3181d19 100644
--- a/stage2-binutils.morph
+++ b/stage2-binutils.morph
@@ -1,12 +1,24 @@
-{
-    "name": "stage2-binutils",
-    "kind": "chunk",
-    "build-system": "autotools",
-    "configure-commands": [
-        "stage2-eglibc-fix-specs",
-        "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CXX=false\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n  --build=$(sh config.guess) \\\n  --host=$TARGET_STAGE1 \\\n  --target=$TARGET_STAGE1\n"
-    ],
-    "build-commands": [
-        "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake\n"
-    ]
-}
+name: stage2-binutils
+kind: chunk
+build-system: autotools
+
+configure-commands:
+    - |
+      export STAGE2_SYSROOT="$(dirname $(pwd))"
+      export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+      export CXX=false
+      export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+      ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
+        --build=$(sh config.guess) \
+        --host=$TARGET_STAGE1 \
+        --target=$TARGET_STAGE1
+
+build-commands:
+    # Nested configure scripts require that we set CPPFLAGS here as well
+    # (I don't think we should have to .. . at least in GCC, I think
+    # TARGET_CPPFLAGS may be the answer)
+    - |
+      export STAGE2_SYSROOT="$(dirname $(pwd))"
+      export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
+      export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
+      make
diff --git a/stage2-binutils.morph.yaml b/stage2-binutils.morph.yaml
deleted file mode 100644
index b45cca4522..0000000000
--- a/stage2-binutils.morph.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: stage2-binutils
-kind: chunk
-build-system: autotools
-
-configure-commands:
-    - stage2-eglibc-fix-specs
-
-    - |
-      export STAGE2_SYSROOT="$(dirname $(pwd))"
-      export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
-      export CXX=false
-      export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
-      ./configure --prefix="$PREFIX" --disable-nls --disable-werror \
-        --build=$(sh config.guess) \
-        --host=$TARGET_STAGE1 \
-        --target=$TARGET_STAGE1
-
-build-commands:
-    # Nested configure scripts require that we set CPPFLAGS here as well
-    # (I don't think we should have to .. . at least in GCC, I think
-    # TARGET_CPPFLAGS may be the answer)
-    - |
-      export STAGE2_SYSROOT="$(dirname $(pwd))"
-      export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
-      export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT"
-      make