diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-05 12:48:47 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-05 12:48:47 +0000 |
commit | 2334938471a2ef6c5a60ec24ab7d92ede26a4753 (patch) | |
tree | 2d39b00d1cb70921e36172277bfc362483cf3bd1 | |
parent | e02c0d120f1615f1eb9e3c4f45294e01f11fe98e (diff) | |
download | definitions-2334938471a2ef6c5a60ec24ab7d92ede26a4753.tar.gz |
Move util-linux back into core
It is needed in the syslinux build.
-rw-r--r-- | core.morph | 21 | ||||
-rw-r--r-- | foundation.morph | 12 |
2 files changed, 19 insertions, 14 deletions
@@ -49,6 +49,12 @@ ] }, { + "name": "pkg-config", + "repo": "upstream:pkg-config", + "ref": "baserock/build-essential", + "build-depends": [] + }, + { "name": "readline", "repo": "upstream:readline", "ref": "baserock/morph", @@ -233,10 +239,17 @@ ] }, { - "name": "pkg-config", - "repo": "upstream:pkg-config", - "ref": "baserock/build-essential", - "build-depends": [] + "name": "util-linux", + "repo": "upstream:util-linux", + "ref": "baserock/morph", + "build-depends": [ + "autoconf", + "automake", + "gettext", + "git", + "libtool", + "pkg-config" + ] }, { "name": "xz", diff --git a/foundation.morph b/foundation.morph index 1ed1a157..e1d121cf 100644 --- a/foundation.morph +++ b/foundation.morph @@ -63,12 +63,6 @@ ] }, { - "name": "util-linux", - "repo": "upstream:util-linux", - "ref": "baserock/morph", - "build-depends": [] - }, - { "name": "glib", "repo": "upstream:glib", "ref": "master", @@ -102,8 +96,7 @@ "kmod", "libcap2", "pciutils", - "usbutils", - "util-linux" + "usbutils" ] }, { @@ -111,8 +104,7 @@ "repo": "upstream:btrfs-progs", "ref": "baserock/morph", "build-depends": [ - "attr", - "util-linux" + "attr" ] }, { |