Manually resolve refsbaserock/release/baserock-6

35 files changed, 145 insertions, 137 deletions

diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index 416baf2..078c057 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -6,17 +6,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 99db2ee..fd0b40b 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -9,17 +9,17 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-armv7-versatile",
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index f115328..bd33737 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -9,17 +9,17 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-x86_32-generic",
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 14d5053..4d5a206 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -9,17 +9,17 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-x86_64-generic",
diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph
index 17baa9f..67fd869 100644
--- a/bsp-armv7-highbank.morph
+++ b/bsp-armv7-highbank.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "core"
         }
     ],
diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph
index 1fd7c99..dcc28b6 100644
--- a/bsp-armv7-versatile.morph
+++ b/bsp-armv7-versatile.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "core"
         }
     ],
diff --git a/bsp-imx53.morph b/bsp-imx53.morph
index d8c668d..59c79de 100644
--- a/bsp-imx53.morph
+++ b/bsp-imx53.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "core"
         }
     ],
@@ -13,7 +13,8 @@
         {
             "name": "linux",
             "repo": "upstream:linux",
-            "ref": "baserock/morph",
+            "unpetrify-ref": "baserock/morph",
+            "ref": "c9bb9b8beccd28386f6bcc7437107bde5421ff0c",
             "build-depends": []
         }
     ]
diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph
index efaca3c..b2006a5 100644
--- a/bsp-x86_32-generic.morph
+++ b/bsp-x86_32-generic.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "core"
         }
     ],
diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph
index 8a2413e..3d57528 100644
--- a/bsp-x86_64-generic.morph
+++ b/bsp-x86_64-generic.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "core"
         }
     ],
diff --git a/connectivity.morph b/connectivity.morph
index 65e4438..9e78330 100644
--- a/connectivity.morph
+++ b/connectivity.morph
@@ -5,17 +5,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/core.morph b/core.morph
index 0b378e9..7b6faff 100644
--- a/core.morph
+++ b/core.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "build-essential"
         }
     ],
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index 9d3b5de..5faf662 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -9,22 +9,22 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-armv7-highbank",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "tools",
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index b10a52f..a6542f1 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ]
 }
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index c0f4b87..bdffb7c 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-x86_32-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ]
 }
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 4872961..899fb48 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -9,27 +9,27 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ]
 }
diff --git a/foundation.morph b/foundation.morph
index b966589..6722367 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "core"
         }
     ],
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index fbba711..15c9376 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -9,17 +9,17 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
@@ -29,7 +29,7 @@
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "connectivity",
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 0a506ef..0c8178a 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -9,42 +9,42 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-x86_64-generic",
@@ -54,12 +54,12 @@
         {
             "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-x-x86_64-generic",
diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph
index 0642d19..9ee0d88 100644
--- a/genivi-devel-system-armv7-versatile.morph
+++ b/genivi-devel-system-armv7-versatile.morph
@@ -9,67 +9,67 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-x-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ]
 }
diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph
index 7399515..74ed444 100644
--- a/genivi-devel-system-x86_64-generic.morph
+++ b/genivi-devel-system-x86_64-generic.morph
@@ -9,67 +9,67 @@
         {
             "morph": "build-essential",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "bsp-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "connectivity",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "audio-bluetooth",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "multimedia",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-x-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "tools",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ]
 }
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
index 65c3e11..2753aea 100644
--- a/genivi-foundation.morph
+++ b/genivi-foundation.morph
@@ -6,12 +6,12 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph
index 9ee91d1..802e9d5 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/genivi-wayland-armv7-versatile.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "wayland-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic.morph
index 33039aa..cb0732b 100644
--- a/genivi-wayland-x86_64-generic.morph
+++ b/genivi-wayland-x86_64-generic.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "wayland-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
index 8b78aaa..f31522f 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-armv7-versatile",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
index c55338d..5d6d91d 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/genivi-x-x86_64-generic.morph
@@ -6,27 +6,27 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-x86_64-generic",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/genivi.morph b/genivi.morph
index 076276c..b72d0d7 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -6,17 +6,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/multimedia.morph b/multimedia.morph
index a684a7b..7c530a8 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -6,17 +6,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/nfs.morph b/nfs.morph
index ee6744e..de695a5 100644
--- a/nfs.morph
+++ b/nfs.morph
@@ -6,31 +6,36 @@
         {
             "name": "libevent",
             "repo": "upstream:libevent",
-            "ref": "release-2.0.20-stable",
+            "unpetrify-ref": "release-2.0.20-stable",
+            "ref": "41d77a7c1ea5384b70f0edf56542212692e44ba7",
             "build-depends": []
         },
         {
             "name": "sqlite3",
             "repo": "upstream:sqlite3",
-            "ref": "baserock/morph",
+            "unpetrify-ref": "baserock/morph",
+            "ref": "f6c2a9fe49d20654c2c41844d056033692a223b7",
             "build-depends": []
         },
         {
             "name": "tcp-wrappers",
             "repo": "upstream:tcp-wrappers",
-            "ref": "baserock/fedora-patches",
+            "unpetrify-ref": "baserock/fedora-patches",
+            "ref": "23b65f29b324b65a057a3fa87613b788856d6e4e",
             "build-depends": []
         },
         {
             "name": "ti-rpc",
             "repo": "upstream:ti-rpc",
-            "ref": "baserock/master",
+            "unpetrify-ref": "baserock/master",
+            "ref": "c5a7a19070e74115fc9c26aa6f3dfec1da220c1f",
             "build-depends": []
         },
         {
             "name": "rpcbind",
             "repo": "upstream:rpcbind",
-            "ref": "baserock/master",
+            "unpetrify-ref": "baserock/master",
+            "ref": "aa3ac0d86c258d3e355ae59df31a96da795ecdfa",
             "build-depends": [
                 "ti-rpc",
                 "tcp-wrappers"
@@ -39,7 +44,8 @@
         {
             "name": "nfs-utils",
             "repo": "upstream:nfs-utils",
-            "ref": "baserock/master",
+            "unpetrify-ref": "baserock/master",
+            "ref": "08baf3bc2f66a1ca6401191e19380028d2fc2c6d",
             "build-depends": [
                 "libevent",
                 "sqlite3",
diff --git a/scripting.morph b/scripting.morph
index 513fb28..0cf4081 100644
--- a/scripting.morph
+++ b/scripting.morph
@@ -6,7 +6,8 @@
         {
             "name": "lua",
             "repo": "upstream:lua",
-            "ref": "baserock/5.1-morph",
+            "unpetrify-ref": "baserock/5.1-morph",
+            "ref": "bedbdc0f03bca4fe97200ddf9c3d6cb210b45888",
             "build-depends": []
         }
     ]
diff --git a/tools.morph b/tools.morph
index 560f8ea..3f9499c 100644
--- a/tools.morph
+++ b/tools.morph
@@ -5,7 +5,7 @@
     "build-depends": [
         {
             "repo": "baserock:baserock/morphs",
-            "ref": "master",
+            "ref": "baserock/release/baserock-6",
             "morph": "foundation"
         }
     ],
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 304a7ad..62b6a4b 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 95b3379..3ca8f6a 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
index 89eb1fd..65fbfd0 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/x-common.morph b/x-common.morph
index c6e5eea..c06f346 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -5,17 +5,17 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index 18d3127..ee29062 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -5,22 +5,22 @@
         {
             "morph": "core",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "genivi-foundation",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         },
         {
             "morph": "x-common",
             "repo": "baserock:baserock/morphs",
-            "ref": "master"
+            "ref": "baserock/release/baserock-6"
         }
     ],
     "chunks": [