From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46CB1138239 for ; Sun, 6 Jun 2021 20:59:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E33AE088A; Sun, 6 Jun 2021 20:59:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 634E6E088A for ; Sun, 6 Jun 2021 20:59:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A87E335D2C for ; Sun, 6 Jun 2021 20:59:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C08C47 for ; Sun, 6 Jun 2021 20:59:49 +0000 (UTC) From: "Joshua Kinard" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joshua Kinard" Message-ID: <1623013167.41509f2380849f4765727f2d22b048ddfb81a623.kumba@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/, sys-boot/lilo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/lilo/files/lilo.conf sys-boot/lilo/lilo-24.2.ebuild X-VCS-Directories: sys-boot/lilo/files/ sys-boot/lilo/ X-VCS-Committer: kumba X-VCS-Committer-Name: Joshua Kinard X-VCS-Revision: 41509f2380849f4765727f2d22b048ddfb81a623 X-VCS-Branch: master Date: Sun, 6 Jun 2021 20:59:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9bdbe61b-76f7-4c1c-8efb-4603eea18b2c X-Archives-Hash: fecaa1bed2f5c48a6b3c90bce786ef0c commit: 41509f2380849f4765727f2d22b048ddfb81a623 Author: Joshua Kinard gentoo org> AuthorDate: Sun Jun 6 20:59:08 2021 +0000 Commit: Joshua Kinard gentoo org> CommitDate: Sun Jun 6 20:59:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41509f23 sys-boot/lilo: Fix bugs #377427 and #473620 Remove 'keepdir /boot' from src_install to address #377427 and update the example lilo.conf in FILESDIR to reference 'sda' instead of 'hda' (name for older PATA drives) to fix #473620. Closes: https://bugs.gentoo.org/377427 Closes: https://bugs.gentoo.org/473620 Signed-off-by: Joshua Kinard gentoo.org> Package-Manager: Portage-3.0.19, Repoman-3.0.3 sys-boot/lilo/files/lilo.conf | 8 ++++---- sys-boot/lilo/lilo-24.2.ebuild | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys-boot/lilo/files/lilo.conf b/sys-boot/lilo/files/lilo.conf index 3848f779029..a65ae24252d 100644 --- a/sys-boot/lilo/files/lilo.conf +++ b/sys-boot/lilo/files/lilo.conf @@ -12,7 +12,7 @@ lba32 #linear # MBR to install LILO to: -boot = /dev/hda +boot = /dev/sda map = /boot/.map # If you are having problems booting from a hardware raid-array @@ -51,7 +51,7 @@ vga = normal # Linux bootable partition config begins # image = /boot/bzImage - root = /dev/hda3 + root = /dev/sda3 #root = /devices/discs/disc0/part3 label = Gentoo read-only # read-only for checking @@ -62,10 +62,10 @@ image = /boot/bzImage # # DOS bootable partition config begins # -other = /dev/hda1 +other = /dev/sda1 #other = /devices/discs/disc0/part1 label = Windows - table = /dev/hda + table = /dev/sda # # DOS bootable partition config ends # diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild index ae703abe60d..9ae96a087bd 100644 --- a/sys-boot/lilo/lilo-24.2.ebuild +++ b/sys-boot/lilo/lilo-24.2.ebuild @@ -70,7 +70,6 @@ src_compile() { } src_install() { - keepdir /boot emake DESTDIR="${D}" install if use !minimal; then