Fix repos to be upstream, rather than local

4 files changed, 28 insertions, 38 deletions

diff --git a/strata/bsp-x86_64-musl.morph b/strata/bsp-x86_64-musl.morph
index 5836c17e..bd3603ee 100644
--- a/strata/bsp-x86_64-musl.morph
+++ b/strata/bsp-x86_64-musl.morph
@@ -19,8 +19,8 @@ chunks:
   build-depends: []
 - name: syslinux
   morph: strata/bsp-x86_64-generic/syslinux.morph
-  repo: file:///src/workspace/syslinux
-  ref: 73d9cd6336489ee98efca35e9e94ff64feb952e1
-  unpetrify-ref: baserock/morph
+  repo: upstream:syslinux
+  ref: de528dd1d9e1aa53cb484fe32706f9c8e4c2763c
+  unpetrify-ref: baserock/4.06-musl
   build-depends:
   - nasm
diff --git a/strata/build-essential-musl.morph b/strata/build-essential-musl.morph
index 38f1a1be..9d77bf1f 100644
--- a/strata/build-essential-musl.morph
+++ b/strata/build-essential-musl.morph
@@ -34,8 +34,8 @@ description: |
 chunks:
 - name: stage1-binutils-musl
   morph: strata/build-essential-musl/stage1-binutils.morph
-  repo: file:///src/workspace/binutils-redhat
-  ref: 090295d0519c747c989eb628e099128d6fb26f33
+  repo: upstream:binutils-redhat
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
   unpetrify-ref: baserock/build-essential
   build-depends: []
   build-mode: bootstrap
@@ -43,8 +43,8 @@ chunks:
 
 - name: stage1-gcc-musl
   morph: strata/build-essential-musl/stage1-gcc.morph
-  repo: file:///src/workspace/gcc-tarball
-  ref: 164c79f856e26a0f7577f91a8cc32d61b848b935
+  repo: upstream:gcc-tarball
+  ref: 64b6dc020e879808a0c8f2271585e2f5ae45372a
   unpetrify-ref: baserock/build-essential-musl
   build-depends:
   - stage1-binutils-musl
@@ -64,8 +64,8 @@ chunks:
 
 - name: stage2-musl
   morph: strata/build-essential-musl/stage2-musl.morph
-  repo: file:///src/workspace/musl
-  ref: d8b6bef220f526528f13207108ed8a89dc348975
+  repo: upstream:musl
+  ref: c7ac6a91178945b79dbbce5ed09e55062e67f7db
   unpetrify-ref: baserock/1.1.6
   build-depends:
   - stage1-binutils-musl
@@ -76,8 +76,8 @@ chunks:
 
 - name: stage2-libstdc++-musl
   morph: strata/build-essential-musl/stage2-libstdc++.morph
-  repo: file:///src/workspace/gcc-tarball
-  ref: 164c79f856e26a0f7577f91a8cc32d61b848b935
+  repo: upstream:gcc-tarball
+  ref: 64b6dc020e879808a0c8f2271585e2f5ae45372a
   unpetrify-ref: baserock/build-essential-musl
   build-depends:
   - stage1-binutils-musl
@@ -88,8 +88,8 @@ chunks:
 
 - name: stage2-binutils-musl
   morph: strata/build-essential-musl/stage2-binutils.morph
-  repo: file:///src/workspace/binutils-redhat
-  ref: 090295d0519c747c989eb628e099128d6fb26f33
+  repo: upstream:binutils-redhat
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils-musl
@@ -100,8 +100,8 @@ chunks:
 
 - name: stage2-gcc-fixed-headers-musl
   morph: strata/build-essential-musl/stage2-gcc-fixed-headers.morph
-  repo: file:///src/workspace/gcc-tarball
-  ref: 164c79f856e26a0f7577f91a8cc32d61b848b935
+  repo: upstream:gcc-tarball
+  ref: 64b6dc020e879808a0c8f2271585e2f5ae45372a
   unpetrify-ref: baserock/build-essential-musl
   build-depends:
   - stage1-binutils-musl
