Merge remote-tracking branch 'origin/master' into rm/systemd

1 files changed, 35 insertions, 18 deletions

diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph
index 4559c3a2..e2459aa1 100644
--- a/bootstrap-pass1.morph
+++ b/bootstrap-pass1.morph
@@ -3,90 +3,103 @@
     "kind": "stratum",
     "sources": [
         {
-            "repo": "binutils-redhat",
+            "repo": "upstream:binutils-redhat",
             "ref": "baserock/bootstrap-pass1",
             "name": "binutils-1"
         },
         {
-            "repo": "gcc-tarball",
+            "repo": "upstream:gcc-tarball",
             "ref": "baserock/bootstrap-pass1-1",
             "name": "gcc-bootstrap-pass1-1"
         },
         {
-            "repo": "linux",
-            "ref": "baserock/morph",
+            "repo": "upstream:linux",
+            "ref": "baserock/3.2-headers",
             "name": "linux-api-headers"
         },
         {
-            "repo": "eglibc2",
+            "repo": "upstream:eglibc2",
             "ref": "baserock/2.15-bootstrap-pass1",
             "name": "eglibc"
         },
         {
-            "repo": "binutils-redhat",
+            "repo": "upstream:binutils-redhat",
             "ref": "baserock/bootstrap-pass1",
             "name": "binutils-2"
         },
         {
-            "repo": "gcc-tarball",
+            "repo": "upstream:gcc-tarball",
             "ref": "baserock/bootstrap-pass1-2",
             "name": "gcc-bootstrap-pass1-2"
         },
         {
+            "repo": "upstream:zlib",
             "ref": "baserock/morph",
             "name": "zlib"
         },
         {
+            "repo": "upstream:ncurses",
             "ref": "baserock/bootstrap-pass1",
             "name": "ncurses"
         },
         {
+            "repo": "upstream:bash",
             "ref": "baserock/bootstrap-pass1",
             "name": "bash"
         },
         {
+            "repo": "upstream:busybox",
             "ref": "baserock/morph",
             "name": "busybox"
         },
         {
-            "name": "xz",
-            "ref": "baserock/morph"
-        },
-        {
-            "name": "patch",
-            "ref": "baserock/bootstrap-pass1"
-        },
-        {
+            "repo": "upstream:gawk",
             "ref": "baserock/morph",
             "name": "gawk"
         },
         {
+            "repo": "upstream:gettext",
             "ref": "baserock/bootstrap",
             "name": "gettext"
         },
         {
+        {
+            "repo": "upstream:m4",
             "ref": "baserock/bootstrap",
             "name": "m4"
         },
         {
+            "repo": "upstream:make",
             "ref": "baserock/morph",
             "name": "make"
         },
         {
+            "repo": "upstream:patch",
+            "ref": "baserock/bootstrap-pass1",
+            "name": "patch"
+        },
+        {
+            "repo": "upstream:perl",
             "ref": "baserock/morph",
             "name": "perl"
         },
         {
-            "repo": "texinfo-tarball",
+            "repo": "upstream:texinfo-tarball",
             "ref": "baserock/bootstrap-pass1",
             "name": "texinfo-tarball"
         },
         {
+            "repo": "upstream:xz",
+            "ref": "baserock/morph",
+            "name": "xz"
+        },
+        {
+            "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7",
             "name": "cpython"
         },
         {
-            "repo": "cliapp",
+            "repo": "upstream:cliapp",
             "ref": "baserock/morph",
             "name": "cliapp",
             "build-depends": [
@@ -95,10 +108,12 @@
         },
         {
             "name": "openssl",
+            "repo": "upstream:openssl",
             "ref": "baserock/morph"
         },
         {
             "name": "curl",
+            "repo": "upstream:curl",
             "ref": "baserock/morph",
             "build-depends": [
                 "openssl"
@@ -106,10 +121,11 @@
         },
         {
             "name": "libexpat",
+            "repo": "upstream:libexpat",
             "ref": "baserock/morph"
         },
         {
-            "repo": "git",
+            "repo": "upstream:git",
             "ref": "baserock/morph",
             "name": "git",
             "build-depends": [
@@ -121,6 +137,7 @@
         },
         {   
             "name": "linux-user-chroot",
+            "repo": "upstream:linux-user-chroot",
             "ref": "baserock/bootstrap",
             "build-depends": [
                 "gcc-bootstrap-pass1-2"