From: Tony Vroon Date: Tue, 20 Mar 2007 10:46:25 +0000 (+0000) Subject: New upstream release. 22.7.3-r1 now stable on amd64, ack'ed by malc on IRC. Cleaned... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8199f2c4da3c20d3fab24ecf886c7ec6247ad3f;p=gentoo.git New upstream release. 22.7.3-r1 now stable on amd64, ack'ed by malc on IRC. Cleaned up old ebuilds. Package-Manager: portage-2.1.2.2 --- diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog index e81e70014ecd..3abe524d16b2 100644 --- a/sys-boot/lilo/ChangeLog +++ b/sys-boot/lilo/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-boot/lilo # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.45 2007/01/15 15:23:05 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.46 2007/03/20 10:46:25 chainsaw Exp $ + +*lilo-22.8 (20 Mar 2007) + + 20 Mar 2007; Tony Vroon + +files/lilo-22.8-correct-usage-info.patch, + +files/lilo-22.8-makefile.patch, +files/lilo-22.8-novga.patch, + -lilo-22.7.ebuild, -lilo-22.7-r1.ebuild, -lilo-22.7.1.ebuild, + -lilo-22.7.2-r2.ebuild, lilo-22.7.3-r1.ebuild, +lilo-22.8.ebuild: + New upstream release. 22.7.3-r1 now stable on amd64, ack'ed by malc on IRC. + Cleaned up old ebuilds. 15 Jan 2007; Tony Vroon lilo-22.7.3-r1.ebuild: Mark stable on X86. diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 55e6d7fc67c2..ee09ec52e255 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -93,63 +93,51 @@ AUX lilo-22.7.3-novga.patch 804 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 MD5 e42ba9cd707df24649879cc297377cf9 files/lilo-22.7.3-novga.patch 804 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 files/lilo-22.7.3-novga.patch 804 SHA256 812da9b2afb785a0aca27fe9b0d8a06b982792d60cd6b4b6dda16c7b6a73b297 files/lilo-22.7.3-novga.patch 804 +AUX lilo-22.8-correct-usage-info.patch 604 RMD160 d7cd1c5521c58ba19b1e0847746b5fe42ed23240 SHA1 96772a4f502876d7ebf3e016280dfa4bea382b35 SHA256 9a73c94e4c923141817def8030e43cc6eebaffa1bbce35ad3d511dc2583d645b +MD5 94668cd82ff06bc323ddaee909780625 files/lilo-22.8-correct-usage-info.patch 604 +RMD160 d7cd1c5521c58ba19b1e0847746b5fe42ed23240 files/lilo-22.8-correct-usage-info.patch 604 +SHA256 9a73c94e4c923141817def8030e43cc6eebaffa1bbce35ad3d511dc2583d645b files/lilo-22.8-correct-usage-info.patch 604 +AUX lilo-22.8-makefile.patch 1776 RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddfff SHA1 346d53bb307d1baa393da1db1fc516b1cc5ebee7 SHA256 4e95ead9648613a4682445f161818e6af875386aaa24f33bdb87c4c3d7cf38d7 +MD5 8edbaa01e793ce03ccc7f1ae01a9c26c files/lilo-22.8-makefile.patch 1776 +RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddfff files/lilo-22.8-makefile.patch 1776 +SHA256 4e95ead9648613a4682445f161818e6af875386aaa24f33bdb87c4c3d7cf38d7 files/lilo-22.8-makefile.patch 1776 +AUX lilo-22.8-novga.patch 831 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 SHA1 6b17310e2c71c605a7a2e816ac2a02b326ee6d28 SHA256 5ff92c00ce2624a070ebb616ab2efede5460cdd229d0e9bc97e4ddc65daa1e8a +MD5 5ce946672cf0e1ed0853c936fa710d08 files/lilo-22.8-novga.patch 831 +RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 files/lilo-22.8-novga.patch 831 +SHA256 5ff92c00ce2624a070ebb616ab2efede5460cdd229d0e9bc97e4ddc65daa1e8a files/lilo-22.8-novga.patch 831 AUX lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b SHA1 75c7374359acb94955026a1f626c5355d70829cd SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0 MD5 5f2172291cc1252b30f5a60981a51ac4 files/lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b files/lilo.conf 1722 SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0 files/lilo.conf 1722 -DIST dolilo-0.3.tar.bz2 3554 RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba SHA1 162ef4ba7204762d8c30b032749fd4e0b5044dcf SHA256 33ecd4f54f06067e937f442d1fd7b219f82dbcb7934311d3d20fe070cc2a30ed DIST dolilo-0.4.tar.bz2 3753 RMD160 e63d7d258461346620d012d8e89b22b3f969b089 SHA1 887c778c2cc603d24995a5ab58c6cdce974bd88a SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e -DIST lilo-22.7.1.src.tar.gz 429373 RMD160 7be56fb510ada6a54ae7da948efc6e342d04140c SHA1 b431bb0756e1f42c38fc4645063acaea7f2ddcc7 SHA256 7fa192588910e42d0e544967e050b15e3c32acb7fdecad53c3283cbc3560a756 -DIST lilo-22.7.2.src.tar.gz 433625 RMD160 03fe32839751b3497dc9f06490dc2cd3bff6b805 SHA1 63b758d86d2242b802bce01da318f8c225eb0589 SHA256 3fae019ee67a63f8fc35aade5e7f61a1dd01a210af1b46c6df4b9862597547da DIST lilo-22.7.3.src.tar.gz 436177 RMD160 265e5934183ed01ae74641161ac5eec28716f944 SHA1 d6de449607dfca518ca4e0d5d3be5d7d98eab0e5 SHA256 606aa55b66b6dd8baab0465b7c23aa84a48e594a13b41eb995178a1ca2651fc5 -DIST lilo-22.7.src.tar.gz 428600 RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 SHA1 90586882ac875fa5989e0855482df62050669aac SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 -EBUILD lilo-22.7-r1.ebuild 4911 RMD160 1ff56457b4417dc141bd5b89d1ecb8cddb8c647e SHA1 f928d7d7d3106ebc85e0443cd68dd4ed90767111 SHA256 9acd6fbecc20176c96cffdd8b0ed373ad34201d89bd421a7b792b55e19703a3d -MD5 725e9af9f110e9861ad4a1e4e28f6811 lilo-22.7-r1.ebuild 4911 -RMD160 1ff56457b4417dc141bd5b89d1ecb8cddb8c647e lilo-22.7-r1.ebuild 4911 -SHA256 9acd6fbecc20176c96cffdd8b0ed373ad34201d89bd421a7b792b55e19703a3d lilo-22.7-r1.ebuild 4911 -EBUILD lilo-22.7.1.ebuild 4930 RMD160 907fab3ebc42728a28aa9717dc4ed23fc9863141 SHA1 b382e49a58fb4da233d5428ef7045030c4c504f4 SHA256 13c6124b0cea8e0a3a6c304b7a53e2d84f969f7f0e6a5f5d4e3ee65f935abf16 -MD5 0d8df5686dac4b01375279edc1e26427 lilo-22.7.1.ebuild 4930 -RMD160 907fab3ebc42728a28aa9717dc4ed23fc9863141 lilo-22.7.1.ebuild 4930 -SHA256 13c6124b0cea8e0a3a6c304b7a53e2d84f969f7f0e6a5f5d4e3ee65f935abf16 lilo-22.7.1.ebuild 4930 -EBUILD lilo-22.7.2-r2.ebuild 5015 RMD160 6db3592a1516f92394858a772fa86423f14b9aef SHA1 5e99b2267ab8e0a23235b05b4888c137fb1d2f51 SHA256 ac40229b91b0f60f8ceb900363443066ee3e3e004eab5c8979b0d9ef70ade573 -MD5 011b37ad2de5e002af346b99c2c61c71 lilo-22.7.2-r2.ebuild 5015 -RMD160 6db3592a1516f92394858a772fa86423f14b9aef lilo-22.7.2-r2.ebuild 5015 -SHA256 ac40229b91b0f60f8ceb900363443066ee3e3e004eab5c8979b0d9ef70ade573 lilo-22.7.2-r2.ebuild 5015 -EBUILD lilo-22.7.3-r1.ebuild 4668 RMD160 8e9abf2b18283261ce2865506e6021b3ce6275e0 SHA1 3d48f678d616c921615e0219e6588de6f4d37522 SHA256 58783c19836727f4f884fde3475ed7025e60e921d024ef12aa8c47f51e47bdc9 -MD5 ea99105551c403c968cb9a2141a371e2 lilo-22.7.3-r1.ebuild 4668 -RMD160 8e9abf2b18283261ce2865506e6021b3ce6275e0 lilo-22.7.3-r1.ebuild 4668 -SHA256 58783c19836727f4f884fde3475ed7025e60e921d024ef12aa8c47f51e47bdc9 lilo-22.7.3-r1.ebuild 4668 -EBUILD lilo-22.7.ebuild 5179 RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 SHA1 dc651bfce8c03911d1ac24c2d004c66905490133 SHA256 7ee485dc431faeba7977d309cfd5a966509ef0df6a14578375fc07a2d7a24ca5 -MD5 8b40ee8fe163769e5ac0ca24963199cb lilo-22.7.ebuild 5179 -RMD160 30448b86ba811587bacb8f9e88e19d5362ba2fc2 lilo-22.7.ebuild 5179 -SHA256 7ee485dc431faeba7977d309cfd5a966509ef0df6a14578375fc07a2d7a24ca5 lilo-22.7.ebuild 5179 -MISC ChangeLog 7551 RMD160 b66f876da0ff12eebb10b965088e3b88865c1b40 SHA1 f9b35907b5e38008b70fdd47c8444a48b2541c48 SHA256 1a9a669cbace4cc60a573c24211c205c7e9dca1e6662787aeb3316ba49f3dd44 -MD5 f410d0f40d40de571435c34936d3cc88 ChangeLog 7551 -RMD160 b66f876da0ff12eebb10b965088e3b88865c1b40 ChangeLog 7551 -SHA256 1a9a669cbace4cc60a573c24211c205c7e9dca1e6662787aeb3316ba49f3dd44 ChangeLog 7551 +DIST lilo-22.8.src.tar.gz 437555 RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 SHA1 59852eab59b93dcea63b39eef1db7963b7268b0d SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb +EBUILD lilo-22.7.3-r1.ebuild 4667 RMD160 e5f80ac890c1c31c019761253a13f27da82c15bc SHA1 97d0f0b0f4ea7979392e7ac24484cb995a7572e6 SHA256 b7115c105f1f5371e26581018cd1c6ccbb6ce45c67b8f65d6a3aafd893d33f34 +MD5 227279b0e0ab7a73d916b07bb9c87f8e lilo-22.7.3-r1.ebuild 4667 +RMD160 e5f80ac890c1c31c019761253a13f27da82c15bc lilo-22.7.3-r1.ebuild 4667 +SHA256 b7115c105f1f5371e26581018cd1c6ccbb6ce45c67b8f65d6a3aafd893d33f34 lilo-22.7.3-r1.ebuild 4667 +EBUILD lilo-22.8.ebuild 4514 RMD160 ce02e00f97936be4022587a195462626d2e71679 SHA1 de43dd93d74fe5c892bda932110107f0ae45006f SHA256 ac55e299c61e93df72faa6b4f3f0af43d90749eebcd13f070d5b38e566c96290 +MD5 a2544f0c47bad043a7a248b82fdd10dd lilo-22.8.ebuild 4514 +RMD160 ce02e00f97936be4022587a195462626d2e71679 lilo-22.8.ebuild 4514 +SHA256 ac55e299c61e93df72faa6b4f3f0af43d90749eebcd13f070d5b38e566c96290 lilo-22.8.ebuild 4514 +MISC ChangeLog 7972 RMD160 3d2250b558d6e0db599058c00fb4aa7c9fe98fcc SHA1 42c8ff3dc97319732409f4206e52e7f18763223f SHA256 6b69d834c06460e7603f292a355d2fbd019a4deddee0c9f2e7263ceccfe22695 +MD5 3f1beebe2513fe034c832637ed3d711c ChangeLog 7972 +RMD160 3d2250b558d6e0db599058c00fb4aa7c9fe98fcc ChangeLog 7972 +SHA256 6b69d834c06460e7603f292a355d2fbd019a4deddee0c9f2e7263ceccfe22695 ChangeLog 7972 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a metadata.xml 254 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc metadata.xml 254 -MD5 7fc1cf4cd81ee44127de9fd2239c917a files/digest-lilo-22.7 470 -RMD160 ba4992add068a33f9c52d1cb066161c4437776e7 files/digest-lilo-22.7 470 -SHA256 8fac88a4abb3e558874f9ec02130e31bf9c92753de4e4378b8619b7c893a3989 files/digest-lilo-22.7 470 -MD5 9e87d333fe957f33043b845cc51d504d files/digest-lilo-22.7-r1 470 -RMD160 309a6b2eca93449baf9f1cc5c71403ce558875c5 files/digest-lilo-22.7-r1 470 -SHA256 cb675c72b764174ad4e092a100526b6fbb3ee814924fcc0a522985d9a1da214d files/digest-lilo-22.7-r1 470 -MD5 fe8123168ae8e37e80ac2904736564e1 files/digest-lilo-22.7.1 476 -RMD160 67f5b5ff08bb983f022ded278d61002422e2ecb0 files/digest-lilo-22.7.1 476 -SHA256 33da193d3a701224e343993cf3a4ba30ea8ebef2b23b3c199175025147d0cbe9 files/digest-lilo-22.7.1 476 -MD5 5fe1301c27405c41c58fb991c2ec62b2 files/digest-lilo-22.7.2-r2 476 -RMD160 f638b9934b99c4215d4c7d8f8b1a7bb58c078cdb files/digest-lilo-22.7.2-r2 476 -SHA256 722a87fe49f606a7b7d3490634225fa2fdf16ca2b93e7c247c9da53c4500837b files/digest-lilo-22.7.2-r2 476 MD5 90b0607f765663f3559e910794ae055c files/digest-lilo-22.7.3-r1 476 RMD160 f7fe400c9a7c1c0949c09c98888665492a38f646 files/digest-lilo-22.7.3-r1 476 SHA256 b1eeb365d3d00fe71e0612104f6561dbdb6d97a3c087f6615fd2b35a8dc2e743 files/digest-lilo-22.7.3-r1 476 +MD5 c933257a227f8163d697a9f442466390 files/digest-lilo-22.8 470 +RMD160 6cfde3069f672493ee90182e8ed55702bfa97251 files/digest-lilo-22.8 470 +SHA256 e8ae6397cb7057ec977679a334c48c70d9f2c73d07c31966ab84a2d5e37f71cd files/digest-lilo-22.8 470 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFq5yGp5vW4rUFj5oRAudpAJ9grB1ylEg9edZnENuulNK6VRPBLgCfUXaL -fKGOLkH0UlWhxRB+dJ1E8JA= -=bSGr +iD8DBQFF/7tsp5vW4rUFj5oRApdWAJ9ojcPUFE02F1HhASH6tiQlnwFaagCglSik +jowxx5BhdgE9lFB+rce3KbY= +=d4lA -----END PGP SIGNATURE----- diff --git a/sys-boot/lilo/files/digest-lilo-22.7 b/sys-boot/lilo/files/digest-lilo-22.7 deleted file mode 100644 index 95f373867419..000000000000 --- a/sys-boot/lilo/files/digest-lilo-22.7 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554 -RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba dolilo-0.3.tar.bz2 3554 -SHA256 33ecd4f54f06067e937f442d1fd7b219f82dbcb7934311d3d20fe070cc2a30ed dolilo-0.3.tar.bz2 3554 -MD5 565cda4cd5e7c740403ed91e0bdf15f6 lilo-22.7.src.tar.gz 428600 -RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 lilo-22.7.src.tar.gz 428600 -SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 lilo-22.7.src.tar.gz 428600 diff --git a/sys-boot/lilo/files/digest-lilo-22.7-r1 b/sys-boot/lilo/files/digest-lilo-22.7-r1 deleted file mode 100644 index 6971dbd0002e..000000000000 --- a/sys-boot/lilo/files/digest-lilo-22.7-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753 -RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753 -SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753 -MD5 565cda4cd5e7c740403ed91e0bdf15f6 lilo-22.7.src.tar.gz 428600 -RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 lilo-22.7.src.tar.gz 428600 -SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 lilo-22.7.src.tar.gz 428600 diff --git a/sys-boot/lilo/files/digest-lilo-22.7.1 b/sys-boot/lilo/files/digest-lilo-22.7.1 deleted file mode 100644 index 420e3633800d..000000000000 --- a/sys-boot/lilo/files/digest-lilo-22.7.1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554 -RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba dolilo-0.3.tar.bz2 3554 -SHA256 33ecd4f54f06067e937f442d1fd7b219f82dbcb7934311d3d20fe070cc2a30ed dolilo-0.3.tar.bz2 3554 -MD5 1f3855c6f2c7b2beaa8a90bf9975a289 lilo-22.7.1.src.tar.gz 429373 -RMD160 7be56fb510ada6a54ae7da948efc6e342d04140c lilo-22.7.1.src.tar.gz 429373 -SHA256 7fa192588910e42d0e544967e050b15e3c32acb7fdecad53c3283cbc3560a756 lilo-22.7.1.src.tar.gz 429373 diff --git a/sys-boot/lilo/files/digest-lilo-22.7.2-r2 b/sys-boot/lilo/files/digest-lilo-22.7.2-r2 deleted file mode 100644 index c844e713f234..000000000000 --- a/sys-boot/lilo/files/digest-lilo-22.7.2-r2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753 -RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753 -SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753 -MD5 2bf1eb08c449a28ebadcf66c48a26567 lilo-22.7.2.src.tar.gz 433625 -RMD160 03fe32839751b3497dc9f06490dc2cd3bff6b805 lilo-22.7.2.src.tar.gz 433625 -SHA256 3fae019ee67a63f8fc35aade5e7f61a1dd01a210af1b46c6df4b9862597547da lilo-22.7.2.src.tar.gz 433625 diff --git a/sys-boot/lilo/files/digest-lilo-22.8 b/sys-boot/lilo/files/digest-lilo-22.8 new file mode 100644 index 000000000000..84eb7c6deec8 --- /dev/null +++ b/sys-boot/lilo/files/digest-lilo-22.8 @@ -0,0 +1,6 @@ +MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753 +RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753 +SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753 +MD5 72765f2aafd20e23ecf07ebd22baeec7 lilo-22.8.src.tar.gz 437555 +RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 lilo-22.8.src.tar.gz 437555 +SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb lilo-22.8.src.tar.gz 437555 diff --git a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch new file mode 100644 index 000000000000..ecc1994d46a7 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch @@ -0,0 +1,13 @@ +diff -u lilo-22.8.ORIG/lilo.c lilo-22.8/lilo.c +--- lilo-22.8.ORIG/lilo.c 2007-03-20 10:13:06.000000000 +0000 ++++ lilo-22.8/lilo.c 2007-03-20 10:13:33.000000000 +0000 +@@ -548,7 +548,8 @@ + fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name); + fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name); + #endif /* !__MSDOS__ */ +- fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name); ++ fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name); ++ fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name); + exit(1); + } + diff --git a/sys-boot/lilo/files/lilo-22.8-makefile.patch b/sys-boot/lilo/files/lilo-22.8-makefile.patch new file mode 100644 index 000000000000..eb2e86977512 --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.8-makefile.patch @@ -0,0 +1,49 @@ +Common subdirectories: lilo-22.8.ORIG/diagnose and lilo-22.8/diagnose +Common subdirectories: lilo-22.8.ORIG/doc and lilo-22.8/doc +Common subdirectories: lilo-22.8.ORIG/dos and lilo-22.8/dos +diff -u lilo-22.8.ORIG/Makefile lilo-22.8/Makefile +--- lilo-22.8.ORIG/Makefile 2007-03-20 10:15:59.000000000 +0000 ++++ lilo-22.8/Makefile 2007-03-20 10:22:19.000000000 +0000 +@@ -69,18 +69,7 @@ + -DMDPRAID -DDEVMAPPER + + +-# set the following if you wish LILO.COM to be installed +-DOS_DIR=/dosC/boot +-# +-# select one of the following to place the man pages in the right place +-#MAN_DIR=`if [ -z "$(whereis lilo | grep 'lilo.8')" ]; then \ +-# whereis lilo | sed -e "sX.* /usrX/usrX" -e "sX/man8/lilo.8.*XX" ; \ +-# elif [ -f /usr/bin/manpath ]; then \ +-# manpath | sed "s/:.*//"; else echo /usr/man; fi` +-# +-MAN_DIR=`if [ -f /usr/bin/manpath ]; then \ +- manpath | sed "s/:.*//"; else echo /usr/share/man; fi` +-#MAN_DIR=/usr/share/man ++MAN_DIR=/usr/share/man + + # set the compiler optimization level + +@@ -165,10 +154,7 @@ + # + # everything needed to run, just short of installation + # +-all: lilo bootsect.b diag1.img # OBSOLETE: $(BOOTS) edit dparam.com activate +- if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \ +- make diagnostic; \ +- make dosexe; fi ++all: lilo + + # + # everything above plus the statically linked version +@@ -452,7 +438,6 @@ + rm -f $$ROOT$(BOOT_DIR)/boot.b; fi + cp mkrescue $$ROOT$(SBIN_DIR) + cp lilo $$ROOT$(SBIN_DIR) +- strip $$ROOT$(SBIN_DIR)/lilo + cp keytab-lilo.pl $$ROOT$(USRSBIN_DIR) + cp manPages/lilo.8 $$ROOT$(MAN_DIR)/man8 + cp manPages/mkrescue.8 $$ROOT$(MAN_DIR)/man8 +Only in lilo-22.8: Makefile.orig +Common subdirectories: lilo-22.8.ORIG/manPages and lilo-22.8/manPages +Common subdirectories: lilo-22.8.ORIG/sample and lilo-22.8/sample diff --git a/sys-boot/lilo/files/lilo-22.8-novga.patch b/sys-boot/lilo/files/lilo-22.8-novga.patch new file mode 100644 index 000000000000..d15ce2d8f8eb --- /dev/null +++ b/sys-boot/lilo/files/lilo-22.8-novga.patch @@ -0,0 +1,18 @@ +Common subdirectories: lilo-22.8.ORIG/diagnose and lilo-22.8/diagnose +Common subdirectories: lilo-22.8.ORIG/doc and lilo-22.8/doc +Common subdirectories: lilo-22.8.ORIG/dolilo and lilo-22.8/dolilo +Common subdirectories: lilo-22.8.ORIG/dos and lilo-22.8/dos +diff -u lilo-22.8.ORIG/Makefile lilo-22.8/Makefile +--- lilo-22.8.ORIG/Makefile 2007-03-20 10:29:42.000000000 +0000 ++++ lilo-22.8/Makefile 2007-03-20 10:30:07.000000000 +0000 +@@ -66,7 +66,7 @@ + + CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ + -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ +- -DMDPRAID -DDEVMAPPER ++ -DMDPRAID -DDEVMAPPER -DNOVGA + + + MAN_DIR=/usr/share/man +Common subdirectories: lilo-22.8.ORIG/manPages and lilo-22.8/manPages +Common subdirectories: lilo-22.8.ORIG/sample and lilo-22.8/sample diff --git a/sys-boot/lilo/lilo-22.7-r1.ebuild b/sys-boot/lilo/lilo-22.7-r1.ebuild deleted file mode 100644 index 21d87d9ec402..000000000000 --- a/sys-boot/lilo/lilo-22.7-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7-r1.ebuild,v 1.2 2006/10/20 08:50:47 chainsaw Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DOLILO_V="0.4" -IUSE="devmap static minimal pxeserial" - -DESCRIPTION="Standard Linux boot loader" -HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -MY_P=${P}.src - -SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz - mirror://gentoo/${DOLILO_TAR}" - -SLOT="0" -LICENSE="BSD GPL-2" -KEYWORDS="-* x86 ~amd64" - -RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )" -DEPEND="${RDEPEND} - >=sys-devel/bin86-0.15.5" - -PROVIDE="virtual/bootloader" - -src_unpack() { - einfo "If you want to use lilo with device mapper, please enable the" - einfo "\"devmap\" USE flag." - - unpack ${MY_P}.tar.gz - - if use devmap; then - # devmapper-patch (boot on evms/lvm2) - cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch - fi - - cd ${S} - - # Fix creating install dirs, bug #39405 - epatch ${FILESDIR}/${P}-create-install-dirs.patch - # Correctly document commandline options -v and -V, bug #43554 - epatch ${FILESDIR}/${P}-correct-usage-info.patch - # Install manpages to correct location, do not rely on incorrect manpath output, bug #117135 - epatch ${FILESDIR}/${P}-manpath.patch - # Do not strip the main binary, it upsets portage, bug #140210 - epatch ${FILESDIR}/${P}-install-nostrip.patch - - # this patch is needed when booting PXE and the device you're using - # emulates vga console via serial console. - # IE.. B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping. - use pxeserial && epatch ${FILESDIR}/${P}-novga.patch - - unpack ${DOLILO_TAR} -} - -src_compile() { - # lilo needs this. bug 140209 - export LC_ALL=C - - # hardened automatic PIC plus PIE building should be suppressed - # because of assembler instructions that cannot be compiled PIC - HARDENED_CFLAGS="`test-flags-CC -fno-pic -nopie`" - - # we explicitly prevent the custom CFLAGS for stability reasons - if use static; then - emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo-static || die - mv lilo.static lilo || die - else - emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die - fi -} - -src_install() { - keepdir /boot - make ROOT=${D} install || die - - if use !minimal; then - into / - dosbin ${S}/dolilo/dolilo - - into /usr - dosbin keytab-lilo.pl - - insinto /etc - newins ${FILESDIR}/lilo.conf lilo.conf.example - - insinto /etc/conf.d - newins ${S}/dolilo/dolilo.conf.d dolilo.example - - doman manPages/*.[5-8] - dodoc CHANGES COPYING INCOMPAT README* - docinto samples ; dodoc sample/* - fi -} - -# Check whether LILO is installed -# This function is from /usr/sbin/mkboot from debianutils, with copyright: -# -# Debian GNU/Linux -# Copyright 1996-1997 Guy Maor -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer (16 Mar 2003) -# -lilocheck () { - local bootpart= - local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" - - echo - einfon "Checking for LILO ..." - - if [ "$(whoami)" != "root" ] - then - echo; echo - eerror "Only root can check for LILO!" - return 1 - fi - - if [ -z "${rootpart}" ] - then - echo; echo - eerror "Could not determine root partition!" - return 1 - fi - - if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] - then - echo " No" - return 1 - fi - - bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)" - - if [ -z "${bootpart}" ] - then - # lilo defaults to current root when 'boot=' is not present - bootpart="${rootpart}" - fi - - if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO' - then - echo; echo - ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}" - ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." - return 1 - fi - - echo " Yes, on ${bootpart}" - - return 0 -} - - -pkg_postinst() { - if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ] - then - [ -f "${ROOT}/boot/boot-menu.b" ] && \ - ln -snf boot-menu.b ${ROOT}/boot/boot.b - fi - - if [ "${ROOT}" = "/" ] && use !minimal; - then - if lilocheck - then - einfo "Running DOLILO to complete the install ..." - # do not redirect to /dev/null because it may display some input - # prompt - /sbin/dolilo - if [ "$?" -ne 0 ] - then - echo - ewarn "Running /sbin/dolilo failed! Please check what the problem is" - ewarn "before your next reboot." - - ebeep 5 - epause 5 - fi - fi - echo - fi - if use !minimal; then - echo - einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that" - einfo "handles mounting and unmounting /boot for you. It can do more then" - einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential." - ebeep 5 - epause 3 - echo - fi -} diff --git a/sys-boot/lilo/lilo-22.7.1.ebuild b/sys-boot/lilo/lilo-22.7.1.ebuild deleted file mode 100644 index 53d57b29199f..000000000000 --- a/sys-boot/lilo/lilo-22.7.1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.1.ebuild,v 1.2 2006/07/17 20:40:09 solar Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DOLILO_V="0.3" -IUSE="devmap static minimal pxeserial" - -DESCRIPTION="Standard Linux boot loader" -HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -MY_P=${P}.src - -SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz - mirror://gentoo/${DOLILO_TAR}" - -SLOT="0" -LICENSE="BSD GPL-2" -KEYWORDS="-* ~x86 ~amd64" - -RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )" -DEPEND="${RDEPEND} - >=sys-devel/bin86-0.15.5" - -PROVIDE="virtual/bootloader" - -src_unpack() { - einfo "If you want to use lilo with device mapper, please enable the" - einfo "\"devmap\" USE flag." - - unpack ${MY_P}.tar.gz - - # Do not build with DOS support - sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile - sed -i -e 's|DOS_DIR=/dosC/boot||' ${S}/Makefile - - if use devmap; then - # devmapper-patch (boot on evms/lvm2) - cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch - fi - - cd ${S} - - # Fix creating install dirs, bug #39405 - epatch ${FILESDIR}/${P}-create-install-dirs.patch - # Correctly document commandline options -v and -V, bug #43554 - epatch ${FILESDIR}/${P}-correct-usage-info.patch - # Install manpages to correct location, do not rely on incorrect manpath output, bug #117135 - epatch ${FILESDIR}/${P}-manpath.patch - - # this patch is needed when booting PXE and the device you're using - # emulates vga console via serial console. - # IE.. B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping. - use pxeserial && epatch ${FILESDIR}/${P}-novga.patch - - unpack ${DOLILO_TAR} -} - -src_compile() { - # lilo needs this. bug 140209 - export LC_ALL=C - - # hardened automatic PIC plus PIE building should be suppressed - # because of assembler instructions that cannot be compiled PIC - HARDENED_CFLAGS="`test-flags-CC -fno-pic -nopie`" - - # we explicitly prevent the custom CFLAGS for stability reasons - if use static; then - emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo-static || die - mv lilo-static lilo || die - else - emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die - fi -} - -src_install() { - keepdir /boot - make ROOT=${D} install || die - - if use !minimal; then - into / - dosbin ${S}/dolilo/dolilo - - into /usr - dosbin keytab-lilo.pl - - insinto /etc - newins ${FILESDIR}/lilo.conf lilo.conf.example - - insinto /etc/conf.d - newins ${S}/dolilo/dolilo.conf.d dolilo.example - - doman manPages/*.[5-8] - dodoc CHANGES COPYING INCOMPAT README* - docinto samples ; dodoc sample/* - fi -} - -# Check whether LILO is installed -# This function is from /usr/sbin/mkboot from debianutils, with copyright: -# -# Debian GNU/Linux -# Copyright 1996-1997 Guy Maor -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer (16 Mar 2003) -# -lilocheck () { - local bootpart= - local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" - - echo - einfon "Checking for LILO ..." - - if [ "$(whoami)" != "root" ] - then - echo; echo - eerror "Only root can check for LILO!" - return 1 - fi - - if [ -z "${rootpart}" ] - then - echo; echo - eerror "Could not determine root partition!" - return 1 - fi - - if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] - then - echo " No" - return 1 - fi - - bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)" - - if [ -z "${bootpart}" ] - then - # lilo defaults to current root when 'boot=' is not present - bootpart="${rootpart}" - fi - - if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO' - then - echo; echo - ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}" - ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." - return 1 - fi - - echo " Yes, on ${bootpart}" - - return 0 -} - - -pkg_postinst() { - if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ] - then - [ -f "${ROOT}/boot/boot-menu.b" ] && \ - ln -snf boot-menu.b ${ROOT}/boot/boot.b - fi - - if [ "${ROOT}" = "/" ] && use !minimal; - then - if lilocheck - then - einfo "Running DOLILO to complete the install ..." - # do not redirect to /dev/null because it may display some input - # prompt - /sbin/dolilo - if [ "$?" -ne 0 ] - then - echo - ewarn "Running /sbin/dolilo failed! Please check what the problem is" - ewarn "before your next reboot." - - ebeep 5 - epause 5 - fi - fi - echo - fi - if use !minimal; then - echo - einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that" - einfo "handles mounting and unmounting /boot for you. It can do more then" - einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential." - ebeep 5 - epause 3 - echo - fi -} diff --git a/sys-boot/lilo/lilo-22.7.3-r1.ebuild b/sys-boot/lilo/lilo-22.7.3-r1.ebuild index fb6acf250039..68bbbb3fbc48 100644 --- a/sys-boot/lilo/lilo-22.7.3-r1.ebuild +++ b/sys-boot/lilo/lilo-22.7.3-r1.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-boot/lilo/lilo-22.7.3-r1.ebuild,v 1.2 2007/01/15 15:23:05 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.3-r1.ebuild,v 1.3 2007/03/20 10:46:25 chainsaw Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -19,7 +19,7 @@ SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz SLOT="0" LICENSE="BSD GPL-2" -KEYWORDS="-* x86 ~amd64" +KEYWORDS="-* x86 amd64" DEPEND=">=sys-devel/bin86-0.15.5" diff --git a/sys-boot/lilo/lilo-22.7.ebuild b/sys-boot/lilo/lilo-22.7.ebuild deleted file mode 100644 index 5ff8c6d12168..000000000000 --- a/sys-boot/lilo/lilo-22.7.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.ebuild,v 1.6 2006/07/17 20:40:09 solar Exp $ - -inherit eutils flag-o-matic toolchain-funcs - -DOLILO_V="0.3" -IUSE="devmap static minimal pxeserial" - -DESCRIPTION="Standard Linux boot loader" -HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -MY_P=${P}.src - -SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz - ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz - mirror://gentoo/${DOLILO_TAR}" - -SLOT="0" -LICENSE="BSD GPL-2" -KEYWORDS="-* x86 amd64" - -RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )" -DEPEND="${RDEPEND} - >=sys-devel/bin86-0.15.5" - -PROVIDE="virtual/bootloader" - -src_unpack() { - einfo "If you want to use lilo with device mapper, please enable the" - einfo "\"devmap\" USE flag." - - unpack ${MY_P}.tar.gz - - # Do not try and build the dos crap. - sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile - - # The bootlogo patch from SuSE linux, which was originally in - # here, has been dropped because it's no longer compatible - # with lilo since the 22.5.x series. - # Quequero has done a good attempt to port the patch in bug - # #19397, but unfortunately that breaks the timeout at boot. - # If you can overcome these problems, a patch is very welcome. - - if use devmap; then - # devmapper-patch (boot on evms/lvm2) - cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch - fi - - cd ${S} - - # Fix creating install dirs, bug #39405 - epatch ${FILESDIR}/${P}-create-install-dirs.patch - # Correctly document commandline options -v and -V, bug #43554 - epatch ${FILESDIR}/${P}-correct-usage-info.patch - - # this patch is needed when booting PXE and the device you're using - # emulates vga console via serial console. - # IE.. B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping. - use pxeserial && epatch ${FILESDIR}/${P}-novga.patch - - # Get the manpage path right - sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile - - unpack ${DOLILO_TAR} -} - -src_compile() { - # lilo needs this. bug 140209 - export LC_ALL=C - - # hardened automatic PIC plus PIE building should be suppressed - # because of assembler instructions that cannot be compiled PIC - HARDENED_CFLAGS="`test-flags-CC -fno-pic -nopie`" - - # we explicitly prevent the custom CFLAGS for stability reasons - if use static; then - emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo-static || die - mv lilo-static lilo || die - else - emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die - fi -} - -src_install() { - keepdir /boot - make ROOT=${D} install || die - - if use !minimal; then - into / - dosbin ${S}/dolilo/dolilo - - into /usr - dosbin keytab-lilo.pl - - insinto /etc - newins ${FILESDIR}/lilo.conf lilo.conf.example - - insinto /etc/conf.d - newins ${S}/dolilo/dolilo.conf.d dolilo.example - - doman manPages/*.[5-8] - dodoc CHANGES COPYING INCOMPAT README* - docinto samples ; dodoc sample/* - fi -} - -# Check whether LILO is installed -# This function is from /usr/sbin/mkboot from debianutils, with copyright: -# -# Debian GNU/Linux -# Copyright 1996-1997 Guy Maor -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer (16 Mar 2003) -# -lilocheck () { - local bootpart= - local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" - - echo - einfon "Checking for LILO ..." - - if [ "$(whoami)" != "root" ] - then - echo; echo - eerror "Only root can check for LILO!" - return 1 - fi - - if [ -z "${rootpart}" ] - then - echo; echo - eerror "Could not determine root partition!" - return 1 - fi - - if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] - then - echo " No" - return 1 - fi - - bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)" - - if [ -z "${bootpart}" ] - then - # lilo defaults to current root when 'boot=' is not present - bootpart="${rootpart}" - fi - - if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO' - then - echo; echo - ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}" - ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." - return 1 - fi - - echo " Yes, on ${bootpart}" - - return 0 -} - - -pkg_postinst() { - if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ] - then - [ -f "${ROOT}/boot/boot-menu.b" ] && \ - ln -snf boot-menu.b ${ROOT}/boot/boot.b - fi - - if [ "${ROOT}" = "/" ] && use !minimal; - then - if lilocheck - then - einfo "Running DOLILO to complete the install ..." - # do not redirect to /dev/null because it may display some input - # prompt - /sbin/dolilo - if [ "$?" -ne 0 ] - then - echo - ewarn "Running /sbin/dolilo failed! Please check what the problem is" - ewarn "before your next reboot." - - ebeep 5 - epause 5 - fi - fi - echo - fi - if use !minimal; then - echo - einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that" - einfo "handles mounting and unmounting /boot for you. It can do more then" - einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential." - ebeep 5 - epause 3 - echo - fi -} diff --git a/sys-boot/lilo/lilo-22.7.2-r2.ebuild b/sys-boot/lilo/lilo-22.8.ebuild similarity index 84% rename from sys-boot/lilo/lilo-22.7.2-r2.ebuild rename to sys-boot/lilo/lilo-22.8.ebuild index 490432e881f9..faaae85b4e1e 100644 --- a/sys-boot/lilo/lilo-22.7.2-r2.ebuild +++ b/sys-boot/lilo/lilo-22.8.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.2-r2.ebuild,v 1.1 2006/09/05 11:26:29 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8.ebuild,v 1.1 2007/03/20 10:46:25 chainsaw Exp $ inherit eutils flag-o-matic toolchain-funcs DOLILO_V="0.4" -IUSE="devmap static minimal pxeserial" +IUSE="static minimal pxeserial" DESCRIPTION="Standard Linux boot loader" HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/" @@ -21,34 +21,20 @@ SLOT="0" LICENSE="BSD GPL-2" KEYWORDS="-* ~x86 ~amd64" -RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )" -DEPEND="${RDEPEND} - >=sys-devel/bin86-0.15.5" +DEPEND=">=sys-devel/bin86-0.15.5" PROVIDE="virtual/bootloader" src_unpack() { - einfo "If you want to use lilo with device mapper, please enable the" - einfo "\"devmap\" USE flag." - unpack ${MY_P}.tar.gz - if use devmap; then - # devmapper-patch (boot on evms/lvm2) - cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch - fi - cd ${S} - # Fix creating install dirs, bug #39405 - epatch ${FILESDIR}/${P}-create-install-dirs.patch # Correctly document commandline options -v and -V, bug #43554 epatch ${FILESDIR}/${P}-correct-usage-info.patch # Install manpages to correct location, do not rely on incorrect manpath output, bug #117135 - epatch ${FILESDIR}/${P}-manpath.patch # Do not strip the main binary, it upsets portage, bug #140210 - epatch ${FILESDIR}/${P}-install-nostrip.patch - # Do not build diagnostics when bcc is present; bug #141777 + # Do not install diag1.img, bug #149887 epatch ${FILESDIR}/${P}-makefile.patch # this patch is needed when booting PXE and the device you're using