diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-08-12 17:53:26 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-08-12 17:53:26 +0000 |
| commit | e004f6864d25549c1b9201f4f676318a0a03d3aa (patch) | |
| tree | 263ef4de3d50fbd3ed1e17b5ac314d988a14f911 /sys-fs | |
| parent | Stable for amd64, wrt bug #414615 (diff) | |
| download | gentoo-2-e004f6864d25549c1b9201f4f676318a0a03d3aa.tar.gz gentoo-2-e004f6864d25549c1b9201f4f676318a0a03d3aa.tar.bz2 gentoo-2-e004f6864d25549c1b9201f4f676318a0a03d3aa.zip | |
Use patch instead of sed for the udevdir wrt #430900, Comment #9 by Nikolay S. Rybaloff
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/mdadm/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch | 26 | ||||
| -rw-r--r-- | sys-fs/mdadm/mdadm-3.2.5-r1.ebuild | 8 |
3 files changed, 35 insertions, 6 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog index 2704b5ca7285..d3235d9ffc37 100644 --- a/sys-fs/mdadm/ChangeLog +++ b/sys-fs/mdadm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/mdadm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.155 2012/08/12 15:40:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.156 2012/08/12 17:53:26 ssuominen Exp $ + + 12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.2.5-r1.ebuild, + +files/mdadm-3.2.x-udevdir.patch: + Use patch instead of sed for the udevdir wrt #430900, Comment #9 by Nikolay + S. Rybaloff 12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.1.4.ebuild, mdadm-3.1.5.ebuild, mdadm-3.2.3-r2.ebuild, mdadm-3.2.5-r1.ebuild: diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch new file mode 100644 index 000000000000..e6dfce9d7e80 --- /dev/null +++ b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch @@ -0,0 +1,26 @@ +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/mdadm-3.2.5-r1.ebuild b/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild index 52f788f423bb..29ebac67505a 100644 --- a/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild +++ b/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild,v 1.3 2012/08/12 15:40:26 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.5-r1.ebuild,v 1.4 2012/08/12 17:53:26 ssuominen Exp $ EAPI="4" inherit multilib eutils flag-o-matic toolchain-funcs @@ -25,14 +25,12 @@ RESTRICT="test" src_prepare() { epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426 sed -i 's:/run/mdadm:/var/run/mdadm:g' *.[ch] Makefile || die - - local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" - has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" - sed -i -e "s:/lib/udev:${udevdir}:" Makefile || die #430900 + epatch "${FILESDIR}"/${PN}-3.2.x-udevdir.patch #430900 } mdadm_emake() { emake \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ CC="$(tc-getCC)" \ CWFLAGS="-Wall" \ CXFLAGS="${CFLAGS}" \ |