From b93c3557c10f6f015879ff04d5619acf12dab285 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 18 Oct 2019 08:56:46 +0200 Subject: [PATCH] sys-boot/systemrescuecd-x86-grub: Remove last-rited pkg MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/683724 Signed-off-by: Michał Górny --- profiles/package.mask | 1 - .../files/systemrescuecd.default | 21 --- .../files/systemrescuecd.default-2 | 33 ---- .../files/systemrescuecd.grub | 64 -------- .../files/systemrescuecd.grub-2 | 146 ------------------ sys-boot/systemrescuecd-x86-grub/metadata.xml | 17 -- .../systemrescuecd-x86-grub-0.1-r1.ebuild | 31 ---- .../systemrescuecd-x86-grub-0.2.ebuild | 31 ---- 8 files changed, 344 deletions(-) delete mode 100644 sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default delete mode 100644 sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2 delete mode 100644 sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub delete mode 100644 sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2 delete mode 100644 sys-boot/systemrescuecd-x86-grub/metadata.xml delete mode 100644 sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild delete mode 100644 sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild diff --git a/profiles/package.mask b/profiles/package.mask index 2593e5437890..f78c8afed392 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -443,7 +443,6 @@ sci-chemistry/azara # provide a publicly accessible bug tracker, and does not reply to mail. # Removal in 30 days. Bug #683724. app-admin/systemrescuecd-x86 -sys-boot/systemrescuecd-x86-grub # Michał Górny (2019-09-16) # Unmaintained. Fails to build. Last release in 2004. EAPI 0. diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default deleted file mode 100644 index d9b2d0b8db7d..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default +++ /dev/null @@ -1,21 +0,0 @@ -# Here you can set custom bootoptions for the SystemRescueCD -# -# You can add for example in a space separated list: -# setkmap=xx: which defines the keymap to load (example: setkmap=de) -# dostartx: load the X.Org graphical environment and launch Xfce -# docache: causes the iso file to be fully loaded into memory -# this requires 400MB of memory to cache everything -# doload=xxx: loads needed kernel modules (example: doload=3c59x,e1000) -# noload=xxx: prevents loading kernel modules -# nomodeset: do not load the Kernel-Mode-Setting video driver -# -# Example: -# SRCD_BOOTOPTIONS="setkmap=de docache dostartx" -# -# For all available bootoptions see: -# http://www.sysresccd.org/Sysresccd-manual-en_Booting_the_CD-ROM -# -# Note: -# After changing this, you must update your grub configuration file, to take effect - -SRCD_BOOTOPTIONS="" diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2 b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2 deleted file mode 100644 index 941622bfc3ba..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.default-2 +++ /dev/null @@ -1,33 +0,0 @@ -# Here you can set custom bootoptions for the SystemRescueCD -# -# For SystemRescueCD version 6.x: -# -# You can add in a space separated list: -# setkmap=xx: set keyboard layout for terminal -# copytoram: load the ISO fully in memory -# requires 2GB of memory to cache the system -# -# For SystemRescueCD version 5.x: -# -# You can add for example in a space separated list: -# setkmap=xx: which defines the keymap to load (example: setkmap=de) -# dostartx: load the X.Org graphical environment and launch Xfce -# docache: causes the iso file to be fully loaded into memory -# this requires 400MB of memory to cache everything -# doload=xxx: loads needed kernel modules (example: doload=3c59x,e1000) -# noload=xxx: prevents loading kernel modules -# nomodeset: do not load the Kernel-Mode-Setting video driver -# -# Example: -# SRCD_BOOTOPTIONS="setkmap=de docache dostartx" -# -# For all available bootoptions see: -# http://www.sysresccd.org/Sysresccd-manual-en_Booting_the_CD-ROM -# -# Note: -# After changing this, you must update your grub configuration file, to take effect - -SRCD_BOOTOPTIONS="" - -# Copy ISO to /boot if there is enough space -#COPY_SRCD_TO_BOOT="yes" diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub deleted file mode 100644 index 269b1eb76adb..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -. /usr/share/grub/grub-mkconfig_lib - -if [ -r /etc/default/systemrescuecd ] ; then - . /etc/default/systemrescuecd -fi - -# srcd = path of newest link to iso of systemrescuecd, created by the ebuild -# of systemrescuecd-x86 -srcd="/usr/share/systemrescuecd/systemrescuecd-x86-newest.iso" - -longname="SystemRescueCD" -bootops=")" - -if [ ! -z "${SRCD_BOOTOPTIONS}" ]; then - bootops=" with bootoptions)" -fi - -if [ -f "${srcd}" ]; then - - device=$(${grub_probe} --target=device "${srcd}") - path=$(make_system_path_relative_to_its_root "${srcd}") - grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab) - - gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2 - onstr=$(gettext_printf "(on %s)" "${device}") - - cat << EOF -submenu "${longname}" --class submenu { - menuentry "${longname} (32bit standard${bootops}" --class rescue { -${grub_string} - set isofile=${path} - loopback loop \${isofile} - linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} - initrd (loop)/isolinux/initram.igz - } - menuentry "${longname} (64bit standard${bootops}" --class rescue { -${grub_string} - set isofile=${path} - loopback loop \${isofile} - linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} - initrd (loop)/isolinux/initram.igz - } - menuentry "${longname} (32bit alternative${bootops}" --class rescue { -${grub_string} - set isofile=${path} - loopback loop \${isofile} - linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} - initrd (loop)/isolinux/initram.igz - } - menuentry "${longname} (64bit alternative${bootops}" --class rescue { -${grub_string} - set isofile=${path} - loopback loop \${isofile} - linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile} - initrd (loop)/isolinux/initram.igz - } -} -EOF - -fi diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2 b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2 deleted file mode 100644 index 332a7c37fce0..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub-2 +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/sh -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -. /usr/share/grub/grub-mkconfig_lib - -if [ -r /etc/default/systemrescuecd ] ; then - . /etc/default/systemrescuecd -fi - -COPY_SRCD_TO_BOOT=${COPY_SRCD_TO_BOOT:-no} - -bootdir="/boot" -installdir="/usr/share/systemrescuecd" - -isorex='^(/.*/)?systemrescuecd-.*[.]iso$' - -# Path of the link to the newest ISO, created by ebuild -srcd="${installdir}/systemrescuecd-x86-newest.iso" - -# Extract ISO version -isovsed() { - sed -E 's|^.*systemrescuecd(-x86)?-||;s|.iso$||' -} - -# Find ISOs in a given directory -isofind() { - find "${1}" -maxdepth 1 -type f -regextype egrep -regex ${isorex} -} - -# Copy ISO to boot partition -copy_srcd_iso() { - if [ ! -f "${bootdir}/"$(basename "${1}") ]; then - if [ $(df -k --output=avail "${bootdir}" | tail -1) -gt $(du -k "${1}" | cut -f 1) ]; then - cp "${1}" "${bootdir}/" - else - # Before complaining, check if the installed ISO is actually newer - if $(printf '%s\n' $(isofind "${bootdir}" | isovsed | sort -V) $(echo "${1}" | isovsed) | sort -VC); then - gettext_printf "Error: Not enough free disk space on ${bootdir}!\n" >&2 - gettext_printf "Error: Failed to copy the new iso!\n" >&2 - fi - fi - fi -} - -write_srcd() { - cat <&2 - if $(printf '%s\n' "6.0.0" $(echo ${iso} | isovsed) | sort -VC); then - write_srcd $(echo ${iso} | isovsed) - else - write_srcd_5 $(echo ${iso} | isovsed) - fi - done - - # End submenu - echo "}" -} - -bootops=")" - -if [ ! -z "${SRCD_BOOTOPTIONS}" ]; then - bootops=" with bootoptions)" -fi - -if [ "${COPY_SRCD_TO_BOOT}" = yes ]; then - srcd=$(realpath "${srcd}") - copy_srcd_iso "${srcd}" -fi - -# Build menu entries -for isopref in "${bootdir}" "${installdir}"; do - # Make sure there are any ISOs - ls "${isopref}" | grep -E -q -e "${isorex}" || continue - - diskuuid=/dev/disk/by-uuid/$(${grub_probe} --target=fs_uuid "${isopref}") - device=$(${grub_probe} --target=device "${isopref}") - label=$(${grub_probe} --target=fs_label "${isopref}") - [ "${label}" = "(null)" ] && label=${device} - grub_string=$(prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab) - longname="SystemRescueCD on ${label}" - - gettext_printf "Found %s on %s\n" "${longname}" "${device}" >&2 - - write_srcd_submenu -done diff --git a/sys-boot/systemrescuecd-x86-grub/metadata.xml b/sys-boot/systemrescuecd-x86-grub/metadata.xml deleted file mode 100644 index 2e146c34fc2e..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - gentoobugs@milaw.biz - Michael Lange - Accepts only mails from Gentoo's Bugzilla - - - mgorny@gentoo.org - Michał Górny - - - This package adds menu entries in GRUB for the SystemRescueCD. You can - add custom bootoptions for SystemRescueCD in a special config file. - - diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild deleted file mode 100644 index 80a820419133..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86" -HOMEPAGE="http://www.sysresccd.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT=0 -KEYWORDS="~amd64 ~x86" - -S=${WORKDIR} - -RDEPEND="app-admin/systemrescuecd-x86 - sys-boot/grub" - -src_install() { - exeinto /etc/grub.d - newexe "${FILESDIR}"/systemrescuecd.grub 39_systemrescuecd - - insinto /etc/default - newins "${FILESDIR}"/systemrescuecd.default systemrescuecd -} - -pkg_postinst() { - elog "To add the menu entries for systemrescuecd to grub, you should now run" - elog " grub-mkconfig -o /boot/grub/grub.cfg" - elog "You can set custom bootoptions in /etc/default/systemrescuecd" -} diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild deleted file mode 100644 index 76daeb7ece15..000000000000 --- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86" -HOMEPAGE="http://www.sysresccd.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT=0 -KEYWORDS="~amd64 ~x86" - -S="${WORKDIR}" - -RDEPEND="app-admin/systemrescuecd-x86 - sys-boot/grub" - -src_install() { - exeinto /etc/grub.d - newexe "${FILESDIR}"/systemrescuecd.grub-2 39_systemrescuecd - - insinto /etc/default - newins "${FILESDIR}"/systemrescuecd.default-2 systemrescuecd -} - -pkg_postinst() { - elog "To add the menu entries for systemrescuecd to grub, you should now run" - elog " grub-mkconfig -o /boot/grub/grub.cfg" - elog "You can set custom bootoptions in /etc/default/systemrescuecd" -} -- 2.26.2