commit: 59c41f353f4a0a2ef041ee37e6b7e35831bfd508 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 18 19:00:53 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 18 19:00:55 2022 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=59c41f35
sys-boot/lilo: treeclean ::gentoo builds, at least. Closes: https://bugs.gentoo.org/859040 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-boot/lilo/Manifest | 2 - sys-boot/lilo/files/lilo-24.1-novga.patch | 12 -- .../lilo/files/lilo-24.1-remove-O_ACCMODE.patch | 17 -- .../lilo/files/lilo-24.1-remove__GLIBC__.patch | 11 -- sys-boot/lilo/files/lilo.conf | 73 --------- sys-boot/lilo/lilo-24.1.ebuild | 182 --------------------- sys-boot/lilo/metadata.xml | 16 -- 7 files changed, 313 deletions(-) diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest deleted file mode 100644 index 830ce1f3..00000000 --- a/sys-boot/lilo/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST dolilo-0.6.tar.bz2 3817 SHA256 01293874aea4cfa935d3f22fd52c8f4956e4a85b39a878df1255098825f2840e SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 WHIRLPOOL 7a24cf7bf4b476967a5d4ba2234ce3256ff9311744be020ef25e6227f8e86098aac89706d23df30d3f0212aa3fe313c0460d1709990b21029d93517b77f61e4e -DIST lilo-24.1.tar.gz 773223 SHA256 a15280edacb8bca31b9163d65e61270b8c06cb9ffea74374a3a42164a13d4532 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 WHIRLPOOL 6534b9494cce30c56f0ec700eb8288ebfdfb9e07ed631958e3f34d03d4fb42de372237dab5d07a8b8ef1c3da49b427d3777be14de9abca339dcd184fce550ab0 diff --git a/sys-boot/lilo/files/lilo-24.1-novga.patch b/sys-boot/lilo/files/lilo-24.1-novga.patch deleted file mode 100644 index 512fac69..00000000 --- a/sys-boot/lilo/files/lilo-24.1-novga.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr lilo-24.1.ORIG/make.vars lilo-24.1/make.vars ---- lilo-24.1.ORIG/make.vars 2015-01-22 10:36:54.656904227 +0000 -+++ lilo-24.1/make.vars 2015-01-22 10:37:16.516903935 +0000 -@@ -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/files/lilo-24.1-remove-O_ACCMODE.patch b/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch deleted file mode 100644 index 98e9212a..00000000 --- a/sys-boot/lilo/files/lilo-24.1-remove-O_ACCMODE.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur lilo-24.1.orig/src/common.h lilo-24.1/src/common.h ---- lilo-24.1.orig/src/common.h 2011-06-22 03:13:27.000000000 -0400 -+++ lilo-24.1/src/common.h 2015-07-22 19:27:06.272990549 -0400 -@@ -23,12 +23,7 @@ - # define PAGE_SIZE 4096U - #endif - --#ifdef O_ACCMODE --# define O_NOACCESS O_ACCMODE --#else --/* open a file for "no access" */ --# define O_NOACCESS 3 --#endif -+#define O_NOACCESS O_RDONLY - - /* special for LILO, bypass the actual open in dev_open( , ,-1) */ - #define O_BYPASS -1 diff --git a/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch b/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch deleted file mode 100644 index 66ff6b0a..00000000 --- a/sys-boot/lilo/files/lilo-24.1-remove__GLIBC__.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur lilo-24.1.orig/src/lilo.c lilo-24.1/src/lilo.c ---- lilo-24.1.orig/src/lilo.c 2014-10-16 20:06:46.000000000 -0400 -+++ lilo-24.1/src/lilo.c 2015-07-18 22:16:32.776066238 -0400 -@@ -182,7 +182,6 @@ - printf("Without"); - #endif - printf(" device-mapper\n"); -- printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__); - printf("Kernel Headers included from %d.%d.%d\n", - LINUX_VERSION_CODE>>16, - LINUX_VERSION_CODE>>8 & 255, diff --git a/sys-boot/lilo/files/lilo.conf b/sys-boot/lilo/files/lilo.conf deleted file mode 100644 index 1c0c48ac..00000000 --- a/sys-boot/lilo/files/lilo.conf +++ /dev/null @@ -1,73 +0,0 @@ -# $Id$ -# Author: Ultanium - -# -# Start LILO global section -# - -# Faster, but won't work on all systems: -#compact -# Should work for most systems, and do not have the sector limit: -lba32 -# If lba32 do not work, use linear: -#linear - -# MBR to install LILO to: -boot = /dev/hda -map = /boot/.map - -# If you are having problems booting from a hardware raid-array -# or have a unusual setup, try this: -#disk=/dev/ataraid/disc0/disc bios=0x80 # see this as the first BIOS disk -#disk=/dev/sda bios=0x81 # see this as the second BIOS disk -#disk=/dev/hda bios=0x82 # see this as the third BIOS disk - -# Here you can select the secondary loader to install. A few -# examples is: -# -# boot-text.b -# boot-menu.b -# boot-bmp.b -# -install = /boot/boot-menu.b # Note that for lilo-22.5.5 or later you - # do not need boot-{text,menu,bmp}.b in - # /boot, as they are linked into the lilo - # binary. - -menu-scheme=Wb -prompt -# If you always want to see the prompt with a 15 second timeout: -#timeout=150 -delay = 50 -# Normal VGA console -vga = normal -# VESA console with size 1024x768x16: -#vga = 791 - -# -# End LILO global section -# - -# -# Linux bootable partition config begins -# -image = /boot/bzImage - root = /dev/hda3 - #root = /devices/discs/disc0/part3 - label = Gentoo - read-only # read-only for checking -# -# Linux bootable partition config ends -# - -# -# DOS bootable partition config begins -# -other = /dev/hda1 - #other = /devices/discs/disc0/part1 - label = Windows - table = /dev/hda -# -# DOS bootable partition config ends -# - diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild deleted file mode 100644 index 981a24da..00000000 --- a/sys-boot/lilo/lilo-24.1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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() { - # 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" - - # Remove reference to __GLIBC__ for musl. - epatch "${FILESDIR}"/${P}-remove__GLIBC__.patch - epatch "${FILESDIR}"/${P}-remove-O_ACCMODE.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} || die -} - -src_install() { - keepdir /boot - emake DESTDIR="${D}" install || die - - if use !minimal; then - into / - dosbin "${WORKDIR}"/dolilo/dolilo || die - - into /usr - dosbin keytab-lilo.pl || die - - insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die - - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die - - 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 -} diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml deleted file mode 100644 index 0deb765d..00000000 --- a/sys-boot/lilo/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</email> -</maintainer> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -<use> - <flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag> - <flag name="minimal">Do not install the dolilo helper script</flag> - <flag name="pxeserial">Avoid character echo on PXE serial console</flag> -</use> -</pkgmetadata>
