[gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/, sys-boot/lilo/files/

[gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/, sys-boot/lilo/files/

[Joshua Kinard]

commit:     41509f2380849f4765727f2d22b048ddfb81a623
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 20:59:08 2021 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> 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 <kumba <AT> 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

[gentoo-commits] repo/gentoo:master commit in: sys-boot/lilo/, sys-boot/lilo/files/

[Joshua Kinard]

commit:     6f94f3741de3665ae7b1d32d52438c52cd366cf0
Author:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 20:50:35 2020 +0000
Commit:     Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 20:51:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f94f374

sys-boot/lilo: EAPI update and gcc-10 fix

Update lilo-24.1's ebuild to EAPI7 and add a patch from Debian to fix
compilation issues with gcc-10.x and up to both lilo-24.1 and lilo-24.2.

Closes: https://bugs.gentoo.org/723262
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Package-Manager: Portage-3.0.9, Repoman-3.0.2

 sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch | 51 ++++++++++++++++++++++++++
 sys-boot/lilo/lilo-24.1.ebuild                 | 10 +++--
 sys-boot/lilo/lilo-24.2.ebuild                 |  1 +
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
new file mode 100644
index 00000000000..c46b9eebdea
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
@@ -0,0 +1,51 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Ryan Finnie <ryan@finnie.org>
+Bug-Debian: https://bugs.debian.org/957490
+Forwarded: no
+
+---
+
+--- a/src/raid.h
++++ b/src/raid.h
+@@ -8,7 +8,7 @@
+  * in the source directory.
+  */
+ 
+-int do_md_install, ndisk, md_bios;
++extern int ndisk, md_bios;
+ 
+ int raid_setup(void);
+ void raid_final(void);
+--- a/src/bsect.c
++++ b/src/bsect.c
+@@ -54,8 +54,6 @@
+ #endif
+ 
+ 
+-int boot_dev_nr;
+-
+ static BOOT_SECTOR bsect,bsect_orig;
+ static MENUTABLE menuparams;
+ static DESCR_SECTORS descrs;
+--- a/src/identify.c
++++ b/src/identify.c
+@@ -19,7 +19,6 @@
+ #include "common.h"
+ #include "cfg.h"
+ 
+-char *identify;
+ static char *opt;
+ static char *first, *dflt;
+ static int idefault;
+--- a/src/raid.c
++++ b/src/raid.c
+@@ -41,7 +41,7 @@
+ static int raid_bios[MAX_RAID+1];
+ static int device;
+ enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED};
+-int do_md_install, ndisk, md_bios;
++int ndisk, md_bios;
+ static char *raid_list[MAX_RAID];
+ static int list_index[MAX_RAID];
+ static int nlist, faulty;

diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild
index aa4787b06c1..4627ce7347c 100644
--- a/sys-boot/lilo/lilo-24.1.ebuild
+++ b/sys-boot/lilo/lilo-24.1.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}/${P}-novga.patch"
+	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

diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index 73f9ea6efbb..66ac79f0314 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 	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"
 
 	# Do not strip and have parallel make
 	# FIXME: images/Makefile does weird stuff