diff options
Diffstat (limited to 'sys-boot/lilo')
-rw-r--r-- | sys-boot/lilo/ChangeLog | 7 | ||||
-rw-r--r-- | sys-boot/lilo/Manifest | 19 | ||||
-rw-r--r-- | sys-boot/lilo/files/lilo-22.5.8-create-install-dirs.patch | 21 | ||||
-rw-r--r-- | sys-boot/lilo/lilo-22.5.8-r1.ebuild | 5 |
4 files changed, 41 insertions, 11 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog index bdd50e1b6352..05fc2aec464f 100644 --- a/sys-boot/lilo/ChangeLog +++ b/sys-boot/lilo/ChangeLog @@ -1,6 +1,11 @@ # 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.4 2004/02/01 11:56:24 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.5 2004/02/08 13:48:40 azarah Exp $ + + 08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.8-r1.ebuild, + files/lilo-22.5.8-create-install-dirs.patch: + Fix creation of install dirs, bug #39405. Patch thanks to Ed Grimm + <paranoid@gentoo.evolution.tgape.org>. 01 Feb 2004; <plasmaroo@gentoo.org> lilo-22.5.8-r1.ebuild, files/lilo-22.5.8.lvm.2-6headers.patch: diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 81ee485a6501..c8f093698d6c 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,15 +1,16 @@ -MD5 599925552dd6cc35aabb784d22846ce3 ChangeLog 6815 -MD5 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 42297b80a20953368eb0ffdf107e6a52 lilo-22.5.8-r1.ebuild 4353 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 00a0ca339c35dfa56cdbc374a8adedb1 lilo-22.5.6-r2.ebuild 3190 +MD5 70922bf1a159bdf4fed63fbf540fc709 ChangeLog 7045 +MD5 e5c7a36acafab7b3728c01457140e82a lilo-22.5.1.ebuild 4286 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r2 63 +MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.8-create-install-dirs.patch 970 +MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63 +MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719 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-create-install-dirs.patch b/sys-boot/lilo/files/lilo-22.5.8-create-install-dirs.patch new file mode 100644 index 000000000000..c9e58a2312a5 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.5.8-create-install-dirs.patch @@ -0,0 +1,21 @@ +--- lilo-22.5.8/Makefile.bak 2004-02-06 01:41:06.000000000 +0000 ++++ lilo-22.5.8/Makefile 2004-02-06 02:02:57.000000000 +0000 +@@ -302,16 +302,8 @@ + # normal install, but doesn't make the diagnostic binaries + # + install: all +- if [ ! -d $$ROOT$(SBIN_DIR) ]; then mkdir $$ROOT$(SBIN_DIR); fi +- if [ ! -d $$ROOT$(CFG_DIR) ]; then mkdir $$ROOT$(CFG_DIR); fi +- if [ ! -d $$ROOT$(BOOT_DIR) ]; then mkdir $$ROOT$(BOOT_DIR); fi +- if [ ! -d $$ROOT$(USRSBIN_DIR) ]; then \ +- mkdir -p $$ROOT$(USRSBIN_DIR); fi +- if [ ! -d $$ROOT$(MAN_DIR) ]; then mkdir $$ROOT$(MAN_DIR); fi +- if [ ! -d $$ROOT$(MAN_DIR)/man5 ]; then \ +- mkdir $$ROOT$(MAN_DIR)/man5; fi +- if [ ! -d $$ROOT$(MAN_DIR)/man8 ]; then \ +- mkdir $$ROOT$(MAN_DIR)/man8; fi ++ mkdir -p $$ROOT$(SBIN_DIR) $$ROOT$(CFG_DIR) $$ROOT$(BOOT_DIR) \ ++ $$ROOT$(USRSBIN_DIR) $$ROOT$(MAN_DIR)/man5 $$ROOT$(MAN_DIR)/man8 + if [ -f diag1.img ]; then \ + cp -f diag1.img $$ROOT$(BOOT_DIR); fi + if [ -f diag2.img ]; then \ diff --git a/sys-boot/lilo/lilo-22.5.8-r1.ebuild b/sys-boot/lilo/lilo-22.5.8-r1.ebuild index c5a7c677608d..83d2c8decc24 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.4 2004/02/01 11:56:25 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.8-r1.ebuild,v 1.5 2004/02/08 13:48:40 azarah Exp $ inherit mount-boot eutils @@ -42,7 +42,10 @@ src_unpack() { # Fixup things for glibc-2.3.3 (and later CVS versions of 2.3.2) cd ${S}; epatch ${FILESDIR}/${PN}-glibc233.patch + # Fix building against 2.6 headers cd ${S}; epatch ${FILESDIR}/${P}.lvm.2-6headers.patch + # Fix creating install dirs, bug #39405 + cd ${S}; epatch ${FILESDIR}/${P}-create-install-dirs.patch } src_compile() { |