diff options
Diffstat (limited to 'source/a/lvm2')
| -rw-r--r-- | source/a/lvm2/create-dm-run-dir.diff | 13 | ||||
| -rw-r--r-- | source/a/lvm2/fix-build-with-udev-183.patch | 44 | ||||
| -rwxr-xr-x | source/a/lvm2/lvm2.SlackBuild | 10 |
3 files changed, 18 insertions, 49 deletions
diff --git a/source/a/lvm2/create-dm-run-dir.diff b/source/a/lvm2/create-dm-run-dir.diff new file mode 100644 index 000000000..a0e0a54fd --- /dev/null +++ b/source/a/lvm2/create-dm-run-dir.diff @@ -0,0 +1,13 @@ +diff -Nur LVM2.2.02.114.orig/daemons/dmeventd/dmeventd.c LVM2.2.02.114/daemons/dmeventd/dmeventd.c +--- LVM2.2.02.114.orig/daemons/dmeventd/dmeventd.c 2014-11-28 17:07:42.000000000 -0600 ++++ LVM2.2.02.114/daemons/dmeventd/dmeventd.c 2014-12-08 22:46:58.702066654 -0600 +@@ -2176,6 +2176,9 @@ + if (_restart) + restart(); + ++ /* Create rundir */ ++ mkdir(DEFAULT_DM_RUN_DIR, 0700); ++ + #ifdef __linux__ + _systemd_activation = _systemd_handover(&fifos); + #endif diff --git a/source/a/lvm2/fix-build-with-udev-183.patch b/source/a/lvm2/fix-build-with-udev-183.patch deleted file mode 100644 index 747926c44..000000000 --- a/source/a/lvm2/fix-build-with-udev-183.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 57f4ebb843195bdd29c0d58e1659eeb0e9700081 Mon Sep 17 00:00:00 2001 -From: "Wulf C. Krueger" <philantrop@exherbo.org> -Date: Sun, 27 May 2012 00:34:55 +0200 -Subject: [PATCH] lvm2: Fix build with systemd/udev-183. - ---- - lib/misc/lvm-wrappers.c | 2 +- - tools/dmsetup.c | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/lib/misc/lvm-wrappers.c b/lib/misc/lvm-wrappers.c -index 84f61a6..d4fcea6 100644 ---- a/lib/misc/lvm-wrappers.c -+++ b/lib/misc/lvm-wrappers.c -@@ -72,7 +72,7 @@ const char *udev_get_dev_dir(void) - return NULL; - } - -- return udev_get_dev_path(_udev); -+ return "/dev"; - } - - struct udev* udev_get_library_context(void) -diff --git a/tools/dmsetup.c b/tools/dmsetup.c -index 6934de8..e09b56c 100644 ---- a/tools/dmsetup.c -+++ b/tools/dmsetup.c -@@ -1009,7 +1009,7 @@ static int _udevcookies(CMD_ARGS) - static int _set_up_udev_support(const char *dev_dir) - { - struct udev *udev; -- const char *udev_dev_dir; -+ const char *udev_dev_dir = "/dev"; - size_t udev_dev_dir_len; - int dirs_diff; - const char *env; -@@ -1031,7 +1031,6 @@ static int _set_up_udev_support(const char *dev_dir) - _udev_cookie); - - if (!(udev = udev_new()) || -- !(udev_dev_dir = udev_get_dev_path(udev)) || - !*udev_dev_dir) { - log_error("Could not get udev dev path."); - return 0; diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild index d662476c5..d3251c679 100755 --- a/source/a/lvm2/lvm2.SlackBuild +++ b/source/a/lvm2/lvm2.SlackBuild @@ -29,7 +29,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -40,8 +40,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-lvm2 -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -68,8 +68,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Not yet. -#zcat $CWD/fix-build-with-udev-183.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/create-dm-run-dir.diff.gz | patch -p1 --verbose || exit 1 # uid 0 = root # gid 6 = disk @@ -93,6 +92,7 @@ CFLAGS="$SLKCFLAGS" \ --with-device-mode=0660 \ --with-default-locking-dir=/run/lock/lvm \ --with-default-run-dir=/run/lvm \ + --with-default-dm-run-dir=/run/lvm \ --with-clvmd-pidfile=/run/lvm/clvmd.pid \ --with-cmirrord-pidfile=/run/lvm/cmirrord.pid \ --with-dmeventd-pidfile=/run/lvm/dmeventd.pid \ |