@@ -112,8 +112,8 @@ chunks:
 
 - name: stage2-gcc-musl
   morph: strata/build-essential-musl/stage2-gcc.morph
-  repo: file:///src/workspace/gcc-tarball
-  ref: 164c79f856e26a0f7577f91a8cc32d61b848b935
+  repo: upstream:gcc-tarball
+  ref: 64b6dc020e879808a0c8f2271585e2f5ae45372a
   unpetrify-ref: baserock/build-essential-musl
   build-depends:
   - stage1-binutils-musl
@@ -225,8 +225,8 @@ chunks:
 
 - name: musl
   morph: strata/build-essential-musl/musl.morph
-  repo: file:///src/workspace/musl
-  ref: d8b6bef220f526528f13207108ed8a89dc348975
+  repo: upstream:musl
+  ref: c7ac6a91178945b79dbbce5ed09e55062e67f7db
   unpetrify-ref: baserock/1.1.6
   build-depends:
   - stage2-binutils-musl
@@ -242,7 +242,6 @@ chunks:
   - linux-api-headers-musl
 
 - name: zlib-musl
-  morph: strata/build-essential-musl/zlib.morph
   repo: upstream:zlib
   ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698
   unpetrify-ref: baserock/build-essential
@@ -260,8 +259,8 @@ chunks:
 
 - name: binutils-musl
   morph: strata/build-essential-musl/binutils.morph
-  repo: file:///src/workspace/binutils-redhat
-  ref: 090295d0519c747c989eb628e099128d6fb26f33
+  repo: upstream:binutils-redhat
+  ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
   unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils-musl
@@ -327,8 +326,8 @@ chunks:
 
 - name: gcc-musl
   morph: strata/build-essential-musl/gcc.morph
-  repo: file:///src/workspace/gcc-tarball
-  ref: 164c79f856e26a0f7577f91a8cc32d61b848b935
+  repo: upstream:gcc-tarball
+  ref: 64b6dc020e879808a0c8f2271585e2f5ae45372a
   unpetrify-ref: baserock/build-essential-musl
   build-depends:
   - stage2-binutils-musl
diff --git a/strata/core-musl.morph b/strata/core-musl.morph
index 8da7170d..f3025e76 100644
--- a/strata/core-musl.morph
+++ b/strata/core-musl.morph
@@ -36,8 +36,8 @@ chunks:
   build-depends: []
 - name: mini-utils
   morph: strata/core/mini-utils.morph
-  repo: file:///src/workspace/mini-utils
-  ref: fc5ed3c6cfdbe7f5dad7e534dd15e62fbe44db37
+  repo: upstream:mini-utils
+  ref: 6ca6ac97b9e1b17bebf49d34260927efe58b314e
   unpetrify-ref: master
   build-depends: []
 - name: ncurses
@@ -227,15 +227,6 @@ chunks:
   - git                                        
   - libtool-tarball                  
   - pkg-config 
-- name: nano      
-  morph: strata/core/nano.morph      
-  repo: upstream:nano-tarball       
-  ref: 8b74abeb02c01ddc768c465a826360cf33cec063
-  unpetrify-ref: baserock/morph
-  build-depends:   
-  - ncurses    
-  - automake                      
-  - autopoint
 - name: bc
   repo: upstream:bc-tarball
   ref: 0956d119432ff6a2e85bae1fa336df799cad70b0
diff --git a/strata/foundation-musl.morph b/strata/foundation-musl.morph
index 1e3f7b42..b59db782 100644
--- a/strata/foundation-musl.morph
+++ b/strata/foundation-musl.morph
@@ -79,9 +79,9 @@ chunks:
   build-depends: []
 - name: openssh
   morph: strata/foundation/openssh-musl.morph
-  repo: file:///src/workspace/openssh-git
-  ref: 7e02d01ea76505e7fb33db48b8fc67f3b6f6e99b
-  unpetrify-ref: baserock/morph-musl
+  repo: upstream:openssh-git
+  ref: fe374db43db86b0a16ded2520510553edd378ab4
+  unpetrify-ref: baserock/6.7-musl
   build-depends: []
 - name: tbdiff
   morph: strata/foundation/tbdiff.morph