Merge remote-tracking branch 'baserock/master'

10 files changed, 62 insertions, 26 deletions

diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph
index 80fc5521..ad318db9 100644
--- a/strata/bsp-x86_32-generic.morph
+++ b/strata/bsp-x86_32-generic.morph
@@ -21,6 +21,6 @@ chunks:
   morph: strata/bsp-x86_32-generic/syslinux.morph
   repo: upstream:syslinux
   ref: 2aab8555987b547b617cbb887e61083fece01541
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/morph
   build-depends:
   - nasm
diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph
index 1181d70e..624b31a4 100644
--- a/strata/bsp-x86_64-generic.morph
+++ b/strata/bsp-x86_64-generic.morph
@@ -21,6 +21,6 @@ chunks:
   morph: strata/bsp-x86_64-generic/syslinux.morph
   repo: upstream:syslinux
   ref: 2aab8555987b547b617cbb887e61083fece01541
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/morph
   build-depends:
   - nasm
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index f9fa4631..008ddf3f 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -14,7 +14,7 @@ chunks:
 - name: syslinux
   morph: strata/bsp-x86_both-tools/syslinux.morph
   repo: upstream:syslinux
-  ref: baserock/tiagogomes/update-toolchain
+  ref: baserock/morph
   unpetrify-ref: 2f6d21d2a560cb5581694fef42ee9a350d5f302f
   build-depends:
   - nasm
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 59f2b532..1611dbe8 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -42,7 +42,7 @@ chunks:
   morph: strata/build-essential/stage1-binutils.morph
   repo: upstream:binutils-redhat
   ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends: []
   build-mode: bootstrap
   prefix: /tools
@@ -51,7 +51,7 @@ chunks:
   morph: strata/build-essential/stage1-gcc.morph
   repo: upstream:gcc-tarball
   ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   build-mode: bootstrap
@@ -84,7 +84,7 @@ chunks:
   morph: strata/build-essential/stage2-libstdc++.morph
   repo: upstream:gcc-tarball
   ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -96,7 +96,7 @@ chunks:
   morph: strata/build-essential/stage2-binutils.morph
   repo: upstream:binutils-redhat
   ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -108,7 +108,7 @@ chunks:
   morph: strata/build-essential/stage2-gcc-fixed-headers.morph
   repo: upstream:gcc-tarball
   ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -120,7 +120,7 @@ chunks:
   morph: strata/build-essential/stage2-gcc.morph
   repo: upstream:gcc-tarball
   ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage1-binutils
   - stage1-gcc
@@ -274,7 +274,7 @@ chunks:
   morph: strata/build-essential/binutils.morph
   repo: upstream:binutils-redhat
   ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
   - stage2-busybox
@@ -341,7 +341,7 @@ chunks:
   morph: strata/build-essential/gcc.morph
   repo: upstream:gcc-tarball
   ref: b3c9b176c1f10ebeff5700eb3760e9511f23fa06
-  unpetrify-ref: baserock/tiagogomes/update-toolchain
+  unpetrify-ref: baserock/build-essential
   build-depends:
   - stage2-binutils
   - stage2-busybox
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/morph-utils.morph b/strata/morph-utils.morph
index 4d38c735..95d9807c 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -71,7 +71,7 @@ chunks:
   build-depends: []
 - name: morph
   repo: baserock:baserock/morph
-  ref: f2f3e4e5f3d5162890d03494f405cff5177aaad8
+  ref: f0c5d4c0ef35cc43aa059cd2255e41c60c4cac77
   unpetrify-ref: master
   build-depends:
   - cliapp
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
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index 9eabc403..b4e20ec7 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -27,6 +27,8 @@ strata:
   morph: strata/genivi.morph
 - name: tools
   morph: strata/tools.morph
+- name: lvm
+  morph: strata/lvm.morph
 - name: virtualization
   morph: strata/virtualization.morph
 - name: openstack-clients