summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-06-06 14:47:33 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-06-06 14:47:33 (GMT)
commit384f3653f549f1a4032c1942f7f8803e13ee1c0e (patch)
treedef018fd120a40571237eff3e316f48e477c6a7b
parent6eb285cad11a4a955a21702fac70d6135f370985 (diff)
downloaddefinitions-384f3653f549f1a4032c1942f7f8803e13ee1c0e.tar.gz
Use updated versions of util-linux and e2fsprogsbaserock/richardmaw/yakshave/util-linux-blkid
Both are updated to the latest release, and there are morphology changes to: 1. prefer util-linux's versions of blkid, findfs and fsck. 2. Install all of util-linux's tools, regardless of whether busybox also has a version. We can have the busybox version for minimal systems, but the util-linux versions for base systems.
-rw-r--r--core.morph2
-rw-r--r--tools.morph2
2 files changed, 2 insertions, 2 deletions
diff --git a/core.morph b/core.morph
index 0980286..15922b6 100644
--- a/core.morph
+++ b/core.morph
@@ -206,7 +206,7 @@ chunks:
- perl
- name: util-linux
repo: upstream:util-linux
- ref: 462008f79be9e195670b202cb43827b8aeb1e60b
+ ref: 2fb567c080e1762ec6a2147564f03068f55d4f14
unpetrify-ref: baserock/morph
build-depends:
- autoconf
diff --git a/tools.morph b/tools.morph
index c68a26a..45de90d 100644
--- a/tools.morph
+++ b/tools.morph
@@ -56,7 +56,7 @@ chunks:
build-depends: []
- name: e2fsprogs
repo: upstream:e2fsprogs
- ref: 1ab0ea88057e922a89c6b8feebeb62c57e40f8de
+ ref: 5f4b406b03dc9fa27c78184df5b1d501e373ca01
unpetrify-ref: baserock/morph
build-depends: []
- name: file