From be527e780e794b19eaf929286fd41f3c87a29cb2 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Wed, 4 Sep 2019 08:44:30 +0300
Subject: [PATCH] lvm2: move back to extra

---
 {testing => extra}/cryptsetup/build                 |  0
 {testing => extra}/cryptsetup/checksums             |  0
 {testing => extra}/cryptsetup/depends               |  0
 {testing => extra}/cryptsetup/sources               |  0
 {testing => extra}/cryptsetup/version               |  0
 {testing => extra}/libaio/build                     |  0
 {testing => extra}/libaio/checksums                 |  0
 {testing => extra}/libaio/sources                   |  0
 {testing => extra}/libaio/version                   |  0
 {testing => extra}/lvm2/build                       | 13 ++++++++++---
 {testing => extra}/lvm2/checksums                   |  0
 {testing => extra}/lvm2/depends                     |  0
 .../lvm2/patches/001-include_fix.patch              |  0
 .../lvm2/patches/disable-symver.patch               |  0
 .../lvm2/patches/fix-stdio-usage.patch              |  0
 .../lvm2/patches/mlockall-default-config.patch      |  0
 .../lvm2/patches/musl-fix-include.patch             |  0
 {testing => extra}/lvm2/patches/portability.patch   |  0
 {testing => extra}/lvm2/sources                     |  0
 {testing => extra}/lvm2/version                     |  0
 20 files changed, 10 insertions(+), 3 deletions(-)
 rename {testing => extra}/cryptsetup/build (100%)
 rename {testing => extra}/cryptsetup/checksums (100%)
 rename {testing => extra}/cryptsetup/depends (100%)
 rename {testing => extra}/cryptsetup/sources (100%)
 rename {testing => extra}/cryptsetup/version (100%)
 rename {testing => extra}/libaio/build (100%)
 rename {testing => extra}/libaio/checksums (100%)
 rename {testing => extra}/libaio/sources (100%)
 rename {testing => extra}/libaio/version (100%)
 rename {testing => extra}/lvm2/build (67%)
 rename {testing => extra}/lvm2/checksums (100%)
 rename {testing => extra}/lvm2/depends (100%)
 rename {testing => extra}/lvm2/patches/001-include_fix.patch (100%)
 rename {testing => extra}/lvm2/patches/disable-symver.patch (100%)
 rename {testing => extra}/lvm2/patches/fix-stdio-usage.patch (100%)
 rename {testing => extra}/lvm2/patches/mlockall-default-config.patch (100%)
 rename {testing => extra}/lvm2/patches/musl-fix-include.patch (100%)
 rename {testing => extra}/lvm2/patches/portability.patch (100%)
 rename {testing => extra}/lvm2/sources (100%)
 rename {testing => extra}/lvm2/version (100%)

diff --git a/testing/cryptsetup/build b/extra/cryptsetup/build
similarity index 100%
rename from testing/cryptsetup/build
rename to extra/cryptsetup/build
diff --git a/testing/cryptsetup/checksums b/extra/cryptsetup/checksums
similarity index 100%
rename from testing/cryptsetup/checksums
rename to extra/cryptsetup/checksums
diff --git a/testing/cryptsetup/depends b/extra/cryptsetup/depends
similarity index 100%
rename from testing/cryptsetup/depends
rename to extra/cryptsetup/depends
diff --git a/testing/cryptsetup/sources b/extra/cryptsetup/sources
similarity index 100%
rename from testing/cryptsetup/sources
rename to extra/cryptsetup/sources
diff --git a/testing/cryptsetup/version b/extra/cryptsetup/version
similarity index 100%
rename from testing/cryptsetup/version
rename to extra/cryptsetup/version
diff --git a/testing/libaio/build b/extra/libaio/build
similarity index 100%
rename from testing/libaio/build
rename to extra/libaio/build
diff --git a/testing/libaio/checksums b/extra/libaio/checksums
similarity index 100%
rename from testing/libaio/checksums
rename to extra/libaio/checksums
diff --git a/testing/libaio/sources b/extra/libaio/sources
similarity index 100%
rename from testing/libaio/sources
rename to extra/libaio/sources
diff --git a/testing/libaio/version b/extra/libaio/version
similarity index 100%
rename from testing/libaio/version
rename to extra/libaio/version
diff --git a/testing/lvm2/build b/extra/lvm2/build
similarity index 67%
rename from testing/lvm2/build
rename to extra/lvm2/build
index 8c936960..dfe9b626 100755
--- a/testing/lvm2/build
+++ b/extra/lvm2/build
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 
+# A painful collection of patches, some written for KISS and
+# the others ported and modified from much older versions of LVM.
 patch -p1 < portability.patch
 patch -p1 < fix-stdio-usage.patch
 patch -p1 < mlockall-default-config.patch
