commit: 82299c2b5f256f547f321d1af9385adb0c91bf00 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Jan 10 19:02:24 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Jan 10 19:05:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82299c2b
sys-fs/mdadm: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-fs/mdadm/Manifest | 2 - sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch | 16 ----- sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch | 26 -------- sys-fs/mdadm/files/mdadm.service | 13 ---- sys-fs/mdadm/files/mdadm.tmpfiles.conf | 1 - sys-fs/mdadm/mdadm-3.2.6-r1.ebuild | 75 ---------------------- sys-fs/mdadm/mdadm-3.3.4.ebuild | 82 ------------------------- 7 files changed, 215 deletions(-) diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index 82052a8..2e5193d 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -1,6 +1,4 @@ -DIST mdadm-3.2.6.tar.bz2 371525 SHA256 c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38 SHA512 1ebcd4c797cd9f7388f9a27372a19205dc81a4b19adc83e1d6d7cfd4ef18f40a211fddf59ed027a1bf35bd36d4b6795e88e8086c3b022c188ec6e9f68bf1a4ee WHIRLPOOL 61d07512758491326c21bb745ca457a9f3d9215292358d7b4755eb84bb72877058fb239cbffe25c8121caff066aded84e8353b9716e9d4a45d724777f01a6714 DIST mdadm-3.3.1.tar.xz 407964 SHA256 d8c74112cfd77bdc1dbc1291fe8d9243c76d91bfa276fcb95f2a75ca7717ab02 SHA512 46fc1889e97d2d14b72ac26ee07eb4301467dc4a0e838ba89920253484fcd443749f3afccb3d792f7e468b20021d50dbc29dda7033d9b5a8fbaee664200f1981 WHIRLPOOL ca690bd35ab8ff475694d8f0420cd762704cc1777116edfdc9394973efa0d6decce1721dc1f7c8c84728d7434073cb6ab5161e5518c46aa8b4a7a5547ebb011d -DIST mdadm-3.3.4.tar.xz 413396 SHA256 8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68 SHA512 4393e5d3a50ee148cc7503d48e7dda30419ed72a8098eaa9b883ff1ee81e09c66414edbe40d8c80b28d3ae7a7b5e5b11f6a8e14188a1066c19ac08ca89ddbcb6 WHIRLPOOL 41a8bcf399a11da82c9a0bdf49a31d8c71aeccfcfe2000edf78fe2933c6bdf6f10f2c5450b0589564a75e3a37195abe2e4c0dbbc42911ca9dda4e2d538618caa DIST mdadm-3.4.tar.xz 422704 SHA256 27d0be4627d38a12ddcd1c1c3721d649d4e89e1093914497e22b57245cda8808 SHA512 5de06f3a2b83333e5346a1e858b15e76f75a13a1d5c5f2032fecc6eb167454b282e12ee111ac2abec778e058ec9554708ac317a476778328546603618e6f70f7 WHIRLPOOL 18a5f2ed027b919e2e365cf9ddc1b616bf1fe315d27196a248ce9600622eb86d5ce825f1b38ecf0a1f5dcf21fa59fd7d88856700aea25a721c8efa37e2b34d39 DIST mdadm-4.0.tar.xz 430780 SHA256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b WHIRLPOOL 6587c7817556fbf47f7624a05d000c3a8396c84fbabe43aa574b649a119f987181b909f4347b93b07a45bf4d6519e1c8a39b1c0245538d64fb0eddd27e3e4054 DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737 diff --git a/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch deleted file mode 100644 index 6e12dc2..00000000 --- a/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/211426 - -make default mdassemble sane - ---- a/Makefile -+++ b/Makefile -@@ -181,8 +181,7 @@ - $(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS) - - mdassemble : $(ASSEMBLE_SRCS) $(INCL) -- rm -f $(OBJS) -- $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) -+ $(CC) $(CFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) - - mdassemble.static : $(ASSEMBLE_SRCS) $(INCL) - rm -f $(OBJS) diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch deleted file mode 100644 index 8bfdcd5..00000000 --- a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://bugs.gentoo.org/430900 - ---- Makefile -+++ Makefile -@@ -97,6 +97,12 @@ - MAN4DIR = $(MANDIR)/man4 - MAN5DIR = $(MANDIR)/man5 - MAN8DIR = $(MANDIR)/man8 -+PKG_CONFIG ?= pkg-config -+ -+UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null) -+ifndef UDEVDIR -+ UDEVDIR = lib/udev -+endif - - OBJS = mdadm.o config.o policy.o mdstat.o ReadMe.o util.o maps.o lib.o \ - Manage.o Assemble.o Build.o \ -@@ -254,7 +260,7 @@ - $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 - - install-udev: udev-md-raid.rules -- $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules -+ $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/$(UDEVDIR)/rules.d/64-md-raid.rules - - uninstall: - rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm diff --git a/sys-fs/mdadm/files/mdadm.service b/sys-fs/mdadm/files/mdadm.service deleted file mode 100644 index 342177d..00000000 --- a/sys-fs/mdadm/files/mdadm.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Software RAID monitoring and management -ConditionPathExists=/etc/mdadm.conf - -[Service] -Type=forking -PIDFile=/run/mdadm/mdadm.pid -EnvironmentFile=/etc/conf.d/mdadm -ExecStart=/sbin/mdadm --monitor --scan -f --pid-file=/run/mdadm/mdadm.pid $MDADM_OPTS - -[Install] -WantedBy=multi-user.target - diff --git a/sys-fs/mdadm/files/mdadm.tmpfiles.conf b/sys-fs/mdadm/files/mdadm.tmpfiles.conf deleted file mode 100644 index 3207dda..00000000 --- a/sys-fs/mdadm/files/mdadm.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/mdadm 0710 root root - diff --git a/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild b/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild deleted file mode 100644 index 7a34dd4..00000000 --- a/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit multilib eutils flag-o-matic systemd toolchain-funcs - -DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools" -HOMEPAGE="http://neil.brown.name/blog/mdadm"; -SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="static" - -DEPEND="virtual/pkgconfig" -RDEPEND="!<sys-apps/baselayout-2.1-r1 - !<sys-apps/openrc-0.10 - >=sys-apps/util-linux-2.16" - -# The tests edit values in /proc and run tests on software raid devices. -# Thus, they shouldn't be run on systems with active software RAID devices. -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426 - epatch "${FILESDIR}"/${PN}-3.2.x-udevdir.patch #430900 -} - -mdadm_emake() { - emake \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CC="$(tc-getCC)" \ - CWFLAGS="-Wall" \ - CXFLAGS="${CFLAGS}" \ - MAP_DIR=/run/mdadm \ - "$@" -} - -src_compile() { - use static && append-ldflags -static - mdadm_emake all mdassemble -} - -src_test() { - mdadm_emake test - - sh ./test || die -} - -src_install() { - emake DESTDIR="${D}" install - into / - dosbin mdassemble - dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV} - - insinto /etc - newins mdadm.conf-example mdadm.conf - newinitd "${FILESDIR}"/mdadm.rc mdadm - newconfd "${FILESDIR}"/mdadm.confd mdadm - newinitd "${FILESDIR}"/mdraid.rc mdraid - newconfd "${FILESDIR}"/mdraid.confd mdraid - systemd_dounit "${FILESDIR}/mdadm.service" - systemd_newtmpfilesd "${FILESDIR}/mdadm.tmpfiles.conf" mdadm.conf -} - -pkg_preinst() { - if ! has_version ${CATEGORY}/${PN} ; then - # Only inform people the first time they install. - elog "If you're not relying on kernel auto-detect of your RAID" - elog "devices, you need to add 'mdraid' to your 'boot' runlevel:" - elog " rc-update add mdraid boot" - fi -} diff --git a/sys-fs/mdadm/mdadm-3.3.4.ebuild b/sys-fs/mdadm/mdadm-3.3.4.ebuild deleted file mode 100644 index ffa2141..00000000 --- a/sys-fs/mdadm/mdadm-3.3.4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -inherit eutils flag-o-matic multilib systemd toolchain-funcs udev - -DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools" -HOMEPAGE="http://neil.brown.name/blog/mdadm"; -DEB_PR=2 -SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz - mirror://debian/pool/main/m/mdadm/${PN}_3.3-${DEB_PR}.debian.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static" - -DEPEND="virtual/pkgconfig - app-arch/xz-utils" -RDEPEND=">=sys-apps/util-linux-2.16" - -# The tests edit values in /proc and run tests on software raid devices. -# Thus, they shouldn't be run on systems with active software RAID devices. -RESTRICT="test" - -mdadm_emake() { - emake \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - CC="$(tc-getCC)" \ - CWFLAGS="-Wall" \ - CXFLAGS="${CFLAGS}" \ - UDEVDIR="$(get_udevdir)" \ - SYSTEMD_DIR="$(systemd_get_unitdir)" \ - "$@" -} - -src_compile() { - use static && append-ldflags -static - mdadm_emake all mdassemble -} - -src_test() { - mdadm_emake test - - sh ./test || die -} - -src_install() { - mdadm_emake DESTDIR="${D}" install install-systemd - into / - dosbin mdassemble - dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV} - - insinto /etc - newins mdadm.conf-example mdadm.conf - newinitd "${FILESDIR}"/mdadm.rc mdadm - newconfd "${FILESDIR}"/mdadm.confd mdadm - newinitd "${FILESDIR}"/mdraid.rc mdraid - newconfd "${FILESDIR}"/mdraid.confd mdraid - - # From the Debian patchset - into /usr - dodoc "${WORKDIR}"/debian/README.checkarray - dosbin "${WORKDIR}"/debian/checkarray - insinto /etc/default - newins "${FILESDIR}"/etc-default-mdadm mdadm - - insinto /etc/cron.weekly - newins "${FILESDIR}"/mdadm.weekly mdadm -} - -pkg_postinst() { - if ! systemd_is_booted; then - if [[ -z ${REPLACING_VERSIONS} ]] ; then - # Only inform people the first time they install. - elog "If you're not relying on kernel auto-detect of your RAID" - elog "devices, you need to add 'mdraid' to your 'boot' runlevel:" - elog " rc-update add mdraid boot" - fi - fi -}
