* [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/files/, sys-boot/lilo/
@ 2015-11-23 14:50 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2015-11-23 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 7cbcad959b92bafaca2bfd45eef5c65d86ec674d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 14:50:35 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 14:50:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbcad95
sys-boot/lilo: Removed old.
Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-boot/lilo/files/lilo-23.0-make.patch | 103 ------------------
sys-boot/lilo/lilo-23.2-r1.ebuild | 173 ------------------------------
sys-boot/lilo/lilo-24.0.ebuild | 176 -------------------------------
3 files changed, 452 deletions(-)
diff --git a/sys-boot/lilo/files/lilo-23.0-make.patch b/sys-boot/lilo/files/lilo-23.0-make.patch
deleted file mode 100644
index 00b15c5..0000000
--- a/sys-boot/lilo/files/lilo-23.0-make.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- a/Makefile 2010-06-18 19:17:48.000000000 +0200
-+++ b/Makefile 2010-07-20 02:00:18.000000000 +0200
-@@ -26,19 +26,19 @@
- # everything needed to run, just short of installation
- #
- all: test
-- make -C src all
-+ $(MAKE) -C src all
-
- #
- # everything above plus the statically linked version
- #
- alles: test
-- make -C src alles
-+ $(MAKE) -C src alles
-
- #
- # documentation files
- #
- docs:
-- make -C doc all
-+ $(MAKE) -C doc all
-
- #
- # if you have the 'bcc' compiler, then you can make the diagnostics, too
-@@ -55,23 +55,23 @@
- @echo before you proceed from this point.
- @echo "Press <Enter> to continue, <^C> to abort ..."
- @read
-- @make -C src floppy1
-+ @$(MAKE) -C src floppy1
- @echo Done.
- @echo
- @echo Remove the floppy from the drive. Label it "\"1.6\""
- @echo "Press <Enter> to continue, <^C> to abort ..."
- @read
-- @make -C src floppy2
-+ @$(MAKE) -C src floppy2
- @echo Done.
- @echo
- @echo Remove the floppy from the drive. Label it "\"2.4\""
- @echo
-
- diagnostic: test
-- make -C src diagnostic
-+ $(MAKE) -C src diagnostic
-
- dosexe: test
-- make -C dos lilo
-+ $(MAKE) -C dos lilo
-
- #
- # test for compilers & utilities
-@@ -85,33 +85,33 @@
- # shorthand install, if one knows that one has the 'bcc' compiler
- #
- ins:
-- make -C src ins
-+ $(MAKE) -C src ins
-
- #
- # normal install, but doesn't make the diagnostic binaries
- #
- install: all
-- make -C src install
-- make -C man install
-- make -C dos install
-- make -C src insobs
-+ $(MAKE) -C src install
-+ $(MAKE) -C man install
-+ $(MAKE) -C dos install
-+ $(MAKE) -C src insobs
-
- tidy:
-- make -C src tidy
-- make -C diagnose tidy
-- make -C dos tidy
-- make -C doc tidy
-+ $(MAKE) -C src tidy
-+ $(MAKE) -C diagnose tidy
-+ $(MAKE) -C dos tidy
-+ $(MAKE) -C doc tidy
-
- clean: tidy
- rm -f test.img
-- make -C src clean
-- make -C diagnose clean
-- make -C dos clean
-+ $(MAKE) -C src clean
-+ $(MAKE) -C diagnose clean
-+ $(MAKE) -C dos clean
-
- spotless: distclean
- distclean: clean
-- make -C src distclean
-- make -C diagnose distclean
-- make -C dos distclean
-- make -C doc clean
-+ $(MAKE) -C src distclean
-+ $(MAKE) -C diagnose distclean
-+ $(MAKE) -C dos distclean
-+ $(MAKE) -C doc clean
-
diff --git a/sys-boot/lilo/lilo-23.2-r1.ebuild b/sys-boot/lilo/lilo-23.2-r1.ebuild
deleted file mode 100644
index 84e2073..0000000
--- a/sys-boot/lilo/lilo-23.2-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.5"
-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}/${PN}-22.8-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_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) ${LDFLAGS} ${HARDENED_CFLAGS}" alles || die
- else
- emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" all || die
- fi
-}
-
-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 <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-# Martin Schlemmer <azarah@gentoo.org> (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-24.0.ebuild b/sys-boot/lilo/lilo-24.0.ebuild
deleted file mode 100644
index 013415a..0000000
--- a/sys-boot/lilo/lilo-24.0.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.5"
-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
-
- # 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
- local target=alles
- else
- local target=all
- fi
-
- emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" ${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 <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-# Martin Schlemmer <azarah@gentoo.org> (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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/files/, sys-boot/lilo/
@ 2019-06-04 5:27 Andreas K. Hüttel
0 siblings, 0 replies; 5+ messages in thread
From: Andreas K. Hüttel @ 2019-06-04 5:27 UTC (permalink / raw
To: gentoo-commits
commit: b0bd1c72aac266f733760b9243232568cc9b4ba2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 05:20:44 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 05:20:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0bd1c72
sys-boot/lilo: remove old
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
sys-boot/lilo/Manifest | 2 -
.../lilo/files/lilo-22.8-correct-usage-info.patch | 12 --
sys-boot/lilo/files/lilo-22.8-makefile.patch | 42 -----
sys-boot/lilo/files/lilo-22.8-nodevmapper.patch | 13 --
sys-boot/lilo/files/lilo-22.8-novga.patch | 11 --
sys-boot/lilo/lilo-22.8-r2.ebuild | 177 ---------------------
6 files changed, 257 deletions(-)
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index f0ac2e56762..39d90b9ba38 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,6 +1,4 @@
-DIST dolilo-0.5.tar.bz2 3777 BLAKE2B 4f168e678c771ba964f141a0af04d6dcb13e0e98f37283c799b5d127547fd511826f941fdba12857b8629e8e6324f2117c618f2c15ed3e49e9aa220be77f79ac SHA512 6bfd0181d922f01903c8c0cdc67fc087c74091d7ffec0ddfb263c18b3a2247fcfbd201995f1724f26f4eb21b91147f209fd7ed485a05c6b9e9f583ea2456baa9
DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
-DIST lilo-22.8.src.tar.gz 437555 BLAKE2B 319890a7760d8528192c9ba553295f9ba12b204a1512e8b8f62da146bc41ad2b453a853661d184dd31fc8d65f33523db63b9e1d3cf3f2391a64b05efa06c3bcb SHA512 b8a22c73b5f6a0c7ddde7c7af6511f9e85d43bae98603bfa0656dfa0685018b3ed713cfd9932bfac33017b83f807c66a3e25d78a16ea9a15bbfddd0e806714cc
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-22.8-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
deleted file mode 100644
index 87ea4b20ce9..00000000000
--- a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lilo.c
-+++ b/lilo.c
-@@ -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
deleted file mode 100644
index d2a34bbded1..00000000000
--- a/sys-boot/lilo/files/lilo-22.8-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -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
diff --git a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch b/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch
deleted file mode 100644
index f81cbfe92ef..00000000000
--- a/sys-boot/lilo/files/lilo-22.8-nodevmapper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile~ 2007-04-28 22:04:23.000000000 +0200
-+++ Makefile 2007-04-28 22:21:46.000000000 +0200
-@@ -91,8 +91,8 @@
- sed 's/-D/-DLCF_/g'`
- LILO=-DLILO=0xbb920890
- KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
--HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
--DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
-+HDM=
-+DEVMAPPER=
-
- TMP=_TmP_
-
diff --git a/sys-boot/lilo/files/lilo-22.8-novga.patch b/sys-boot/lilo/files/lilo-22.8-novga.patch
deleted file mode 100644
index 939998fe9d4..00000000000
--- a/sys-boot/lilo/files/lilo-22.8-novga.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -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
diff --git a/sys-boot/lilo/lilo-22.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild
deleted file mode 100644
index 0878e7783f5..00000000000
--- a/sys-boot/lilo/lilo-22.8-r2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.5"
-IUSE="static minimal pxeserial device-mapper"
-
-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="-* amd64 x86"
-
-DEPEND=">=sys-devel/bin86-0.15.5"
-RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
-
-src_unpack() {
- unpack ${MY_P}.tar.gz
-
- cd "${S}"
-
- # 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
- # Do not strip the main binary, it upsets portage, bug #140210
- # 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
- # 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"
- use device-mapper || epatch "${FILESDIR}/${P}-nodevmapper.patch"
-
- unpack ${DOLILO_TAR}
-}
-
-src_compile() {
- # lilo needs this. bug #140209
- export LC_ALL=C
-
- # we explicitly prevent the custom CFLAGS for stability reasons
- if use static; then
- emake CC="$(tc-getCC)" lilo.static || die
- mv lilo.static lilo || die
- else
- emake CC="$(tc-getCC)" 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
-
- newconfd "${S}"/dolilo/dolilo.conf.d dolilo.example
-
- doman manPages/*.[5-8]
- dodoc CHANGES 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 <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-# Martin Schlemmer <azarah@gentoo.org> (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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/files/, sys-boot/lilo/
@ 2020-07-31 4:09 Joshua Kinard
0 siblings, 0 replies; 5+ messages in thread
From: Joshua Kinard @ 2020-07-31 4:09 UTC (permalink / raw
To: gentoo-commits
commit: d5f9c57fe506f3c38fa8b4e939fc1c1a28c621a2
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 04:08:05 2020 +0000
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 04:08:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f9c57f
sys-boot/lilo: EAPI 7 and add NVME support
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Closes: https://bugs.gentoo.org/689940
Package-Manager: Portage-3.0.1, Repoman-2.3.23
.../lilo/files/lilo-24.2-add-nvme-support.patch | 70 ++++++++++++++++++++++
sys-boot/lilo/lilo-24.2.ebuild | 10 +++-
2 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/sys-boot/lilo/files/lilo-24.2-add-nvme-support.patch b/sys-boot/lilo/files/lilo-24.2-add-nvme-support.patch
new file mode 100644
index 00000000000..b4d54ec9bc9
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.2-add-nvme-support.patch
@@ -0,0 +1,70 @@
+diff -Naurp lilo-24.2.orig/src/common.h lilo-24.2/src/common.h
+--- lilo-24.2.orig/src/common.h 2015-11-21 18:50:23.000000000 -0500
++++ lilo-24.2/src/common.h 2020-07-30 23:20:05.611122665 -0400
+@@ -386,7 +386,7 @@ extern char *config_file;
+ extern FILE *errstd;
+ extern FILE *pp_fd;
+ extern char *identify; /* in identify.c */
+-extern int dm_major_list[16];
++extern int dm_major_list[32];
+ extern int dm_major_nr;
+
+ #define crc(a,b) (~crc32((a),(b),CRC_POLY1))
+diff -Naurp lilo-24.2.orig/src/geometry.c lilo-24.2/src/geometry.c
+--- lilo-24.2.orig/src/geometry.c 2015-11-21 18:50:18.000000000 -0500
++++ lilo-24.2/src/geometry.c 2020-07-30 23:20:05.611122665 -0400
+@@ -84,8 +84,9 @@ DM_TABLE *dmtab = NULL;
+ int dm_version_nr = 0;
+ #endif
+
+-int dm_major_list[16];
++int dm_major_list[32]; /* increased from 16 to allow for nvme disks */
+ int dm_major_nr;
++int nvme_pr = 0; /* set to none zero after geo_init if nvme disk present */
+
+ #ifdef LCF_LVM
+ struct lv_bmap {
+@@ -200,6 +201,9 @@ void geo_init(char *name)
+
+ while(fgets(line, (sizeof line)-1, file)) {
+ if (sscanf(line, "%d %31s\n", &major, major_name) != 2) continue;
++ if (strcmp(major_name, "nvme") !=0) { /* set if nvme drive is present */
++ nvme_pr=-1;
++ }
+ if (strcmp(major_name, "device-mapper") != 0) continue;
+ dm_major_list[dm_major_nr] = major;
+ if (verbose >= 3) {
+@@ -708,6 +712,22 @@ void geo_query_dev(GEOMETRY *geo,int dev
+ geo->start = hdprm.start;
+ break;
+ case MAJOR_SATA1:
++ /* check for nvme device and assume boot/this device is nvme if present */
++ if (nvme_pr != 0) {
++ geo->device = 0x80 + last_dev(MAJOR_IDE,64) + (MINOR(device) >> 4);
++ if (!get_all) break;
++ if (ioctl(fd,HDIO_GETGEO,&hdprm) < 0)
++ die("geo_query_dev HDIO_GETGEO (dev 0x%04x): %s",device,
++ strerror(errno));
++ if (all && !hdprm.sectors)
++ die("HDIO_REQ not supported for your NVME controller. Please "
++ "use a DISK section");
++ geo->heads = hdprm.heads;
++ geo->cylinders = hdprm.cylinders;
++ geo->sectors = hdprm.sectors;
++ geo->start = hdprm.start;
++ break;
++ }
+ case MAJOR_SATA2:
+ printf("WARNING: SATA partition in the high region (>15):\n");
+ printf("LILO needs the kernel in one of the first 15 SATA partitions. If \n");
+diff -Naurp lilo-24.2.orig/src/lilo.h lilo-24.2/src/lilo.h
+--- lilo-24.2.orig/src/lilo.h 2015-11-21 18:50:20.000000000 -0500
++++ lilo-24.2/src/lilo.h 2020-07-30 23:20:05.611122665 -0400
+@@ -245,6 +245,7 @@
+
+ /* high partitions (>15) on SATA hard disks */
+ #define MAJOR_SATA1 259 /* high SATA disk partitions (Block Extended Major) */
++ /* also used by kernel for nvme disks */
+ #define MAJOR_SATA2 260 /* high SATA disk partitions (Block Extended Major) (obsolete) */
+
+
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index c84d6257d95..73f9ea6efbb 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="7"
inherit eutils flag-o-matic toolchain-funcs
@@ -25,10 +25,14 @@ 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 && epatch "${FILESDIR}/${PN}-24.1-novga.patch"
+ use pxeserial && eapply "${FILESDIR}/${PN}-24.1-novga.patch"
+
+ eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
# Do not strip and have parallel make
# FIXME: images/Makefile does weird stuff
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/files/, sys-boot/lilo/
@ 2021-05-23 11:48 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2021-05-23 11:48 UTC (permalink / raw
To: gentoo-commits
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 <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-# Martin Schlemmer <azarah@gentoo.org> (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 <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-# Martin Schlemmer <azarah@gentoo.org> (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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/files/, sys-boot/lilo/
@ 2021-06-06 20:01 Joshua Kinard
0 siblings, 0 replies; 5+ messages in thread
From: Joshua Kinard @ 2021-06-06 20:01 UTC (permalink / raw
To: gentoo-commits
commit: bf9a976299a0277b616aee32caf98f9ab4585428
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 6 20:01:25 2021 +0000
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Sun Jun 6 20:01:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9a9762
sys-boot/lilo: Fix bugs #753608 and #715580
Add QA_FLAGS_IGNORED for '/sbin/lilo' to address Bug #753608 and
Add a small patch to check for '__GLIBC__' before a printf() call
that references it to avoid compilation errors on non-glibc systems
to fix Bug #715580. Also remove the unneeded 'eutils' inherit.
Closes: https://bugs.gentoo.org/753608
Closes: https://bugs.gentoo.org/715580
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Package-Manager: Portage-3.0.19, Repoman-3.0.3
.../lilo/files/lilo-24.x-check-for-__GLIBC__.patch | 18 ++++++++++++++++++
sys-boot/lilo/lilo-24.2.ebuild | 7 ++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch b/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch
new file mode 100644
index 00000000000..be3443629cf
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.x-check-for-__GLIBC__.patch
@@ -0,0 +1,18 @@
+diff -Naurp lilo-24.2.orig/src/lilo.c lilo-24.2/src/lilo.c
+--- lilo-24.2.orig/src/lilo.c 2021-06-06 15:53:52.389730145 -0400
++++ lilo-24.2/src/lilo.c 2021-06-06 15:53:28.309159571 -0400
+@@ -182,7 +182,14 @@ extern int has_partitions_beta(dev_t dev
+ printf("Without");
+ #endif
+ printf(" device-mapper\n");
++#ifdef __GLIBC__
++ /*
++ * __GLIBC__ is defined in features.h, which should be pulled
++ * in by stdio.h, but this is not guaranteed nor apparently
++ * documented anywhere.
++ */
+ printf("\nglibc version %d.%d\n", __GLIBC__, __GLIBC_MINOR__);
++#endif
+ printf("Kernel Headers included from %d.%d.%d\n",
+ LINUX_VERSION_CODE>>16,
+ LINUX_VERSION_CODE>>8 & 255,
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index 5b39c9c32f5..ae703abe60d 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DOLILO_V="0.6"
IUSE="static minimal pxeserial device-mapper"
@@ -24,6 +24,10 @@ KEYWORDS="-* amd64 x86"
DEPEND=">=sys-devel/bin86-0.15.5"
RDEPEND="device-mapper? ( >=sys-fs/lvm2-2.02.45 )"
+# Bootloaders should not be using arbitrary CFLAGS without good reason. A bootloader
+# is typically only executed once to boot the system, and it should work the first time.
+QA_FLAGS_IGNORED="/sbin/lilo"
+
src_prepare() {
default
@@ -34,6 +38,7 @@ src_prepare() {
eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
+ eapply "${FILESDIR}/${PN}-24.x-check-for-__GLIBC__.patch"
# Do not strip and have parallel make
# FIXME: images/Makefile does weird stuff
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-06 20:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-23 14:50 [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/files/, sys-boot/lilo/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2019-06-04 5:27 Andreas K. Hüttel
2020-07-31 4:09 Joshua Kinard
2021-05-23 11:48 David Seifert
2021-06-06 20:01 Joshua Kinard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox