diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-28 11:20:05 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-28 11:20:05 +0000 |
commit | 12061a73549a396c0b8004ea2dfaabf5e9c78321 (patch) | |
tree | d7646cd90df0e0138d34858eec8e6b2d50e46b45 /strata | |
parent | e9b5ef16922d2ed4031576f5df73ff53507c1b57 (diff) | |
parent | a2cb0484b970f2f58c4cc3e0057976b6a4daf64a (diff) | |
download | definitions-12061a73549a396c0b8004ea2dfaabf5e9c78321.tar.gz |
Merge branch 'baserock/sam/lvm-stratum'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Diffstat (limited to 'strata')
-rw-r--r-- | strata/lvm.morph | 16 | ||||
-rw-r--r-- | strata/lvm/lvm2.morph | 31 | ||||
-rw-r--r-- | strata/virtualization.morph | 9 | ||||
-rw-r--r-- | strata/virtualization/lvm2.morph | 6 |
4 files changed, 48 insertions, 14 deletions
diff --git a/strata/lvm.morph b/strata/lvm.morph new file mode 100644 index 00000000..8c1c3f67 --- /dev/null +++ b/strata/lvm.morph @@ -0,0 +1,16 @@ +name: lvm +kind: stratum +description: | + LVM userland tools. + + LVM is a logical volume manager for the Linux kernel. This stratum contains + the tools necessary to manage volumes with LVM. +build-depends: +- morph: strata/foundation.morph +chunks: +- name: lvm2 + morph: strata/lvm/lvm2.morph + repo: upstream:lvm2 + ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3 + unpetrify-ref: v2_02_115 + build-depends: [] diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph new file mode 100644 index 00000000..791894df --- /dev/null +++ b/strata/lvm/lvm2.morph @@ -0,0 +1,31 @@ +name: lvm2 +kind: chunk +build-system: autotools + +configure-commands: +# We specify --sbindir explicitly due to a bug in .service file generation: +# if left to the default, @sbindir@ is expanded to the literal string +# '${exec_prefix}/sbin' in the generated .service files. +# +# udev rules *must* go in /lib, they'll be ignored if they go in /usr/lib. +- > + ./configure --prefix="$PREFIX" \ + --sbindir="$PREFIX"/sbin \ + --with-udev-prefix=/lib \ + --with-systemdsystemunitdir="$PREFIX"/lib/systemd/system \ + --enable-applib --enable-cmdlib --enable-pkgconfig --enable-lvmetad \ + --enable-dmeventd --enable-udev_sync + +install-commands: +- make DESTDIR="$DESTDIR" install +- make DESTDIR="$DESTDIR" install_system_dirs +- make DESTDIR="$DESTDIR" install_systemd_generators +- make DESTDIR="$DESTDIR" install_systemd_units +- make DESTDIR="$DESTDIR" install_tmpfiles_configuration + +# Use lvmetad by default. This means we don't have to use the +# `lvm2-activation-generator` systemd generator, which is a good thing +# because I have seen it cause systems to completely fail to boot. Fedora +# does something similar, see: +# http://pkgs.fedoraproject.org/cgit/lvm2.git/tree/lvm2-enable-lvmetad-by-default.patch +- sed -e 's/use_lvmetad = 0/use_lvmetad = 1/' -i "$DESTDIR"/etc/lvm/lvm.conf diff --git a/strata/virtualization.morph b/strata/virtualization.morph index e3261f84..7aa8f6af 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -16,19 +16,12 @@ chunks: ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b unpetrify-ref: master build-depends: [] -- name: lvm2 - morph: strata/virtualization/lvm2.morph - repo: upstream:lvm2 - ref: 8c5b90b50bdf9f1a7ae1d3c4cf58ce4b0d7c2768 - unpetrify-ref: baserock/morph - build-depends: [] - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954 unpetrify-ref: baserock/morph - build-depends: - - lvm2 + build-depends: [] - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu diff --git a/strata/virtualization/lvm2.morph b/strata/virtualization/lvm2.morph deleted file mode 100644 index 49c166dc..00000000 --- a/strata/virtualization/lvm2.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: lvm2 -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix="$PREFIX" --enable-applib --enable-cmdlib --enable-pkgconfig - --enable-dmeventd --enable-udev_sync |