diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-18 18:24:42 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-18 18:24:42 +0000 |
| commit | ef11da69217a5e4a04a043850881bc20e4bc2fee (patch) | |
| tree | 035cc379f83f02a8e581c4b049e174b32a728f84 | |
| parent | a36769d46edd6585385ef3378c9d3efbff746cea (diff) | |
| parent | 5e81c97cdcf6261eb1ed2d7342afd94f941b21a9 (diff) | |
| download | morphs-baserock/pedroalvarez/trove-upgrades.tar.gz | |
Merge remote-tracking branch 'origin/baserock/sam/trove-upgrades' into baserock/pedroalvarez/trove-upgradesbaserock/pedroalvarez/trove-upgrades
Conflicts:
foundation.morph
| -rw-r--r-- | build-essential.morph | 6 | ||||
| -rw-r--r-- | foundation.morph | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build-essential.morph b/build-essential.morph index cbda1e4..37ad526 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -78,7 +78,7 @@ chunks: build-mode: bootstrap name: stage2-fhs-dirs prefix: /tools - ref: 442e2a6453ec380bf9d64f6be50e57d54ddf93d3 + ref: baserock/sam/trove-upgrades repo: baserock:baserock/fhs-dirs unpetrify-ref: master - build-depends: @@ -125,7 +125,7 @@ chunks: build-mode: staging name: fhs-dirs prefix: /usr - ref: 442e2a6453ec380bf9d64f6be50e57d54ddf93d3 + ref: baserock/sam/trove-upgrades repo: baserock:baserock/fhs-dirs unpetrify-ref: master - build-depends: @@ -210,7 +210,7 @@ chunks: build-mode: staging name: busybox prefix: /usr - ref: eeb9014f28e3aa00673a0fad127e7420da4392db + ref: baserock/pedroalvarez/enable-patch repo: upstream:busybox unpetrify-ref: baserock/build-essential - build-depends: diff --git a/foundation.morph b/foundation.morph index 886cccb..bddfdd9 100644 --- a/foundation.morph +++ b/foundation.morph @@ -117,9 +117,9 @@ chunks: - build-depends: - attr name: tbdiff - ref: baserock/pedroalvarez/snapshot-mgr2 + ref: baserock/pedroalvarez/trove-upgrades repo: baserock:baserock/tbdiff - unpetrify-ref: master + unpetrify-ref: 20e5304f40148d43c6ab57dea0abe400475e7e9f description: Basic userland runtime system kind: stratum name: foundation |