summaryrefslogtreecommitdiffstats
path: root/source/a/lvm2
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committer Eric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/a/lvm2
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.xz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/a/lvm2')
-rw-r--r--source/a/lvm2/create-dm-run-dir.diff13
-rw-r--r--source/a/lvm2/fix-build-with-udev-183.patch44
-rwxr-xr-xsource/a/lvm2/lvm2.SlackBuild10
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 \