@@ -7,15 +9,20 @@ patch -p1 < musl-fix-include.patch
 patch -p1 < disable-symver.patch
 patch -p1 < 001-include_fix.patch
 
-# POSIX sh 'fmt -1' script.
+# LVM2 calls 'fmt -1' throughout the build process.
+# This is a part of the GNU coreutils and is not included
+# in KISS. All 'fmt -1' does is split each word in a string
+# on a new line so lets just use the shell as an alternative.
 mkdir -p fakebin
 cat > fakebin/fmt <<EOF
 #!/bin/sh -f
 printf '%s\n' \$(cat -)
 EOF
 chmod +x fakebin/fmt
-
 export PATH=$PATH:$PWD/fakebin
+
+# The build fails when using busybox's 'mkdir'(?),
+# swap to using 'install -d' instead which works.
 export MKDIR_P="install -d"
 
 ./configure \
@@ -38,7 +45,7 @@ export MKDIR_P="install -d"
     --with-default-pid-dir=/run \
     --with-default-run-dir=/run/lvm
 
-make V=1 DESTDIR="$1" install
+make DESTDIR="$1" install || sh
 
 # Make all libraries and binaries writable.
 chmod -v u+w "$1/usr/lib/"* \
diff --git a/testing/lvm2/checksums b/extra/lvm2/checksums
similarity index 100%
rename from testing/lvm2/checksums
rename to extra/lvm2/checksums
diff --git a/testing/lvm2/depends b/extra/lvm2/depends
similarity index 100%
rename from testing/lvm2/depends
rename to extra/lvm2/depends
diff --git a/testing/lvm2/patches/001-include_fix.patch b/extra/lvm2/patches/001-include_fix.patch
similarity index 100%
rename from testing/lvm2/patches/001-include_fix.patch
rename to extra/lvm2/patches/001-include_fix.patch
diff --git a/testing/lvm2/patches/disable-symver.patch b/extra/lvm2/patches/disable-symver.patch
similarity index 100%
rename from testing/lvm2/patches/disable-symver.patch
rename to extra/lvm2/patches/disable-symver.patch
diff --git a/testing/lvm2/patches/fix-stdio-usage.patch b/extra/lvm2/patches/fix-stdio-usage.patch
similarity index 100%
rename from testing/lvm2/patches/fix-stdio-usage.patch
rename to extra/lvm2/patches/fix-stdio-usage.patch
diff --git a/testing/lvm2/patches/mlockall-default-config.patch b/extra/lvm2/patches/mlockall-default-config.patch
similarity index 100%
rename from testing/lvm2/patches/mlockall-default-config.patch
rename to extra/lvm2/patches/mlockall-default-config.patch
diff --git a/testing/lvm2/patches/musl-fix-include.patch b/extra/lvm2/patches/musl-fix-include.patch
similarity index 100%
rename from testing/lvm2/patches/musl-fix-include.patch
rename to extra/lvm2/patches/musl-fix-include.patch
diff --git a/testing/lvm2/patches/portability.patch b/extra/lvm2/patches/portability.patch
similarity index 100%
rename from testing/lvm2/patches/portability.patch
rename to extra/lvm2/patches/portability.patch
diff --git a/testing/lvm2/sources b/extra/lvm2/sources
similarity index 100%
rename from testing/lvm2/sources
rename to extra/lvm2/sources
diff --git a/testing/lvm2/version b/extra/lvm2/version
similarity index 100%
rename from testing/lvm2/version
rename to extra/lvm2/version