diff options
Diffstat (limited to 'sys-apps/util-linux')
| -rw-r--r-- | sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch | 26 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.12i-r1.ebuild | 5 | ||||
| -rw-r--r-- | sys-apps/util-linux/util-linux-2.12p.ebuild | 5 |
3 files changed, 2 insertions, 34 deletions
diff --git a/sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch b/sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch deleted file mode 100644 index 213dacaa13d4..000000000000 --- a/sys-apps/util-linux/files/util-linux-2.12-amd64_rdev_installation.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- sys-utils/Makefile 2004-02-22 20:26:11.047106770 +0000 -+++ sys-utils/Makefile 2004-02-22 20:42:58.036626756 +0000 -@@ -42,6 +42,11 @@ - USRSBIN:=$(USRSBIN) rdev - endif - -+ifeq "$(ARCH)" "x86_64" -+MAN8:=$(MAN8) rdev.8 ramsize.8 rootflags.8 vidmode.8 -+USRSBIN:=$(USRSBIN) rdev -+endif -+ - # Where to put datebase files? - - USRINFO= ipc.info -@@ -91,6 +96,11 @@ - (cd $(USRSBINDIR); ln -sf rdev vidmode) - (cd $(USRSBINDIR); ln -sf rdev rootflags) - endif -+ifeq "$(ARCH)" "x86_64" -+ (cd $(USRSBINDIR); ln -sf rdev ramsize) -+ (cd $(USRSBINDIR); ln -sf rdev vidmode) -+ (cd $(USRSBINDIR); ln -sf rdev rootflags) -+endif - $(INSTALLDIR) $(MAN1DIR) $(MAN8DIR) $(INFODIR) - $(INSTALLMAN) $(MAN1) $(MAN1DIR) - $(INSTALLMAN) $(MAN8) $(MAN8DIR) diff --git a/sys-apps/util-linux/util-linux-2.12i-r1.ebuild b/sys-apps/util-linux/util-linux-2.12i-r1.ebuild index c3adb03f8df6..55526798aa20 100644 --- a/sys-apps/util-linux/util-linux-2.12i-r1.ebuild +++ b/sys-apps/util-linux/util-linux-2.12i-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.10 2005/01/14 13:49:48 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12i-r1.ebuild,v 1.11 2005/01/29 07:01:50 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -68,9 +68,6 @@ src_unpack() { epatch ${FILESDIR}/${P}-fat-LABEL-support.patch epatch ${S}/mount-2.12-fat.patch - # Install rdev on amd64 platform - epatch ${FILESDIR}/${PN}-2.12-amd64_rdev_installation.patch - # swapon gets confused by symlinks in /dev #69162 epatch ${FILESDIR}/${P}-swapon-check-symlinks.patch diff --git a/sys-apps/util-linux/util-linux-2.12p.ebuild b/sys-apps/util-linux/util-linux-2.12p.ebuild index b5401dbfe1a5..74520523c54e 100644 --- a/sys-apps/util-linux/util-linux-2.12p.ebuild +++ b/sys-apps/util-linux/util-linux-2.12p.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12p.ebuild,v 1.5 2005/01/19 00:47:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.12p.ebuild,v 1.6 2005/01/29 07:01:50 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -74,9 +74,6 @@ src_unpack() { # Allow util-linux to be built with -fPIC epatch ${FILESDIR}/${PN}-2.12i-pic.patch - # Install rdev on amd64 platform - epatch ${FILESDIR}/${PN}-2.12-amd64_rdev_installation.patch - # swapon gets confused by symlinks in /dev #69162 epatch ${FILESDIR}/${PN}-2.12p-swapon-check-symlinks.patch |