summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/core.morph4
-rw-r--r--strata/core/util-linux.morph4
2 files changed, 6 insertions, 2 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 3966ebc4..92b7e64c 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -315,6 +315,9 @@ chunks:
- acl
- linux-pam
- libcap2
+# Note: util-linux's version number must be set in util-linux's chunk morph,
+# so if you update util-linux be sure to also update the version number
+# in strata/core/util-linux.morph
- name: util-linux
morph: strata/core/util-linux.morph
repo: upstream:util-linux
@@ -324,7 +327,6 @@ chunks:
- autoconf
- automake
- gettext-tarball
- - git
- libtool-tarball
- pkg-config
- linux-pam
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph
index eebba6f6..290283d1 100644
--- a/strata/core/util-linux.morph
+++ b/strata/core/util-linux.morph
@@ -1,8 +1,10 @@
name: util-linux
kind: chunk
build-system: autotools
-configure-commands:
+pre-configure-commands:
+- echo "2.26.1" > .tarball-version
- ./autogen.sh
+configure-commands:
# Installing to /bin so that they overwrite busybox login.
- |
./configure --prefix="$PREFIX" \