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

8 files changed, 206 insertions, 31 deletions

diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph
index 4559c3a..e2459aa 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"
diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph
index 1224c08..72c276d 100644
--- a/bootstrap-pass2.morph
+++ b/bootstrap-pass2.morph
@@ -4,114 +4,143 @@
     "sources": [
         {
             "name": "fhs-dirs",
+            "repo": "baserock:fhs-dirs",
             "ref": "master"
         },
         {
             "name": "linux-api-headers",
-            "repo": "linux",
-            "ref": "baserock/morph"
+            "repo": "upstream:linux",
+            "ref": "baserock/3.2-headers"
         },
         {
             "name": "eglibc",
             "morph": "eglibc",
-            "repo": "eglibc2",
+            "repo": "upstream:eglibc2",
             "ref": "baserock/2.15-morph"
         },
         {
             "name": "zlib",
+            "repo": "upstream:zlib",
             "ref": "baserock/morph"
         },
         {
             "name": "binutils",
+            "repo": "upstream:binutils",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gcc",
-            "repo": "gcc-tarball",
+            "repo": "upstream:gcc-tarball",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "busybox",
+            "repo": "upstream:busybox",
             "ref": "baserock/morph"
         },
         {
             "name": "ncurses",
+            "repo": "upstream:ncurses",
             "ref": "baserock/morph"
         },
         {
+            "name": "util-linux",
+            "repo": "upstream:util-linux",
+            "ref": "baserock/bootstrap"
+        },
+        {
             "name": "gperf",
+            "repo": "upstream:gperf",
             "ref": "baserock/morph"
         },
         {
             "name": "coreutils",
+            "repo": "upstream:coreutils",
             "ref": "rm/no-bb-overlap/bootstrap-pass2"
         },
         {
             "name": "m4",
+            "repo": "upstream:m4",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "bison",
+            "repo": "upstream:bison",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "patch",
+            "repo": "upstream:patch",
             "ref": "baserock/bootstrap-pass2"
         },
         {
             "name": "readline",
+            "repo": "upstream:readline",
             "ref": "baserock/morph"
         },
         {
             "name": "bash",
+            "repo": "upstream:bash",
             "ref": "baserock/morph"
         },
         {
             "name": "gdbm",
+            "repo": "upstream:gdbm",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "perl",
+            "repo": "upstream:perl",
             "ref": "baserock/morph"
         },
         {
             "name": "autoconf",
+            "repo": "upstream:autoconf",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "automake",
+            "repo": "upstream:automake",
             "ref": "baserock/morph"
         },
         {
             "name": "libtool",
+            "repo": "upstream:libtool",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gawk",
+            "repo": "upstream:gawk",
             "ref": "baserock/morph"
         },
         {
             "name": "help2man",
+            "repo": "upstream:help2man",
             "ref": "baserock/morph"
         },
         {
             "name": "flex",
+            "repo": "upstream:flex",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gettext",
+            "repo": "upstream:gettext",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "pkg-config",
+            "repo": "upstream:pkg-config",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "xz",
+            "repo": "upstream:xz",
             "ref": "baserock/morph"
         },
         {
             "name": "libexpat",
+            "repo": "upstream:libexpat",
             "ref": "baserock/morph",
             "build-depends": [
                 "autoconf",
@@ -120,6 +149,7 @@
         },
         {
             "name": "XML-Parser",
+            "repo": "upstream:XML-Parser",
             "ref": "master",
             "build-depends": [
                 "libexpat",
@@ -128,10 +158,12 @@
         },
         {
             "name": "intltool",
+            "repo": "upstream:intltool",
             "ref": "baserock/morph"
         },
         {
             "name": "gtk-doc-stub",
+            "repo": "upstream:gtk-doc-stub",
             "ref": "master",
             "build-depends": [
             ]
@@ -156,22 +188,27 @@
         },
         {
             "name": "groff",
+            "repo": "upstream:groff",
             "ref": "baserock/morph"
         },
         {
             "name": "make",
+            "repo": "upstream:make",
             "ref": "baserock/morph"
         },
         {
             "name": "texinfo-tarball",
+            "repo": "upstream:texinfo-tarball",
             "ref": "baserock/morph"
         },
         {
             "name": "openssl",
+            "repo": "upstream:openssl",
             "ref": "baserock/morph"
         },
         {
             "name": "curl",
+            "repo": "upstream:curl",
             "ref": "baserock/morph",
             "build-depends": [
                 "openssl"
@@ -179,10 +216,12 @@
         },
         {
             "name": "cpython",
+            "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7"
         },
         {
             "name": "cliapp",
+            "repo": "upstream:cliapp",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython"
@@ -190,6 +229,7 @@
         },
         {   
             "name": "linux-user-chroot",
+            "repo": "upstream:linux-user-chroot",
             "ref": "master",
             "build-depends": [
                 "busybox",
@@ -200,6 +240,7 @@
         },
         {
             "name": "git",
+            "repo": "upstream:git",
             "ref": "baserock/morph",
             "build-depends": [
                 "curl",
diff --git a/devel-bootstrap.morph b/devel-bootstrap.morph
index e8352ca..0f38e94 100644
--- a/devel-bootstrap.morph
+++ b/devel-bootstrap.morph
@@ -4,213 +4,262 @@
     "sources": [
         {
             "name": "zlib",
+            "repo": "upstream:zlib",
             "ref": "baserock/morph"
         },
         {
             "name": "binutils",
+            "repo": "upstream:binutils",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gcc",
-            "repo": "gcc-tarball",
+            "repo": "upstream:gcc-tarball",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "sed",
+            "repo": "upstream:sed",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "bzip2",
+            "repo": "upstream:bzip2",
             "ref": "baserock/morph"
         },
         {
             "name": "ncurses",
+            "repo": "upstream:ncurses",
             "ref": "baserock/morph"
         },
         {
             "name": "util-linux",
+            "repo": "upstream:util-linux",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "psmisc",
+            "repo": "upstream:psmisc",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "e2fsprogs",
+            "repo": "upstream:e2fsprogs",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gperf",
+            "repo": "upstream:gperf",
             "ref": "baserock/morph"
         },
         {
             "name": "coreutils",
+            "repo": "upstream:coreutils",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "iana-etc",
+            "repo": "upstream:iana-etc",
             "ref": "baserock/morph"
         },
         {
             "name": "m4",
+            "repo": "upstream:m4",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "bison",
+            "repo": "upstream:bison",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "procps",
+            "repo": "upstream:procps",
             "ref": "baserock/morph"
         },
         {
             "name": "grep",
+            "repo": "upstream:grep",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "readline",
+            "repo": "upstream:readline",
             "ref": "baserock/morph"
         },
         {
             "name": "bash",
+            "repo": "upstream:bash",
             "ref": "baserock/morph"
         },
         {
             "name": "gdbm",
+            "repo": "upstream:gdbm",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "perl",
+            "repo": "upstream:perl",
             "ref": "baserock/morph"
         },
         {
             "name": "autoconf",
+            "repo": "upstream:autoconf",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "automake",
+            "repo": "upstream:automake",
             "ref": "baserock/morph"
         },
         {
             "name": "libtool",
+            "repo": "upstream:libtool",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "diffutils",
+            "repo": "upstream:diffutils",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gawk",
+            "repo": "upstream:gawk",
             "ref": "baserock/morph"
         },
         {
             "name": "findutils",
+            "repo": "upstream:findutils",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "help2man",
+            "repo": "upstream:help2man",
             "ref": "baserock/morph"
         },
         {
             "name": "flex",
+            "repo": "upstream:flex",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "gettext",
+            "repo": "upstream:gettext",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "pkg-config",
+            "repo": "upstream:pkg-config",
             "ref": "baserock/bootstrap"
         },
         {
             "name": "groff",
+            "repo": "upstream:groff",
             "ref": "baserock/morph"
         },
         {
             "name": "rsync",
+            "repo": "upstream:rsync",
             "ref": "baserock/morph"
         },
         {
             "name": "gzip",
+            "repo": "upstream:gzip",
             "ref": "baserock/morph"
         },
         {
             "name": "libpipeline",
+            "repo": "upstream:libpipeline",
             "ref": "baserock/morph"
         },
         {
             "name": "gmp",
+            "repo": "upstream:gmp",
             "ref": "baserock/morph"
         },
         {
             "name": "libnettle",
-            "repo": "lsh",
+            "repo": "upstream:lsh",
             "ref": "baserock/morph"
         },
         {
             "name": "gnutls",
+            "repo": "upstream:gnutls",
             "ref": "baserock/morph"
         },
         {
             "name": "wget",
+            "repo": "upstream:wget",
             "ref": "baserock/morph"
         },
         {
             "name": "make",
+            "repo": "upstream:make",
             "ref": "baserock/morph"
         },
         {
             "name": "xz",
+            "repo": "upstream:xz",
             "ref": "baserock/morph"
         },
         {
             "name": "patch",
+            "repo": "upstream:patch",
             "ref": "baserock/morph"
         },
         {
             "name": "tar",
+            "repo": "upstream:tar",
             "ref": "baserock/morph"
         },
         {
             "name": "texinfo-tarball",
+            "repo": "upstream:texinfo-tarball",
             "ref": "baserock/morph"
         },
         {
             "name": "vim",
+            "repo": "upstream:vim",
             "ref": "baserock/morph"
         },
         {
             "name": "libexpat",
+            "repo": "upstream:libexpat",
             "ref": "baserock/morph"
         },
         {
             "name": "curl",
+            "repo": "upstream:curl",
             "ref": "baserock/morph"
         },
         {
             "name": "openssl",
+            "repo": "upstream:openssl",
             "ref": "baserock/morph"
         },
         {
             "name": "cpython",
+            "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7"
         },
         {
             "name": "cliapp",
+            "repo": "upstream:cliapp",
             "ref": "baserock/morph"
         },
         {
             "name": "git",
+            "repo": "upstream:git",
             "ref": "baserock/morph"
         },
         {
             "name": "sudo",
+            "repo": "upstream:sudo",
             "ref": "baserock/morph"
         },
         {
             "name": "busybox-devel",
-            "repo": "busybox",
+            "repo": "upstream:busybox",
             "ref": "baserock/morph"
         }
     ]
diff --git a/devel.morph b/devel.morph
index a5f587f..164c5ff 100644
--- a/devel.morph
+++ b/devel.morph
@@ -4,114 +4,138 @@
     "sources": [
         {
             "name": "linux-api-headers",
-            "repo": "linux",
+            "repo": "upstream:linux",
             "ref": "baserock/morph"
         },
         {
             "name": "eglibc",
-            "repo": "eglibc2",
+            "repo": "upstream:eglibc2",
             "morph": "eglibc",
             "ref": "baserock/2.15-morph"
         },
         {
             "name": "binutils",
+            "repo": "upstream:binutils",
             "ref": "baserock/morph"
         },
         {
             "name": "gmp",
+            "repo": "upstream:gmp",
             "ref": "baserock/morph"
         },
         {
             "name": "mpfr",
+            "repo": "upstream:mpfr",
             "ref": "baserock/morph"
         },
         {
             "name": "mpc",
+            "repo": "upstream:mpc",
             "ref": "baserock/morph"
         },
         {
             "name": "gcc",
-            "repo": "gcc-tarball",
+            "repo": "upstream:gcc-tarball",
             "ref": "baserock/morph"
         },
         {
             "name": "patch",
+            "repo": "upstream:patch",
             "ref": "baserock/morph"
         },
         {
             "name": "ncurses",
+            "repo": "upstream:ncurses",
             "ref": "baserock/morph"
         },
         {
             "name": "gperf",
+            "repo": "upstream:gperf",
             "ref": "baserock/morph"
         },
         {
             "name": "xz",
+            "repo": "upstream:xz",
             "ref": "baserock/morph"
         },
         {
             "name": "coreutils",
+            "repo": "upstream:coreutils",
             "ref": "rm/no-bb-overlap/morph"
         },
         {
             "name": "m4",
+            "repo": "upstream:m4",
             "ref": "baserock/morph"
         },
         {
             "name": "bison",
+            "repo": "upstream:bison",
             "ref": "baserock/morph"
         },
         {
             "name": "readline",
+            "repo": "upstream:readline",
             "ref": "baserock/morph"
         },
         {
             "name": "bash",
+            "repo": "upstream:bash",
             "ref": "baserock/morph"
         },
         {
             "name": "gdbm",
+            "repo": "upstream:gdbm",
             "ref": "baserock/morph"
         },
         {
             "name": "perl",
+            "repo": "upstream:perl",
             "ref": "baserock/morph"
         },
         {
             "name": "autoconf",
+            "repo": "upstream:autoconf"
             "ref": "baserock/morph"
         },
         {
             "name": "automake",
+            "repo": "upstream:automake"
             "ref": "baserock/morph"
         },
         {
             "name": "libtool",
+            "repo": "upstream:libtool"
             "ref": "baserock/morph"
         },
         {
             "name": "gawk",
+            "repo": "upstream:gawk"
             "ref": "baserock/morph"
         },
         {
             "name": "help2man",
+            "repo": "upstream:help2man",
             "ref": "baserock/morph"
         },
         {
             "name": "flex",
+            "repo": "upstream:flex",
             "ref": "baserock/morph"
         },
         {
             "name": "gettext",
+            "upstream:gettext",
             "ref": "baserock/morph"
         },
         {
             "name": "pkg-config",
+            "repo": "upstream:pkg-config",
             "ref": "baserock/morph"
         },
         {
             "name": "linux-user-chroot",
+            "repo": "upstream:linux-user-chroot",
             "ref": "master",
             "build-depends": [
                 "autoconf",
@@ -121,26 +145,32 @@
         },
         {
             "name": "groff",
+            "repo": "upstream:groff",
             "ref": "baserock/morph"
         },
         {
             "name": "make",
+            "repo": "upstream:make",
             "ref": "baserock/morph"
         },
         {
             "name": "texinfo-tarball",
+            "repo": "upstream:texinfo-tarball",
             "ref": "baserock/morph"
         },
         {
             "name": "vim",
+            "repo": "upstream:vim",
             "ref": "baserock/morph"
         },
         {
             "name": "openssl",
+            "repo": "upstream:openssl",
             "ref": "baserock/morph"
         },
         {
             "name": "curl",
+            "repo": "upstream:curl",
             "ref": "baserock/morph",
             "build-depends": [
                 "openssl"
@@ -148,10 +178,12 @@
         },
         {
             "name": "cpython",
+            "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7"
         },
         {
             "name": "cliapp",
+            "repo": "upstream:cliapp",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython"
@@ -159,6 +191,7 @@
         },
         {
             "name": "git",
+            "repo": "upstream:git",
             "ref": "baserock/morph",
             "build-depends": [
                 "openssl",
@@ -168,6 +201,7 @@
         },
         {
             "name": "openssh",
+            "repo": "upstream:openssh",
             "ref": "baserock/morph",
             "build-depends": [
                 "autoconf",
@@ -179,6 +213,7 @@
         },
         {
             "name": "nasm",
+            "repo": "upstream:nasm",
             "ref": "baserock/morph",
             "build-depends": [
                 "autoconf"
@@ -186,6 +221,7 @@
         },
         {
             "name": "python-setuptools",
+            "repo": "upstream:python-setuptools",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython"
@@ -193,6 +229,7 @@
         },
         {
             "name": "python-coveragepy",
+            "repo": "upstream:python-coveragepy",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython",
@@ -201,6 +238,7 @@
         },
         {
             "name": "python-coverage-test-runner",
+            "repo": "upstream:python-coverage-test-runner",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython",
@@ -209,6 +247,7 @@
         },
         {
             "name": "python-ttystatus",
+            "repo": "upstream:python-ttystatus",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython"
@@ -216,6 +255,7 @@
         },
         {
             "name": "cmdtest",
+            "repo": "upstream:cmdtest",
             "ref": "baserock/morph",
             "build-depends": [
                 "cpython",
@@ -224,10 +264,12 @@
         },
         {
             "name": "libxml2",
+            "repo": "upstream:libxml2",
             "ref": "master"
         },
         {
             "name": "libxslt",
+            "repo": "upstream:libxslt",
             "ref": "master",
             "build-depends": [
                 "libxml2"
@@ -235,10 +277,12 @@
         },
         {
             "name": "XML-Parser",
+            "repo": "upstream:XML-Parser",
             "ref": "master"
         },
         {
             "name": "intltool",
+            "repo": "upstream:intltool",
             "ref": "baserock/morph",
             "build-depends": [
                 "perl",
diff --git a/foundation.morph b/foundation.morph
index 5b00d6f..72e6220 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -4,17 +4,19 @@
     "sources": [
         {
             "name": "fhs-dirs",
+            "repo": "baserock:fhs-dirs",
             "ref": "master"
         },
         {
             "name": "eglibc",
             "morph": "eglibc",
-            "repo": "eglibc2",
+            "repo": "upstream:eglibc2",
             "ref": "baserock/2.15-morph",
             "build-depends": []
         },
         {
             "name": "zlib",
+            "repo": "upstream:zlib",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -22,6 +24,7 @@
         },
         {
             "name": "busybox",
+            "repo": "upstream:busybox",
             "ref":  "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -29,6 +32,7 @@
         },
         {
             "name": "kmod",
+            "repo": "upstream:kmod",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -36,6 +40,7 @@
         },
         {
             "name": "attr",
+            "repo": "upstream:attr",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -43,6 +48,7 @@
         },
         {
             "name": "util-linux",
+            "repo": "upstream:util-linux",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -50,6 +56,7 @@
         },
         {
             "name": "libcap2",
+            "repo": "upstream:libcap2",
             "ref": "baserock/morph",
             "build-depends": [
                 "attr"
@@ -57,6 +64,7 @@
         },
         {
             "name": "btrfs-progs",
+            "repo": "upstream:btrfs-progs",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -64,6 +72,7 @@
         },
         {
             "name": "tbdiff",
+            "repo": "baserock:tbdiff",
             "ref": "master",
             "build-depends": [
                 "eglibc",
@@ -72,7 +81,7 @@
         },
         {
             "name": "libusb",
-            "repo": "git://212.116.89.126/libusb.git",
+            "repo": "git://git.libusb.org/libusb.git",
             "ref": "master",
             "build-depends": [
                 "eglibc"
@@ -88,6 +97,7 @@
         },
         {
             "name": "pciutils",
+            "repo": "upstream:pciutils",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -95,6 +105,7 @@
         },
         {
             "name": "libffi",
+            "repo": "upstream:libffi",
             "ref": "master",
             "build-depends": [
                 "eglibc"
@@ -102,6 +113,7 @@
         },
         {
             "name": "libexpat",
+            "repo": "upstream:libexpat",
             "ref": "baserock/morph",
             "build-depends": [
                 "eglibc"
@@ -109,6 +121,7 @@
         },
         {
             "name": "glib",
+            "repo": "upstream:glib",
             "ref": "master",
             "build-depends": [
                 "libffi"
@@ -116,6 +129,7 @@
         },
         {
             "name": "dbus",
+            "repo": "upstream:dbus",
             "ref": "baserock/morph",
             "build-depends": [
                 "libexpat",
@@ -124,6 +138,7 @@
         },
         {
             "name": "gobject-introspection",
+            "repo": "upstream:gobject-introspection",
             "ref": "baserock/morph",
             "build-depends": [
                 "glib"
@@ -131,6 +146,7 @@
         },
         {
             "name": "systemd",
+            "repo": "upstream:systemd",
             "ref": "rm/forwardpatch",
             "build-depends": [
                 "dbus",
diff --git a/imx53-bsp.morph b/imx53-bsp.morph
index e5f74eb..49cf029 100644
--- a/imx53-bsp.morph
+++ b/imx53-bsp.morph
@@ -4,6 +4,7 @@
     "sources": [
         {
             "name": "linux",
+            "repo": "upstream:linux",
             "ref": "baserock/morph"
         }
     ]
diff --git a/morph-cache-server.morph b/morph-cache-server.morph
index 72c6ada..8a9285e 100644
--- a/morph-cache-server.morph
+++ b/morph-cache-server.morph
@@ -4,27 +4,32 @@
     "sources": [
         {
             "name": "git",
+            "repo": "upstream:git",
             "ref": "baserock/morph"
         },
         {
             "name": "openssl",
+            "repo": "upstream:openssl",
             "ref": "baserock/morph"
         },
         {
             "name": "cpython",
+            "repo": "upstream:cpython",
             "ref": "baserock/morph-2.7"
         },
         {
             "name": "cliapp",
+            "repo": "upstream:cliapp",
             "ref": "baserock/morph"
         },
         {
             "name": "bottle",
-            "repo": "defnull/bottle.git",
+            "repo": "upstream:defnull/bottle.git",
             "ref": "master"
         },
         {
             "name": "morph-cache-server",
+            "repo": "baserock:morph-cache-server",
             "ref": "master"
         }
     ]
diff --git a/x86_64-generic-bsp.morph b/x86_64-generic-bsp.morph
index 1fe46e5..9fb268c 100644
--- a/x86_64-generic-bsp.morph
+++ b/x86_64-generic-bsp.morph
@@ -4,10 +4,12 @@
     "sources": [
         {
             "name": "linux",
+            "repo": "upstream:linux",
             "ref": "baserock/morph"
         },
         {
             "name": "syslinux",
+            "repo": "upstream:syslinux",
             "ref": "baserock/morph",
             "build-depends": []
         }