From 946bfa2725a252f455d00433c8db08fe2325575a Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 7 Dec 2017 13:45:22 -0500 Subject: [PATCH] bump(sys-fs/multipath-tools): sync with upstream --- .../md5-cache/sys-fs/multipath-tools-0.5.0-r1 | 2 +- .../md5-cache/sys-fs/multipath-tools-0.6.2 | 13 - .../md5-cache/sys-fs/multipath-tools-0.6.2-r1 | 13 - .../md5-cache/sys-fs/multipath-tools-0.6.2-r2 | 13 - .../md5-cache/sys-fs/multipath-tools-0.6.4-r1 | 13 + .../md5-cache/sys-fs/multipath-tools-0.7.1 | 13 + .../md5-cache/sys-fs/multipath-tools-0.7.2 | 13 + .../md5-cache/sys-fs/multipath-tools-0.7.3 | 13 + .../md5-cache/sys-fs/multipath-tools-0.7.4 | 13 + .../sys-fs/multipath-tools/Manifest | 19 +- .../multipath-tools-0.6.2-makefile.patch | 239 ------------------ .../multipath-tools-0.6.4-sysmacros.patch | 60 +++++ ...ools-0.7.3-fix-build-without-systemd.patch | 39 +++ .../multipath-tools-0.7.4-respect-flags.patch | 17 ++ .../sys-fs/multipath-tools/files/multipath.rc | 1 - .../multipath-tools/files/rc-multipathd | 1 - .../sys-fs/multipath-tools/metadata.xml | 11 +- .../multipath-tools-0.5.0-r1.ebuild | 1 - .../multipath-tools-0.6.2-r1.ebuild | 67 ----- .../multipath-tools-0.6.2-r2.ebuild | 68 ----- .../multipath-tools-0.6.2.ebuild | 61 ----- .../multipath-tools-0.6.4-r1.ebuild | 99 ++++++++ .../multipath-tools-0.7.1.ebuild | 94 +++++++ .../multipath-tools-0.7.2.ebuild | 94 +++++++ .../multipath-tools-0.7.3.ebuild | 96 +++++++ .../multipath-tools-0.7.4.ebuild | 96 +++++++ 26 files changed, 673 insertions(+), 496 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.1 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.2 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.3 create mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.4 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1 index 2684e5adee..5254c184e9 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.5.0-r1 @@ -10,4 +10,4 @@ RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio sys-libs/readli SLOT=0 SRC_URI=http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-0.5.0.tar.bz2 _eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=a334832c59439e1e6848a21ecb1e06a6 +_md5_=aa60bc1ee279f31a216871aa1d8e44a8 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2 deleted file mode 100644 index 0dc01672c5..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst -DEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=Device mapper target autoconfig -EAPI=6 -HOMEPAGE=http://christophe.varoqui.free.fr/ -IUSE=systemd -KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 -LICENSE=GPL-2 -RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline systemd? ( sys-apps/systemd ) -SLOT=0 -SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz -> multipath-tools-0.6.2.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=2f5ce0976185c42307c8a4c972ef760d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r1 deleted file mode 100644 index df7c425942..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst -DEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=Device mapper target autoconfig -EAPI=6 -HOMEPAGE=http://christophe.varoqui.free.fr/ -IUSE=systemd -KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 -LICENSE=GPL-2 -RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline systemd? ( sys-apps/systemd ) -SLOT=0 -SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz -> multipath-tools-0.6.2.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=fa2d96a50582cac7700eacced4a8d73d diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r2 deleted file mode 100644 index 9ffdf51d1a..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.2-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst -DEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:* systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig -DESCRIPTION=Device mapper target autoconfig -EAPI=6 -HOMEPAGE=http://christophe.varoqui.free.fr/ -IUSE=systemd -KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 -LICENSE=GPL-2 -RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:* systemd? ( sys-apps/systemd ) -SLOT=0 -SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=e165b73a16fc9027aa3306df40052038c175be1b;sf=tgz -> multipath-tools-0.6.2.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 -_md5_=ce444beb41555e37bef74bd8567d2fad diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 new file mode 100644 index 0000000000..c539fa8bb0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.6.4-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare pretend setup unpack +DEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Device mapper target autoconfig +EAPI=6 +HOMEPAGE=http://christophe.varoqui.free.fr/ +IUSE=systemd rbd +KEYWORDS=amd64 ~arm ~arm64 ~ppc ppc64 x86 +LICENSE=GPL-2 +RDEPEND=>=sys-fs/lvm2-2.02.45 >=virtual/udev-171 dev-libs/libaio dev-libs/userspace-rcu sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) +SLOT=0 +SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.6.4;sf=tgz -> multipath-tools-0.6.4.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=82c303355e7dc80f58a46ea75a3b48ed diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.1 new file mode 100644 index 0000000000..d59d71760f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare pretend setup unpack +DEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Device mapper target autoconfig +EAPI=6 +HOMEPAGE=http://christophe.varoqui.free.fr/ +IUSE=systemd rbd +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) +SLOT=0 +SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.1;sf=tgz -> multipath-tools-0.7.1.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=08f43c2543ea1fd35b65ec5bb2f1e199 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.2 new file mode 100644 index 0000000000..96c69af86d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare pretend setup unpack +DEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Device mapper target autoconfig +EAPI=6 +HOMEPAGE=http://christophe.varoqui.free.fr/ +IUSE=systemd rbd +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) +SLOT=0 +SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.2;sf=tgz -> multipath-tools-0.7.2.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=08f43c2543ea1fd35b65ec5bb2f1e199 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.3 new file mode 100644 index 0000000000..ae282b5e4c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare pretend setup unpack +DEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Device mapper target autoconfig +EAPI=6 +HOMEPAGE=http://christophe.varoqui.free.fr/ +IUSE=systemd rbd +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) +SLOT=0 +SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.3;sf=tgz -> multipath-tools-0.7.3.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=fb81f8651b8dc728c97dc979f980762b diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.4 new file mode 100644 index 0000000000..2affcf15ed --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-fs/multipath-tools-0.7.4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare pretend setup unpack +DEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig +DESCRIPTION=Device mapper target autoconfig +EAPI=6 +HOMEPAGE=http://christophe.varoqui.free.fr/ +IUSE=systemd rbd +KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 +LICENSE=GPL-2 +RDEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) +SLOT=0 +SRC_URI=https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.4;sf=tgz -> multipath-tools-0.7.4.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af udev d91cac2c73b94629cad2daea66e0d182 vcs-snapshot 03289f51c769cf409d200d2d628cdd6e versionator c80ccf29e90adea7c5cae94b42eb76d0 +_md5_=59abdac909993d8636095bc5c4a9bada diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest index 7b9429152f..ebd40ad948 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/Manifest @@ -1,15 +1,6 @@ -AUX multipath-tools-0.5.0-makefile.patch 6790 SHA256 e6810a05b059f542fdfeea72f0befbafaadd71563f4d78df4bc37380a1376cf0 SHA512 bed96f4cdb40df1e4c126a218c67c2a48a9c9a5df8248848ff69d928f07f1cf6ffd97e02dc0aa086171d4d65f56144c918267874b6b551e689243364908b5cf1 WHIRLPOOL 2621de1450390933029f60155562da28b524b92c553c080e2a42fac8629e12e26c63a7a3ebd3e820f21351d1d84c24a0fe5f262432ac1c14b8cf57310c918b34 -AUX multipath-tools-0.5.0-systemd-pkgconfig.patch 1192 SHA256 84dfec6872fe613680bdc9207663260aa47779eb0640ed3ff264efff9e83aa7b SHA512 60b5717b0e3fd9a3d422b756359ce6bb5018346c104bd45543135257b1c4efb3c586d188e35176bbcfa2c81ed9d4824e3c96cc395e52605934e9cc4935f17fec WHIRLPOOL 710787df816072669d9e50717846da75bc5358328d25003979b98a589a9478114e2681d3da4c8866ad21af0ce09b628301314c02f2879d34f564c695fe92dc88 -AUX multipath-tools-0.6.2-ignore-modprobe-failures.patch 831 SHA256 7149b88d157d72f851ddfd6ded87f15790177717922a6f6fcd921c6d78a325a5 SHA512 62e40c6577bc7cd24f3283de94692cc7550d39a9caa255ca5d77c2d3c324a85c0364fca73b154f17197cf38b82b171eae759f9eb1ecf8ab5801afafd42b1b156 WHIRLPOOL d9ee6cdc948fcfd66445870520c1a70ebf053dfeedf6e7f48fdef9d0de90f84e5cd87122aa95e2c56b7d4cd33743f71ed8af9b0f36ec0ac372cc946d81a58f06 -AUX multipath-tools-0.6.2-makefile.patch 9620 SHA256 6182abbd2ed1407bb95ddc26d04577a63a9f6de79c380bdf5ba89eff61825778 SHA512 c7829a72867e9dc157eeb2367a4f68ecb9530a2b1681193e4fbeec1eb1037db39269f9869a189e34778df1ea4f8c1ba7b77acb5651cff6f744de8fe2d8e7f50c WHIRLPOOL 71fdac700a9e754a32842602642675cae7e50732632badb49a0cdb81a7b2aa952e6e35b3e2029badd3beed4ab18e7b93430663f2ad780e442c974720ba3da146 -AUX multipath.rc 572 SHA256 374032acc135eef2cfdfb6c50339b7806de08d487e4fb86040eb7314bea7e2dd SHA512 5902ea855ba3ffec150d7629f370a3c3c9a35888593e45784c34e5ac9090cfa60c578a9eb67ecb17d7f29ba743eb9d3d06af1b87421f6a67bb57629c9779ae8e WHIRLPOOL 9ca3a32978e0e61b9282363464b13ea30cbfc233943a9d2e8e7f6e790bfcc74f618c3d9c327623654845914365b46b53bc8f3bba9b55f2776f03fd4000486d60 -AUX rc-multipathd 409 SHA256 b80c4634ac054aa30b7ad097f1b4ed3156201641f4ab29e48f973dc84f414c62 SHA512 64fd4962d6adde228c1b88249bbc95bc8fe6909fa2067d73b66a96ca8668e5878e529eddc1771092b633a45a3fd071161452463cda1aa907c4f0618c83efb88a WHIRLPOOL 1c30f80838bcb865e17c860d7ec2cf8a0be21702900f8a9de96326fe4d82b6f1a64f5c37d95fceb2ae6be9159289b3372d2d9ec451271657007186efd51fe6eb DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 WHIRLPOOL bc8a365d66d1c5f584de04304125949926d4a1576cba4a00acca0f1333eb13d83318da36d9d88c5dc92691a331d427ad6b99eb1f2983fbc387303dbfdbae11ff -DIST multipath-tools-0.6.2.tar.gz 242413 SHA256 f5cec5d92d56ec99220fccc1e70b9d10bc8ff5039c809ebcc201ce34d7ee3095 SHA512 8a04302002bf778299495e4be2d4302c19350d8ec218da23c5f781233efa6d0b39208a676b0d770771d7f09d62fa2b1ce32c03f60662691f74afb111e918b639 WHIRLPOOL f040273bd188c30f2f3b87e21a403b5f5d3ce2f0918382890cc0750b803bf05f70ed6bf46a83c5b68137835bc9bcf6cbca14f6462cfbef660667118b59eafc7d -EBUILD multipath-tools-0.5.0-r1.ebuild 1735 SHA256 dfc25740f33f7bc4c9c08613b2c66699414b168670fe9816cc623e5dacf2d3af SHA512 06d817bc747d0ce7c35729f2bf581261068b22baa8ccbbff717e4e0e4b7362b9b9030faeca6f67e558e9775fa529257528980f8568f29ea61383004eb191d899 WHIRLPOOL bfa70e15b1428836c326ef78abfe105da3fafc1df966cfaee2f6951efcf1ac6380c71354807825baedbd1fb7692e3c6f586da0d69273142d982b2b71fe701313 -EBUILD multipath-tools-0.6.2-r1.ebuild 1603 SHA256 e2d2b5c8d497c208f5237d44b1450f1385422721a7c5cc147544732a73bdba49 SHA512 faa79d757274ed9afc4d4eba90653738c79a6e03485b2c8ec6b562487668195191d8da73da598b3efe30593444bc5a3cd55c582a196b15ec9dcfd8d74f1d13ed WHIRLPOOL 90e0105f5e114c83e71b6338703efa700704ba6e8111e7f506feb20ca42feb29a5105347376dec0583983b9aa485861680eb5522dd98e0b53201704a02658814 -EBUILD multipath-tools-0.6.2-r2.ebuild 1663 SHA256 ee3a9ca3dde0e8c6fefa76dadcd739ba4368662df0fac27f7938a6e57e10c3ed SHA512 fe0a4dd920560924257469a296e8aad585d5a3b0a4c491b2dfabdcaa36f441be06e2642d16b8a44ea7416e7a5d308f213bfc3131a0d6a854cd8e02070064083e WHIRLPOOL 1b71d6026193dc2b5c8bb43ffc5af9bc2bfce0032489f1bd186446c6c4013f44ac8aeec384087c9cc0ebee0d3b546275fbdb0fbb9493e9b5d58a0e57871f9a49 -EBUILD multipath-tools-0.6.2.ebuild 1520 SHA256 7e71c80c2be8302c5be6f7fb47cd80053e2d8fadcf5df422c5bdd50aa4c10da1 SHA512 e79dba80279b50929dcc5ab997907ffe814bc4f05b887c390bfa3219e3e808caa9435ad040d46ef090a36c4047ef8b7aeb57278bc96fa72e30890201fcd08fc1 WHIRLPOOL 95c0bd9761d84416dc6aee2a9180916e36dd388563fd1080e4c74c5c61c077a97bd8c84112b91912e6ea60049fa6c48a2ddc5a070d9418f27f30e6775677ecf7 -MISC ChangeLog 5078 SHA256 539cfd87f64d5de2d687d73163ae333d6631a950c0bec78b39607bd2b18d08ed SHA512 47593517a8baee9753cdea2188d7a27905819c5d7c645fa7aa3396c9279bda8f02e8a56f073284aad1d2b1d78d3aa83093a92e3d833bbe2cab21fb392fb14b61 WHIRLPOOL 70e94e1df6d576f69b454f1be325c0ff6d4e4a4eb1757b2b714e40d18536f9793872be80d741a5d45641e89ba8fbb8da011f98c191fe64185c60e7d950211d32 -MISC ChangeLog-2015 12680 SHA256 cf384f2021fd11a53ad19d5df068a382d8f35f40f35cadba6d4aeff826a3945b SHA512 d8c52c8d4671ecd9ea0b4dca68328adda305711d221fa7ef52df1152a659b212229a6a52d552172e89db61002c261b3e099e173a11b9a508865540e75e4435ef WHIRLPOOL 0f9aa4d94dfe0bbc2a81575617b87a028c65b5087add91111f85640ef168fea90bd04417e6174d077fa6ae36b1e5755885105368f76adbb5833ad85b55dabb2c -MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 +DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216e7518468f03503985382ce2c69e5558b SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea WHIRLPOOL 6138ba1cbb814bbf53e7a5113f50325d7a7d7088ff2b0f83f1e574f0644241e368cc6b5223eca039b414a0a459a52413d396ea214ff3eaa57f0681e8322b2d9d +DIST multipath-tools-0.7.1.tar.gz 329008 SHA256 d788aaf3ea862b44b5aa07eaa0e5696061f972a1a46d0f469c4a4f4c477c1970 SHA512 81ceb3887250a691b94cb49b7141ace4fc1f69d7f8381e517560dfc7c51ee4c5a1f4f4e40a0b368cf5f7381697fa746b856cbade8990c1608cbcd77248946a82 WHIRLPOOL 2bcc7cc2f425ca3f3f634807cafb7817b54b83d82987a09c9dd530dca1375175a7d52f1854bdd6d5f37c3b1fcf7bc34d67fc2dcae5809dfae968b313c8c86cba +DIST multipath-tools-0.7.2.tar.gz 335187 SHA256 e4273527b8a8e31d596221dd74fdeb9f2b7558d59e514bc7eb040d077bddf24b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046 WHIRLPOOL 051956ab5c899ce98833925f84245f7450c7c01012edafdb6fff39762cf87908f53413c42f2ccb6059fd2717d29bf55ded260ade027b37ef0227a46b8266d8c7 +DIST multipath-tools-0.7.3.tar.gz 344030 SHA256 b59712c3068b9b33c2fc769eb499c637a0ddff7b46ae9d2cc411c4d61e233ffb SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace WHIRLPOOL 03b99202d2831513ba1fcc3e504ba3554b970c5bc366288a50e62e2225028dff972c102b7ae93d026026bea6614b5305a605122c91e0b8deeb91f9c98a68119f +DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch deleted file mode 100644 index e5e28aa731..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.2-makefile.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/kpartx/Makefile multipath-tools-e165b73/kpartx/Makefile ---- multipath-tools-e165b73.orig/kpartx/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/kpartx/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -12,7 +12,7 @@ - CFLAGS += -DLIBDM_API_COOKIE - endif - --LDFLAGS = -ldevmapper -+LIBS = -ldevmapper - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o ps3.o crc32.o lopart.o xstrncpy.o devmapper.o - EXEC = kpartx -@@ -20,8 +20,7 @@ - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: $(EXEC) $(EXEC).8 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) -@@ -31,14 +30,14 @@ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.d - $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) -- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ $(RM) $(DESTDIR)$(mandir)/$(EXEC).8 - $(RM) $(DESTDIR)$(libudevdir)/kpartx_id - $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules - $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules - - clean: -- $(RM) core *.o $(EXEC) *.gz -+ $(RM) core *.o $(EXEC) -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/libmpathcmd/Makefile multipath-tools-e165b73/libmpathcmd/Makefile ---- multipath-tools-e165b73.orig/libmpathcmd/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/libmpathcmd/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -27,4 +27,4 @@ - $(RM) $(DESTDIR)$(incdir)/mpath_cmd.h - - clean: -- $(RM) core *.a *.o *.gz *.so *.so.* -+ $(RM) core *.a *.o *.so *.so.* -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/libmpathpersist/Makefile multipath-tools-e165b73/libmpathpersist/Makefile ---- multipath-tools-e165b73.orig/libmpathpersist/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/libmpathpersist/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -18,10 +18,8 @@ - - $(LIBS): - $(CC) -Wall -fPIC -c $(CFLAGS) *.c -- $(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) -+ $(CC) $(SHARED_FLAGS) $(CFLAGS) $(LDFLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS) - $(LN) $(LIBS) $(DEVLIB) -- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz -- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz - - install: $(LIBS) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) -@@ -29,20 +27,18 @@ - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir) - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir) - $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(incdir) -- $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) -- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir) -- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir) -+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir) -+ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir) - $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(incdir) - - uninstall: - $(RM) $(DESTDIR)$(syslibdir)/$(LIBS) -- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz -- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz -+ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3 -+ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3 - $(RM) $(DESTDIR)$(incdir)/mpath_persist.h - $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB) - - clean: - $(RM) core *.a *.o -- $(RM) libmpathpersist.so.0 -- $(RM) libmpathpersist.so -- $(RM) mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz -+ $(RM) $(LIBS) -+ $(RM) $(DEVLIB) -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/libmultipath/Makefile multipath-tools-e165b73/libmultipath/Makefile ---- multipath-tools-e165b73.orig/libmultipath/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/libmultipath/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -70,4 +70,4 @@ - $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB) - - clean: -- $(RM) core *.a *.o *.gz *.so *.so.* -+ $(RM) core *.a *.o *.so *.so.* -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/Makefile.inc multipath-tools-e165b73/Makefile.inc ---- multipath-tools-e165b73.orig/Makefile.inc 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/Makefile.inc 2016-08-05 10:47:41.623054217 -0700 -@@ -61,7 +61,7 @@ - INSTALL_PROGRAM = install - - OPTFLAGS = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \ -- -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -+ -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 - - CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" - SHARED_FLAGS = -shared -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/mpathpersist/Makefile multipath-tools-e165b73/mpathpersist/Makefile ---- multipath-tools-e165b73.orig/mpathpersist/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/mpathpersist/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -5,26 +5,24 @@ - OBJS = main.o - - CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) --LDFLAGS += -lpthread -ldevmapper -L$(mpathpersistdir) -lmpathpersist -L$(multipathdir) -L$(mpathcmddir) -lmpathcmd -lmultipath -ludev -+LIBS += -lpthread -ldevmapper -L$(mpathpersistdir) -lmpathpersist -L$(multipathdir) -L$(mpathcmddir) -lmpathcmd -lmultipath -ludev - - EXEC = mpathpersist - - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) -g $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) -g $(OBJS) -o $(EXEC) $(LIBS) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - clean: - $(RM) *.o $(EXEC) -- $(RM) mpathpersist.8.gz - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) -- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ $(RM) $(DESTDIR)$(mandir)/$(EXEC).8 -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/multipath/Makefile multipath-tools-e165b73/multipath/Makefile ---- multipath-tools-e165b73.orig/multipath/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/multipath/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -7,7 +7,7 @@ - OBJS = main.o - - CFLAGS += -I$(multipathdir) -I$(mpathcmddir) --LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev \ -+LIBS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev \ - -L$(mpathcmddir) -lmpathcmd - - EXEC = multipath -@@ -15,9 +15,7 @@ - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $(EXEC) $(LIBS) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) -@@ -26,16 +24,14 @@ - $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) - $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules - $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules -- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz -- $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz - - clean: -- $(RM) core *.o $(EXEC) *.gz -+ $(RM) core *.o $(EXEC) -diff -Nuar --exclude '*~' multipath-tools-e165b73.orig/multipathd/Makefile multipath-tools-e165b73/multipathd/Makefile ---- multipath-tools-e165b73.orig/multipathd/Makefile 2016-07-22 02:38:14.000000000 -0700 -+++ multipath-tools-e165b73/multipathd/Makefile 2016-08-05 10:47:28.248804380 -0700 -@@ -9,15 +9,15 @@ - ifdef SYSTEMD - CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD) - endif --LDFLAGS += -lurcu -lpthread -ldevmapper -lreadline -+LIBS += -lurcu -lpthread -ldevmapper -lreadline - ifdef SYSTEMD - ifeq ($(shell test $(SYSTEMD) -gt 209 && echo 1), 1) -- LDFLAGS += -lsystemd -+ LIBS += -lsystemd - else -- LDFLAGS += -lsystemd-daemon -+ LIBS += -lsystemd-daemon - endif - endif --LDFLAGS += -ludev -ldl \ -+LIBS += -ludev -ldl \ - -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \ - -L$(mpathcmddir) -lmpathcmd - -@@ -40,8 +40,7 @@ - all : $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) -@@ -52,13 +51,13 @@ - $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir) - endif - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - $(RM) $(DESTDIR)$(bindir)/$(EXEC) -- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ $(RM) $(DESTDIR)$(mandir)/$(EXEC).8 - $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service - $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket - - clean: -- $(RM) core *.o $(EXEC) *.gz -+ $(RM) core *.o $(EXEC) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch new file mode 100644 index 0000000000..99a12fc7b7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch @@ -0,0 +1,60 @@ +diff --git a/kpartx/dasd.c b/kpartx/dasd.c +index 1206e45..f50c1bd 100644 +--- a/kpartx/dasd.c ++++ b/kpartx/dasd.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c +index d31fea8..3452787 100644 +--- a/kpartx/kpartx.c ++++ b/kpartx/kpartx.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c +index 4d6c3c2..d9a9e67 100644 +--- a/libmultipath/checkers/tur.c ++++ b/libmultipath/checkers/tur.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c +index 4f8ef13..9c0b240 100644 +--- a/libmultipath/devmapper.c ++++ b/libmultipath/devmapper.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + + #include "checkers.h" + #include "vector.h" +diff --git a/libmultipath/util.c b/libmultipath/util.c +index 03a5738..1841f35 100644 +--- a/libmultipath/util.c ++++ b/libmultipath/util.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch new file mode 100644 index 0000000000..d92e5c05c7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch @@ -0,0 +1,39 @@ +From f0a874f9bd86504840a7bdbf0a0c07bcd0ea8c29 Mon Sep 17 00:00:00 2001 +From: Michael Lass +Date: Wed, 20 Sep 2017 21:54:32 +0200 +Subject: [PATCH] multipathd: fix build without systemd + +do_sd_notify contains a call to sd_notify which is unknown if USE_SYSTEMD is +undefined. In this case, do_sd_notify is never called anyway, so embed the +entire function into an #ifdef USE_SYSTEMD. + +This fixes a regression introduced in 88ddca5. + +Signed-off-by: Michael Lass +--- + multipathd/main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/multipathd/main.c b/multipathd/main.c +index 8049da22..bbe14771 100644 +--- a/multipathd/main.c ++++ b/multipathd/main.c +@@ -169,6 +169,7 @@ sd_notify_status(void) + return NULL; + } + ++#ifdef USE_SYSTEMD + static void do_sd_notify(enum daemon_status old_state) + { + /* +@@ -181,6 +182,7 @@ static void do_sd_notify(enum daemon_status old_state) + return; + sd_notify(0, sd_notify_status()); + } ++#endif + + static void config_cleanup(void *arg) + { +-- +2.14.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch new file mode 100644 index 0000000000..19573fe6ee --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath-tools-0.7.4-respect-flags.patch @@ -0,0 +1,17 @@ +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -90,11 +90,12 @@ OPTFLAGS = -O2 -g -pipe -Wall -Wextra -Wformat=2 -Werror=implicit-int \ + -Wp,-D_FORTIFY_SOURCE=2 $(STACKPROT) \ + --param=ssp-buffer-size=4 + +-CFLAGS = $(OPTFLAGS) -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" ++CFLAGS ?= $(OPTFLAGS) ++CFLAGS += -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" + BIN_CFLAGS = -fPIE -DPIE + LIB_CFLAGS = -fPIC + SHARED_FLAGS = -shared +-LDFLAGS = -Wl,-z,relro -Wl,-z,now ++LDFLAGS += -Wl,-z,relro -Wl,-z,now + BIN_LDFLAGS = -pie + + # Check whether a function with name $1 has been declared in header file $2. diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath.rc b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath.rc index 150b0edce7..576026ace6 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath.rc +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/multipath.rc @@ -1,7 +1,6 @@ #!/sbin/openrc-run # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ depend() { before checkfs fsck multipathd iscsid lvm diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd index aba0c24620..d4d440f2c9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/files/rc-multipathd @@ -1,7 +1,6 @@ #!/sbin/openrc-run # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ depend() { need localmount diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml index 56c1244130..9a20c9e5bc 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/metadata.xml @@ -1,8 +1,11 @@ - - base-system@gentoo.org - Gentoo Base System - + + base-system@gentoo.org + Gentoo Base System + + + Enable Rados block device support via sys-cluster/ceph + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild index 02af8261dd..0edaad0c28 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.5.0-r1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=4 inherit eutils systemd toolchain-funcs udev diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild deleted file mode 100644 index f5044df0bc..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -COMMIT_ID='e165b73a16fc9027aa3306df40052038c175be1b' -SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${COMMIT_ID};sf=tgz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="systemd" - -RDEPEND=">=sys-fs/lvm2-2.02.45 - >=virtual/udev-171 - dev-libs/libaio - dev-libs/userspace-rcu - sys-libs/readline - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${COMMIT_ID:0:7}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.2-makefile.patch -) - -get_systemd_pv() { - use systemd && \ - $(tc-getPKG_CONFIG) --modversion systemd -} - -src_compile() { - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD="$(get_systemd_pv)" -} - -src_install() { - local udevdir="$(get_udevdir)" - - dodir /sbin /usr/share/man/man{5,8} - emake \ - DESTDIR="${D}" \ - SYSTEMD=$(get_systemd_pv) \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='${prefix}'/"${udevdir}" \ - install - - newinitd "${FILESDIR}"/rc-multipathd multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - dodoc README ChangeLog -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild deleted file mode 100644 index 5f0ffa7832..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -COMMIT_ID='e165b73a16fc9027aa3306df40052038c175be1b' -SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${COMMIT_ID};sf=tgz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="systemd" - -RDEPEND=">=sys-fs/lvm2-2.02.45 - >=virtual/udev-171 - dev-libs/libaio - dev-libs/userspace-rcu - sys-libs/readline:* - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${COMMIT_ID:0:7}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.2-makefile.patch - "${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch -) - -get_systemd_pv() { - use systemd && \ - $(tc-getPKG_CONFIG) --modversion systemd -} - -src_compile() { - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD="$(get_systemd_pv)" -} - -src_install() { - local udevdir="$(get_udevdir)" - - dodir /sbin /usr/share/man/man{5,8} - emake \ - DESTDIR="${D}" \ - SYSTEMD=$(get_systemd_pv) \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='${prefix}'/"${udevdir}" \ - install - - newinitd "${FILESDIR}"/rc-multipathd multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - dodoc README ChangeLog -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2.ebuild deleted file mode 100644 index 3ec454b244..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit eutils systemd toolchain-funcs udev - -DESCRIPTION="Device mapper target autoconfig" -HOMEPAGE="http://christophe.varoqui.free.fr/" -COMMIT_ID='e165b73a16fc9027aa3306df40052038c175be1b' -SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${COMMIT_ID};sf=tgz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="systemd" - -RDEPEND=">=sys-fs/lvm2-2.02.45 - >=virtual/udev-171 - dev-libs/libaio - dev-libs/userspace-rcu - sys-libs/readline - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${COMMIT_ID:0:7}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.2-makefile.patch -) - -src_compile() { - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)" SYSTEMD=$(usex systemd 1 "") -} - -src_install() { - local udevdir="$(get_udevdir)" - - dodir /sbin /usr/share/man/man{5,8} - emake \ - DESTDIR="${D}" \ - SYSTEMD=$(usex systemd 1 "") \ - unitdir="$(systemd_get_systemunitdir)" \ - libudevdir='${prefix}'/"${udevdir}" \ - install - - newinitd "${FILESDIR}"/rc-multipathd multipathd - newinitd "${FILESDIR}"/multipath.rc multipath - - dodoc README ChangeLog -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "If you need multipath on your system, you must" - elog "add 'multipath' into your boot runlevel!" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild new file mode 100644 index 0000000000..145cbda2b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86" +IUSE="systemd rbd" + +RDEPEND=">=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + dev-libs/libaio + dev-libs/userspace-rcu + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( + # modprobe fails when modules are compiled statically into the kernel + # https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html + "${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch + + # https://bugs.gentoo.org/show_bug.cgi?id=604228 + # https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html + "${FILESDIR}"/${P}-sysmacros.patch +) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # Fix for bug #624884 + if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then + sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die + else + elog "DM_TABLE_STATE sed hack is no longer necessary." + fi + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild new file mode 100644 index 0000000000..fdc2ed3abb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=" + dev-libs/json-c + dev-libs/libaio + dev-libs/userspace-rcu + >=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +CONFIG_CHECK="~DM_MULTIPATH" + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # Fix for bug #624884 + if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then + sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die + else + elog "DM_TABLE_STATE sed hack is no longer necessary." + fi + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild new file mode 100644 index 0000000000..fdc2ed3abb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=" + dev-libs/json-c + dev-libs/libaio + dev-libs/userspace-rcu + >=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +CONFIG_CHECK="~DM_MULTIPATH" + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # Fix for bug #624884 + if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then + sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die + else + elog "DM_TABLE_STATE sed hack is no longer necessary." + fi + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild new file mode 100644 index 0000000000..577cbe8db1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=" + dev-libs/json-c + dev-libs/libaio + dev-libs/userspace-rcu + >=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.3-fix-build-without-systemd.patch ) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # Fix for bug #624884 + if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then + sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die + else + elog "DM_TABLE_STATE sed hack is no longer necessary." + fi + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild new file mode 100644 index 0000000000..b114189a86 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/multipath-tools/multipath-tools-0.7.4.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd" + +RDEPEND=" + dev-libs/json-c + dev-libs/libaio + dev-libs/userspace-rcu + >=sys-fs/lvm2-2.02.45 + >=virtual/udev-171 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( "${FILESDIR}"/${PN}-0.7.4-respect-flags.patch ) + +get_systemd_pv() { + use systemd && \ + $(tc-getPKG_CONFIG) --modversion systemd +} + +pkg_pretend() { + linux-info_pkg_setup +} + +pkg_setup() { + linux-info_pkg_setup +} + +src_prepare() { + default + + # Fix for bug #624884 + if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then + sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die + else + elog "DM_TABLE_STATE sed hack is no longer necessary." + fi + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proer configure system + if ! use rbd ; then + sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile + sed -i -e "s/-lrados//" libmultipath/checkers/Makefile + fi +} + +src_compile() { + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + CC="$(tc-getCC)" \ + LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)" +} + +src_install() { + dodir /sbin /usr/share/man/man{5,8} + emake \ + DESTDIR="${D}" \ + SYSTEMD=$(get_systemd_pv) \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + install + + newinitd "${FILESDIR}"/rc-multipathd multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +}