summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-05 12:48:47 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-05 12:48:47 +0000
commit2334938471a2ef6c5a60ec24ab7d92ede26a4753 (patch)
tree2d39b00d1cb70921e36172277bfc362483cf3bd1
parente02c0d120f1615f1eb9e3c4f45294e01f11fe98e (diff)
downloadmorphs-2334938471a2ef6c5a60ec24ab7d92ede26a4753.tar.gz
Move util-linux back into core
It is needed in the syslinux build.
-rw-r--r--core.morph21
-rw-r--r--foundation.morph12
2 files changed, 19 insertions, 14 deletions
diff --git a/core.morph b/core.morph
index e473352..2279b91 100644
--- a/core.morph
+++ b/core.morph
@@ -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 1ed1a15..e1d121c 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"
]
},
{