From 821d166ba7658561661d82b8efd0a38553318515 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Wed, 6 Jun 2018 07:30:52 +0200 Subject: sys-fs/lvm2: Add patch for bug #657446. Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch | 12 ++++++++++++ sys-fs/lvm2/lvm2-2.02.166-r2.ebuild | 1 + sys-fs/lvm2/lvm2-2.02.166.ebuild | 3 ++- sys-fs/lvm2/lvm2-2.02.171.ebuild | 1 + sys-fs/lvm2/lvm2-2.02.172.ebuild | 1 + sys-fs/lvm2/lvm2-2.02.173.ebuild | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch (limited to 'sys-fs') diff --git a/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch b/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch new file mode 100644 index 000000000000..0f830e428b10 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.02.166-HPPA-no-O_DIRECT.patch @@ -0,0 +1,12 @@ +--- a/lib/device/dev-io.c ++++ b/lib/device/dev-io.c +@@ -505,7 +505,9 @@ + dev->flags |= DEV_NOT_O_NOATIME; + if ((dev->fd = open(name, flags, 0777)) >= 0) { + log_debug_devs("%s: Not using O_NOATIME", name); ++#ifdef O_DIRECT_SUPPORT + goto opened; ++#endif + } + } + #endif diff --git a/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild index a3c5716ea491..fdb4989247e1 100644 --- a/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.166-r2.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) diff --git a/sys-fs/lvm2/lvm2-2.02.166.ebuild b/sys-fs/lvm2/lvm2-2.02.166.ebuild index 64406fb5ae33..b8cb4920dfde 100644 --- a/sys-fs/lvm2/lvm2-2.02.166.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.166.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) diff --git a/sys-fs/lvm2/lvm2-2.02.171.ebuild b/sys-fs/lvm2/lvm2-2.02.171.ebuild index 28862e26bce6..ecb100973acf 100644 --- a/sys-fs/lvm2/lvm2-2.02.171.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.171.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 + "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) diff --git a/sys-fs/lvm2/lvm2-2.02.172.ebuild b/sys-fs/lvm2/lvm2-2.02.172.ebuild index 7d02c914775e..dc9bc01f9ae7 100644 --- a/sys-fs/lvm2/lvm2-2.02.172.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.172.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 + "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) diff --git a/sys-fs/lvm2/lvm2-2.02.173.ebuild b/sys-fs/lvm2/lvm2-2.02.173.ebuild index 7d02c914775e..dc9bc01f9ae7 100644 --- a/sys-fs/lvm2/lvm2-2.02.173.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.173.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.02.172-static-pkgconfig-libs.patch #370217, #439414 + blkid "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 + "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream ) -- cgit v1.2.3-65-gdbad