commit: 83f5e5b7ebb09fc30f742da22a820711fb17f1df Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun May 23 11:48:11 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun May 23 11:48:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f5e5b7
sys-boot/lilo: drop 24.0-r1, 24.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-boot/lilo/Manifest | 2 - sys-boot/lilo/files/lilo-24.0-novga.patch | 12 -- sys-boot/lilo/lilo-24.0-r1.ebuild | 172 ---------------------------- sys-boot/lilo/lilo-24.1.ebuild | 182 ------------------------------ 4 files changed, 368 deletions(-) diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 39d90b9ba38..4260ab014b4 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -1,4 +1,2 @@ DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 -DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7 -DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 diff --git a/sys-boot/lilo/files/lilo-24.0-novga.patch b/sys-boot/lilo/files/lilo-24.0-novga.patch deleted file mode 100644 index ebb06b48681..00000000000 --- a/sys-boot/lilo/files/lilo-24.0-novga.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur lilo-23.2/make.vars lilo-23.2.new/make.vars ---- lilo-23.2/make.vars 2013-01-18 11:33:02.438628138 -0600 -+++ lilo-23.2.new/make.vars 2013-01-18 11:34:03.960697091 -0600 -@@ -71,7 +71,7 @@ - - CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ - -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ -- -DMDPRAID -DDEVMAPPER -+ -DMDPRAID -DDEVMAPPER -DNOVGA - - # set the following if you wish LILO.COM to be installed - DOS_DIR=/dosC/boot diff --git a/sys-boot/lilo/lilo-24.0-r1.ebuild b/sys-boot/lilo/lilo-24.0-r1.ebuild deleted file mode 100644 index a724cf74ade..00000000000 --- a/sys-boot/lilo/lilo-24.0-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch flag-o-matic toolchain-funcs - -DOLILO_V="0.6" -IUSE="static minimal pxeserial device-mapper" - -DESCRIPTION="Standard Linux boot loader" -HOMEPAGE="https://alioth.debian.org/projects/lilo/"; - -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -SRC_URI=" - http://lilo.alioth.debian.org/ftp/sources/${P}.tar.gz - mirror://gentoo/${DOLILO_TAR} -" - -SLOT="0" -LICENSE="BSD GPL-2" -KEYWORDS="-* amd64 x86" - -DEPEND=">=sys-devel/bin86-0.15.5" -RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )" - -src_prepare() { - # 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" - - # Do not strip and have parallel make - # FIXME: images/Makefile does weird stuff - sed -i Makefile src/Makefile \ - -e '/strip/d;s|^ make| $(MAKE)|g' \ - -e '/images install/d' \ - -e '/images all/d' \ - || die "sed strip failed" -} - -src_configure() { - if ! use device-mapper; then - sed -i make.vars -e 's|-DDEVMAPPER||g' || die - fi -} - -src_compile() { - # lilo needs this. bug #140209 - export LC_ALL=C - - # we explicitly prevent the custom CFLAGS for stability reasons - if use static; then - local target=alles - else - local target=all - fi - - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} -} - -src_install() { - keepdir /boot - emake DESTDIR="${D}" install - - if ! use minimal; then - into / - dosbin "${WORKDIR}"/dolilo/dolilo - - into /usr - dosbin keytab-lilo.pl - - insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example - - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example - - dodoc CHANGELOG* readme/README.* readme/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 <[email protected]> -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer <[email protected]> (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 - eerror "Running /sbin/dolilo failed! Please check what the problem is" - eerror "before your next reboot." - 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." - echo - fi -} diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild deleted file mode 100644 index 4627ce7347c..00000000000 --- a/sys-boot/lilo/lilo-24.1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit eutils flag-o-matic toolchain-funcs - -DOLILO_V="0.6" -IUSE="static minimal pxeserial device-mapper" - -DESCRIPTION="Standard Linux boot loader" -HOMEPAGE="https://alioth.debian.org/projects/lilo/"; - -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -SRC_URI=" - http://lilo.alioth.debian.org/ftp/sources/${P}.tar.gz - mirror://gentoo/${DOLILO_TAR} -" - -SLOT="0" -LICENSE="BSD GPL-2" -KEYWORDS="-* ~amd64 ~x86" - -DEPEND=">=sys-devel/bin86-0.15.5" -RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )" - -src_prepare() { - default - - # 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 && eapply "${FILESDIR}/${P}-novga.patch" - - eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch" - - # Do not strip and have parallel make - # FIXME: images/Makefile does weird stuff - sed -i Makefile src/Makefile \ - -e '/strip/d;s|^ make| $(MAKE)|g' \ - -e '/images install/d' \ - -e '/images all/d' \ - || die "sed strip failed" -} - -src_configure() { - if ! use device-mapper; then - sed -i make.vars -e 's|-DDEVMAPPER||g' || die - fi -} - -src_compile() { - # lilo needs this. bug #140209 - export LC_ALL=C - - # we explicitly prevent the custom CFLAGS for stability reasons - if use static; then - local target=alles - else - local target=all - fi - - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} -} - -src_install() { - keepdir /boot - emake DESTDIR="${D}" install - - if use !minimal; then - into / - dosbin "${WORKDIR}"/dolilo/dolilo - - into /usr - dosbin keytab-lilo.pl - - insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example - - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example - - dodoc CHANGELOG* readme/README.* readme/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 <[email protected]> -# -# Modified for Gentoo for use with the lilo ebuild by: -# Martin Schlemmer <[email protected]> (16 Mar 2003) -# -lilocheck() { - local bootpart= - local rootpart="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")" - - echo - ebegin "Checking whether LILO can be safely updated" - - if [ "$(whoami)" != "root" ] - then - eend 1 - eerror "Only root can check for LILO" - return 1 - fi - - if [ -z "${rootpart}" ] - then - eend 1 - eerror "Could not determine root partition" - return 1 - fi - - if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ] - then - eend 1 - eerror "No LILO configuration in place" - 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 - eend 1 - eerror "No LILO signature on ${bootpart}" - ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand." - return 1 - fi - - if grep -q "^[[:space:]]*password[[:space:]]*=[[:space:]]*\"\"" /etc/lilo.conf - then - eend 1 - eerror "Interactive password entry configured" - ewarn "Run /sbin/lilo -p by hand." - return 1 - fi - - einfo "LILO on ${bootpart} is safe to update" - eend 0 - 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 - eerror "You must manually configure and run LILO" - 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, " - einfo "edit /etc/conf.d/dolilo to harness its full potential." - echo - fi -}
