summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-06-12 11:11:01 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-06-12 11:11:01 (GMT)
commit31b6c1fd503cec16cf57f22be99d5fa6bc3b92b3 (patch)
tree1534d38b705f0b5a54aac2bc3f27b52a34fb656f
parent667bcac5540b4851132417ea65ffa44f9344b55f (diff)
parent384f3653f549f1a4032c1942f7f8803e13ee1c0e (diff)
downloaddefinitions-31b6c1fd503cec16cf57f22be99d5fa6bc3b92b3.tar.gz
Merge branch 'baserock/richardmaw/yakshave/util-linux-blkid'
Reviewed-by: Lars Wirzenius Reviewed-by: Sam Thursfield
-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..cbe3348 100644
--- a/core.morph
+++ b/core.morph
@@ -206,7 +206,7 @@ chunks:
- perl
- name: util-linux
repo: upstream:util-linux
- ref: 462008f79be9e195670b202cb43827b8aeb1e60b
+ ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0
unpetrify-ref: baserock/morph
build-depends:
- autoconf
diff --git a/tools.morph b/tools.morph
index 124eff9..85cfb7f 100644
--- a/tools.morph
+++ b/tools.morph
@@ -56,7 +56,7 @@ chunks:
build-depends: []
- name: e2fsprogs
repo: upstream:e2fsprogs
- ref: 1ab0ea88057e922a89c6b8feebeb62c57e40f8de
+ ref: 485edc675200ff3097cec521c357441a1c2d9b0d
unpetrify-ref: baserock/morph
build-depends: []
- name: file