diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-06-08 19:57:03 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-06-16 11:04:50 +0000 |
| commit | 7cb71771d095a542c7e3aa02a6d1bc181ef3ff23 (patch) | |
| tree | 41738ea369919b69066af00d14b0d3ae6b8c5e52 | |
| parent | 17f63807b5269cd290c0903fb203361742e4f698 (diff) | |
| download | definitions-7cb71771d095a542c7e3aa02a6d1bc181ef3ff23.tar.gz | |
Workaround for util-linux to not depend on git
At least systemd fails to build if you remove the git dependency
from util-linux and you dont apply this workaround
Change-Id: Ife649e811aea2ffb2eb4fa6d042e2dfbaf390430
| -rw-r--r-- | strata/core.morph | 4 | ||||
| -rw-r--r-- | strata/core/util-linux.morph | 4 |
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" \ |