summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-03 05:01:48 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-03 05:01:48 +0000
commit556131b7d19e21f3ca7b93f11e99da42234cfb25 (patch)
treee859b4d42dec50aabdd979cd7f53d0547e9b99ca /sys-block
parentarm/ia64/s390/sh stable (diff)
downloadgentoo-2-556131b7d19e21f3ca7b93f11e99da42234cfb25.tar.gz
gentoo-2-556131b7d19e21f3ca7b93f11e99da42234cfb25.tar.bz2
gentoo-2-556131b7d19e21f3ca7b93f11e99da42234cfb25.zip
Dont include asm/page.h #168952 by Peter Alfredsen.
(Portage version: 2.1.2-r13)
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/nbd/ChangeLog6
-rw-r--r--sys-block/nbd/files/nbd-2.9.2-no-page-header.patch10
-rw-r--r--sys-block/nbd/nbd-2.9.2.ebuild3
3 files changed, 17 insertions, 2 deletions
diff --git a/sys-block/nbd/ChangeLog b/sys-block/nbd/ChangeLog
index 24e11fa4b0f6..46798e49ece4 100644
--- a/sys-block/nbd/ChangeLog
+++ b/sys-block/nbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-block/nbd
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.21 2007/02/10 13:17:40 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/ChangeLog,v 1.22 2007/03/03 05:01:48 vapier Exp $
+
+ 03 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+ +files/nbd-2.9.2-no-page-header.patch, nbd-2.9.2.ebuild:
+ Dont include asm/page.h #168952 by Peter Alfredsen.
10 Feb 2007; Steve Dibb <beandog@gentoo.org> nbd-2.9.0.ebuild:
amd64 stable, bug 159209
diff --git a/sys-block/nbd/files/nbd-2.9.2-no-page-header.patch b/sys-block/nbd/files/nbd-2.9.2-no-page-header.patch
new file mode 100644
index 000000000000..8e1717f1bb74
--- /dev/null
+++ b/sys-block/nbd/files/nbd-2.9.2-no-page-header.patch
@@ -0,0 +1,10 @@
+--- nbd-client.c
++++ nbd-client.c
+@@ -16,7 +16,6 @@
+ #include "config.h"
+ #include "lfs.h"
+
+-#include <asm/page.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
diff --git a/sys-block/nbd/nbd-2.9.2.ebuild b/sys-block/nbd/nbd-2.9.2.ebuild
index 01a1ae40d599..7e36613bdd85 100644
--- a/sys-block/nbd/nbd-2.9.2.ebuild
+++ b/sys-block/nbd/nbd-2.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.2.ebuild,v 1.1 2007/01/28 11:33:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/nbd/nbd-2.9.2.ebuild,v 1.2 2007/03/03 05:01:48 vapier Exp $
inherit eutils flag-o-matic
@@ -23,6 +23,7 @@ src_unpack() {
cd "${S}"
epatch "${FILESDIR}"/${PN}-2.9.2-gznbd.patch
epatch "${FILESDIR}"/${PN}-2.9.1-headers.patch
+ epatch "${FILESDIR}"/${PN}-2.9.2-no-page-header.patch
mkdir -p "${S}"/inc-after/linux
mv "${WORKDIR}"/nbd-linux-include.h "${S}"/inc-after/linux/nbd.h