summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2013-03-01 18:12:07 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2013-03-01 18:12:07 +0000
commitb04d648895170a7337c4d90bfde1ceb069934203 (patch)
treef7e2d1f1322ebc076119932bc7f09522733052f4
parent03bd23bf8afde1ec35ab01f6abfe7b38d413e84a (diff)
downloadmorphs-b04d648895170a7337c4d90bfde1ceb069934203.tar.gz
point stratum dependencies to the correct branch
-rw-r--r--audio-bluetooth.morph6
-rw-r--r--base-system-armv7-highbank.morph8
-rw-r--r--base-system-armv7-versatile.morph8
-rw-r--r--base-system-x86_32-generic.morph8
-rw-r--r--base-system-x86_64-generic.morph8
-rw-r--r--connectivity.morph6
-rw-r--r--devel-system-armv7-highbank.morph10
-rw-r--r--devel-system-armv7-versatile.morph10
-rw-r--r--devel-system-x86_32-generic.morph10
-rw-r--r--devel-system-x86_64-generic.morph10
-rw-r--r--genivi-baseline-system-armv7-versatile.morph24
-rw-r--r--genivi-baseline-system-x86_64-generic.morph24
-rw-r--r--genivi-foundation.morph4
-rw-r--r--genivi-wayland-armv7-versatile.morph10
-rw-r--r--genivi-wayland-x86_64-generic.morph10
-rw-r--r--genivi-x-armv7-versatile.morph10
-rw-r--r--genivi-x-x86_64-generic.morph10
-rw-r--r--genivi.morph6
-rw-r--r--multimedia.morph6
-rw-r--r--wayland-armv7-versatile.morph8
-rw-r--r--wayland-x86_64-generic.morph8
-rw-r--r--x-armv7-versatile.morph8
-rw-r--r--x-common.morph6
-rw-r--r--x-x86_64-generic.morph8
24 files changed, 113 insertions, 113 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index f3fd99c..69b0472 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -6,17 +6,17 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index 6d15cd7..22005cb 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-armv7-highbank",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 5a33972..04db502 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index 3861003..2e29dbe 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 98ffc68..4ae4e71 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -9,22 +9,22 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/connectivity.morph b/connectivity.morph
index cb951c6..282a80e 100644
--- a/connectivity.morph
+++ b/connectivity.morph
@@ -5,17 +5,17 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index 0da056f..ab73541 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -9,27 +9,27 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-armv7-highbank",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index fc0aebb..b10a52f 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": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 2255b8e..c0f4b87 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": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-x86_32-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 875ec34..4872961 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": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "tools",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index 98b2ab3..84fb9b1 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -9,62 +9,62 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "connectivity",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "audio-bluetooth",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-common",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "multimedia",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-x-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 382697b..756ba90 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -9,62 +9,62 @@
{
"morph": "build-essential",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "bsp-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "connectivity",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "audio-bluetooth",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-common",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "multimedia",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-x-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
]
}
diff --git a/genivi-foundation.morph b/genivi-foundation.morph
index c54ab1d..872eba9 100644
--- a/genivi-foundation.morph
+++ b/genivi-foundation.morph
@@ -6,12 +6,12 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/genivi-wayland-armv7-versatile.morph b/genivi-wayland-armv7-versatile.morph
index 05d9a68..9ee91d1 100644
--- a/genivi-wayland-armv7-versatile.morph
+++ b/genivi-wayland-armv7-versatile.morph
@@ -6,27 +6,27 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "wayland-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/genivi-wayland-x86_64-generic.morph b/genivi-wayland-x86_64-generic.morph
index 3b01d36..33039aa 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": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "wayland-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
index 143daf5..edfbe14 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile.morph
@@ -6,27 +6,27 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-armv7-versatile",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
index bf7f39e..dd4e4de 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": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-x86_64-generic",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/genivi.morph b/genivi.morph
index f1e981c..148605e 100644
--- a/genivi.morph
+++ b/genivi.morph
@@ -6,17 +6,17 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/multimedia.morph b/multimedia.morph
index 77b0a4e..e1adc06 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -6,17 +6,17 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index f96d33d..304a7ad 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -5,22 +5,22 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-common",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index c7f5834..95b3379 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -5,22 +5,22 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-common",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
index ea05d11..7d02344 100644
--- a/x-armv7-versatile.morph
+++ b/x-armv7-versatile.morph
@@ -5,22 +5,22 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-common",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/x-common.morph b/x-common.morph
index a42df4d..c5c2749 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -5,17 +5,17 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index 5b193f0..302917f 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -5,22 +5,22 @@
{
"morph": "core",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "genivi-foundation",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
},
{
"morph": "x-common",
"repo": "baserock:baserock/morphs",
- "ref": "jonathan/genivi-baseline-merge"
+ "ref": "master"
}
],
"chunks": [