From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- sys-boot/lilo/Manifest | 2 +- sys-boot/lilo/lilo-24.2-r1.ebuild | 187 ++++++++++++++++++++++++++++++++++++++ sys-boot/lilo/lilo-24.2.ebuild | 187 -------------------------------------- 3 files changed, 188 insertions(+), 188 deletions(-) create mode 100644 sys-boot/lilo/lilo-24.2-r1.ebuild delete mode 100644 sys-boot/lilo/lilo-24.2.ebuild (limited to 'sys-boot/lilo') diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest index 2ab24009aea3..c3383af809f6 100644 --- a/sys-boot/lilo/Manifest +++ b/sys-boot/lilo/Manifest @@ -5,5 +5,5 @@ AUX lilo-24.x-fix-gcc-10.patch 1020 BLAKE2B d434248d3f4ed4d591ada4d507e5ab804862 AUX lilo.conf 1613 BLAKE2B 0d1f1a67f270e6d0cfac6d6dbdd7468bee3405b455ab20d9095c3f63ffd608323cddcae13550799bb7cc8eb086069c38df65c501b9a3083f01c6b50383d40776 SHA512 27f544fe382f8b126b4bc45a2c60474c0bfd8ddacd7997af67c7263b98ad2eef856b687e9f36232db4cd5625be301a284f208d833aefccd04a01268993007d57 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54 -EBUILD lilo-24.2.ebuild 4436 BLAKE2B f0f5e13abb580b1ad60576fda1de62de89654ae86a34d9e53133eefb923cef0b08cb0a85fd53cfdc7da9abc5bdc299d201ca5470d98b10afaffb2be5158def8e SHA512 63cc9019d65926bd3da1b049b32de35e979e89b382b87249ca7a9e2489bacaa4af9f8b4b1cb77bab148b0381dd164c84da0d8cda99bcf7e95b424538821430b4 +EBUILD lilo-24.2-r1.ebuild 4435 BLAKE2B 3d99bccd1790d3c0713d738620ecd8ca728da6194c68b693e99362329e835a70fdbf98a4bd99a5df45589fff7b65f842ccdadc494d6df6c1f488fe1790822659 SHA512 a0af5d45cdc470cfa9275012567646a99da76df7319e94df0252fe3537cf487fa0cb628615d9d8fa1d5b219d9105de5b0cc7824ed9d7b3536b4d74e6f729615f MISC metadata.xml 475 BLAKE2B e197c079a1bc1a024d6a9a1b1195459bbaeafd92a901d71c1f13f21d9e50d56fa330d40af270c0b6f6242d09efa46e4a2e859731bae18c0f0d7d9babcf2ce94a SHA512 c5928a78231fd60410ee2ff2468bf775f9077cd45d2bd5939ae3e0d92d05fa2bdfabdba362f4ec9e004429243e843a4ae6289be1506c4412a0a29218f2992ea5 diff --git a/sys-boot/lilo/lilo-24.2-r1.ebuild b/sys-boot/lilo/lilo-24.2-r1.ebuild new file mode 100644 index 000000000000..66040236a6d6 --- /dev/null +++ b/sys-boot/lilo/lilo-24.2-r1.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic toolchain-funcs + +DOLILO_V="0.6" +IUSE="static minimal pxeserial device-mapper" + +DESCRIPTION="LInux LOader, the original Linux bootloader" +HOMEPAGE="https://www.joonet.de/lilo/" + +DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" +SRC_URI=" + https://www.joonet.de/lilo/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 )" + +# 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 + + # 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}/${PN}-24.1-novga.patch" + + 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 + 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() { + 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 +# +# 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 + 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 [[ -z "${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/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild deleted file mode 100644 index 9ae96a087bd0..000000000000 --- a/sys-boot/lilo/lilo-24.2.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs - -DOLILO_V="0.6" -IUSE="static minimal pxeserial device-mapper" - -DESCRIPTION="LInux LOader, the original Linux bootloader" -HOMEPAGE="https://www.joonet.de/lilo/" - -DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2" -SRC_URI=" - https://www.joonet.de/lilo/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 )" - -# 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 - - # 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}/${PN}-24.1-novga.patch" - - 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 - 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() { - 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 -# -# 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 - 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 -} -- cgit v1.2.3