diff options
-rw-r--r-- | base-system-armv7-highbank.morph | 8 | ||||
-rw-r--r-- | base-system-armv7-versatile.morph | 8 | ||||
-rw-r--r-- | base-system-x86_32-generic.morph | 8 | ||||
-rw-r--r-- | base-system-x86_64-generic.morph | 8 | ||||
-rw-r--r-- | bsp-armv7-highbank.morph | 2 | ||||
-rw-r--r-- | bsp-armv7-versatile.morph | 2 | ||||
-rw-r--r-- | bsp-imx53.morph | 2 | ||||
-rw-r--r-- | bsp-x86_32-generic.morph | 2 | ||||
-rw-r--r-- | bsp-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | build-essential.morph | 42 | ||||
-rw-r--r-- | build-essential.morph.yaml | 42 | ||||
-rw-r--r-- | core.morph | 2 | ||||
-rw-r--r-- | devel-system-armv7-highbank.morph | 10 | ||||
-rw-r--r-- | devel-system-armv7-versatile.morph | 10 | ||||
-rw-r--r-- | devel-system-x86_32-generic.morph | 10 | ||||
-rw-r--r-- | devel-system-x86_64-generic.morph | 10 | ||||
-rw-r--r-- | foundation.morph | 2 | ||||
-rw-r--r-- | tools.morph | 2 |
18 files changed, 86 insertions, 86 deletions
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph index 193ae6ea..22005cb8 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-armv7-highbank", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index 259c3a13..04db502d 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index dd687d01..2e29dbe2 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index 6340a434..4ae4e713 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-x86_64-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph index 384189da..1a49c68d 100644 --- a/bsp-armv7-highbank.morph +++ b/bsp-armv7-highbank.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "core" } ], diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph index 7c4e30dc..6f5e4a1c 100644 --- a/bsp-armv7-versatile.morph +++ b/bsp-armv7-versatile.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "core" } ], diff --git a/bsp-imx53.morph b/bsp-imx53.morph index 4c3aa38b..d8c668da 100644 --- a/bsp-imx53.morph +++ b/bsp-imx53.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "core" } ], diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph index 02e68fdf..bd52755f 100644 --- a/bsp-x86_32-generic.morph +++ b/bsp-x86_32-generic.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "core" } ], diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph index 4e6b15b9..b984a138 100644 --- a/bsp-x86_64-generic.morph +++ b/bsp-x86_64-generic.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "core" } ], diff --git a/build-essential.morph b/build-essential.morph index c8c9413a..3fa11a15 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -6,7 +6,7 @@ { "name": "stage1-binutils", "repo": "upstream:binutils-redhat", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [] @@ -14,7 +14,7 @@ { "name": "stage1-gcc", "repo": "upstream:gcc-tarball", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -24,7 +24,7 @@ { "name": "stage2-linux-api-headers", "repo": "upstream:linux", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -35,7 +35,7 @@ { "name": "stage2-eglibc", "repo": "upstream:eglibc2", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/2.15-build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -47,7 +47,7 @@ { "name": "stage2-zlib", "repo": "upstream:zlib", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -59,7 +59,7 @@ { "name": "stage2-binutils", "repo": "upstream:binutils-redhat", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -72,7 +72,7 @@ { "name": "stage2-gcc", "repo": "upstream:gcc-tarball", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -85,7 +85,7 @@ { "name": "stage2-busybox", "repo": "upstream:busybox", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -97,7 +97,7 @@ { "name": "stage2-fhs-dirs", "repo": "baserock:baserock/fhs-dirs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [] @@ -105,7 +105,7 @@ { "name": "stage2-gawk", "repo": "upstream:gawk", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -117,7 +117,7 @@ { "name": "stage2-make", "repo": "upstream:make", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "bootstrap", "prefix": "/tools", "build-depends": [ @@ -129,7 +129,7 @@ { "name": "fhs-dirs", "repo": "baserock:baserock/fhs-dirs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -147,7 +147,7 @@ { "name": "linux-api-headers", "repo": "upstream:linux", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -165,7 +165,7 @@ { "name": "eglibc", "repo": "upstream:eglibc2", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/2.15-build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -184,7 +184,7 @@ { "name": "zlib", "repo": "upstream:zlib", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -203,7 +203,7 @@ { "name": "binutils", "repo": "upstream:binutils-redhat", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -223,7 +223,7 @@ { "name": "busybox", "repo": "upstream:busybox", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -242,7 +242,7 @@ { "name": "gawk", "repo": "upstream:gawk", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -261,7 +261,7 @@ { "name": "gcc", "repo": "upstream:gcc-tarball", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -281,7 +281,7 @@ { "name": "make", "repo": "upstream:make", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ @@ -300,7 +300,7 @@ { "name": "ccache", "repo": "upstream:ccache", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "baserock/build-essential", "build-mode": "staging", "prefix": "/usr", "build-depends": [ diff --git a/build-essential.morph.yaml b/build-essential.morph.yaml index 79c6974f..f2bd1acf 100644 --- a/build-essential.morph.yaml +++ b/build-essential.morph.yaml @@ -12,14 +12,14 @@ chunks: - name: stage1-binutils repo: upstream:binutils-redhat - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: [] - name: stage1-gcc repo: upstream:gcc-tarball - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -35,7 +35,7 @@ chunks: - name: stage2-linux-api-headers repo: upstream:linux - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -44,7 +44,7 @@ chunks: - name: stage2-eglibc repo: upstream:eglibc2 - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/2.15-build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -54,7 +54,7 @@ chunks: - name: stage2-zlib repo: upstream:zlib - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -64,7 +64,7 @@ chunks: - name: stage2-binutils repo: upstream:binutils-redhat - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -75,7 +75,7 @@ chunks: - name: stage2-gcc repo: upstream:gcc-tarball - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -86,7 +86,7 @@ chunks: - name: stage2-busybox repo: upstream:busybox - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -96,14 +96,14 @@ chunks: - name: stage2-fhs-dirs repo: baserock:baserock/fhs-dirs - ref: baserock/samthursfield/build-essential-2-rebase + ref: master build-mode: bootstrap prefix: /tools build-depends: [] - name: stage2-gawk repo: upstream:gawk - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -113,7 +113,7 @@ chunks: - name: stage2-make repo: upstream:make - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: bootstrap prefix: /tools build-depends: @@ -139,7 +139,7 @@ chunks: - name: fhs-dirs repo: baserock:baserock/fhs-dirs - ref: baserock/samthursfield/build-essential-2-rebase + ref: master build-mode: staging prefix: /usr build-depends: @@ -155,7 +155,7 @@ chunks: - name: linux-api-headers repo: upstream:linux - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -171,7 +171,7 @@ chunks: - name: eglibc repo: upstream:eglibc2 - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/2.15-build-essential build-mode: staging prefix: /usr build-depends: @@ -188,7 +188,7 @@ chunks: - name: zlib repo: upstream:zlib - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -205,7 +205,7 @@ chunks: - name: binutils repo: upstream:binutils-redhat - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -223,7 +223,7 @@ chunks: - name: busybox repo: upstream:busybox - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -240,7 +240,7 @@ chunks: - name: gawk repo: upstream:gawk - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -257,7 +257,7 @@ chunks: - name: gcc repo: upstream:gcc-tarball - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -275,7 +275,7 @@ chunks: - name: make repo: upstream:make - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -294,7 +294,7 @@ chunks: - name: ccache repo: upstream:ccache - ref: baserock/samthursfield/build-essential-2-rebase + ref: baserock/build-essential build-mode: staging prefix: /usr build-depends: @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "build-essential" } ], diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph index 17666c84..ab735416 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-armv7-highbank", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index 65f882ec..b10a52fe 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index 5ec40ec2..c0f4b877 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index ae1db022..48729610 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": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "bsp-x86_64-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase" + "ref": "master" } ] } diff --git a/foundation.morph b/foundation.morph index da63c6af..39e366d1 100644 --- a/foundation.morph +++ b/foundation.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "core" } ], diff --git a/tools.morph b/tools.morph index 7d95987b..7342cd23 100644 --- a/tools.morph +++ b/tools.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/build-essential-2-rebase", + "ref": "master", "morph": "foundation" } ], |