diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2004-02-01 11:56:25 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-02-01 11:56:25 +0000 |
| commit | 2c0c63cb8b6563957a5f7a45ca5254bdedf73669 (patch) | |
| tree | eccc0114e8dbb17bd48faf94b7e270fc4661ec61 /sys-boot | |
| parent | closing 23468 (tcl_version not being abided by during link phase), and 39119 ... (diff) | |
| download | historical-2c0c63cb8b6563957a5f7a45ca5254bdedf73669.tar.gz historical-2c0c63cb8b6563957a5f7a45ca5254bdedf73669.tar.bz2 historical-2c0c63cb8b6563957a5f7a45ca5254bdedf73669.zip | |
Added a patch to get LILO to compile on 2.6 headers; closes bug #32707.
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/lilo/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/lilo/Manifest | 19 | ||||
| -rw-r--r-- | sys-boot/lilo/files/lilo-22.5.8.lvm.2-6headers.patch | 16 | ||||
| -rw-r--r-- | sys-boot/lilo/lilo-22.5.8-r1.ebuild | 3 |
4 files changed, 33 insertions, 11 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog index 589dca8892a3..bdd50e1b6352 100644 --- a/sys-boot/lilo/ChangeLog +++ b/sys-boot/lilo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/lilo # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.3 2004/01/19 18:34:01 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.4 2004/02/01 11:56:24 plasmaroo Exp $ + + 01 Feb 2004; <plasmaroo@gentoo.org> lilo-22.5.8-r1.ebuild, + files/lilo-22.5.8.lvm.2-6headers.patch: + Added a patch to get LILO to compile on 2.6 headers; closes bug #32707. 19 Jan 2004; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.8-r1.ebuild: Mark stable closing bug #38685. diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 4f4cd8e39cd4..81ee485a6501 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,14 +1,15 @@ -MD5 67ae95a7f2b5aa0432271926169a6fba lilo-22.5.8-r1.ebuild 4161 -MD5 f1ac83767a893165a9b24b808dda2cc4 lilo-22.5.8.ebuild 3991 -MD5 0f4187f805b8c78c9a7b3da37c19ba6d lilo-22.5.7.2.ebuild 3924 +MD5 599925552dd6cc35aabb784d22846ce3 ChangeLog 6815 MD5 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190 -MD5 64ef858beb623de424cb553facba3593 ChangeLog 6634 -MD5 e5c7a36acafab7b3728c01457140e82a lilo-22.5.1.ebuild 4286 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63 +MD5 f1ac83767a893165a9b24b808dda2cc4 lilo-22.5.8.ebuild 3991 +MD5 e5c7a36acafab7b3728c01457140e82a lilo-22.5.1.ebuild 4286 +MD5 0f4187f805b8c78c9a7b3da37c19ba6d lilo-22.5.7.2.ebuild 3924 +MD5 21dbffedc767821e3e99d4494dc0aae0 lilo-22.5.8-r1.ebuild 4219 +MD5 8e75fea24b47485fd4185b9962745117 files/digest-lilo-22.5.1 63 +MD5 89d3f49772308bc3fb195f51c9ff1035 files/digest-lilo-22.5.7.2 65 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63 -MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719 +MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63 MD5 ca44cc6ec0aecfe30c49c455f74aacec files/lilo-glibc233.patch 640 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8 63 -MD5 8e75fea24b47485fd4185b9962745117 files/digest-lilo-22.5.1 63 -MD5 89d3f49772308bc3fb195f51c9ff1035 files/digest-lilo-22.5.7.2 65 +MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.8.lvm.2-6headers.patch 470 +MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719 diff --git a/sys-boot/lilo/files/lilo-22.5.8.lvm.2-6headers.patch b/sys-boot/lilo/files/lilo-22.5.8.lvm.2-6headers.patch new file mode 100644 index 000000000000..7c93db0ae03c --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.5.8.lvm.2-6headers.patch @@ -0,0 +1,16 @@ +--- lilo-22.5.8/geometry.c 2003-10-10 00:59:07.000000000 +0100 ++++ lilo-22.5.8/geometry.c 2004-01-28 19:28:17.000000000 +0000 +@@ -99,6 +99,13 @@ + #define HDIO_GETGEO HDIO_REQ + #endif + ++/* plasmaroo@gentoo.org :: 2.6 Compatibility */ ++ ++#undef _IOR ++#undef _IOWR ++ ++#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size)) ++#define _IOWR(type,nr,size) _IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size)) + + typedef struct _st_buf { + struct _st_buf *next; diff --git a/sys-boot/lilo/lilo-22.5.8-r1.ebuild b/sys-boot/lilo/lilo-22.5.8-r1.ebuild index 159ac8203b3b..c5a7c677608d 100644 --- a/sys-boot/lilo/lilo-22.5.8-r1.ebuild +++ b/sys-boot/lilo/lilo-22.5.8-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r1.ebuild,v 1.3 2004/01/19 18:34:01 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r1.ebuild,v 1.4 2004/02/01 11:56:25 plasmaroo Exp $ inherit mount-boot eutils @@ -42,6 +42,7 @@ src_unpack() { # Fixup things for glibc-2.3.3 (and later CVS versions of 2.3.2) cd ${S}; epatch ${FILESDIR}/${PN}-glibc233.patch + cd ${S}; epatch ${FILESDIR}/${P}.lvm.2-6headers.patch } src_compile() { |