lilo: update to 24.1

This commit is contained in:
Juergen Daubert 2014-10-20 18:22:18 +02:00
parent 9b3e817d28
commit 6fb51360c1
3 changed files with 38 additions and 31 deletions

View File

@ -1,3 +1,3 @@
03d7090835a5675314082847f1ac7910 lilo-24.0.tar.gz
9b6b9552e3b4923fe1c2ab92b94fbd9c lilo-config.patch
66573ba8629209da694131efbe20c5de lilo-24.1.tar.gz
875e43154f21b03f21c375a75863cbf8 lilo-config.patch
33ffc1bb0b8ff0b67236cd074f14fcf9 lilo.conf

View File

@ -1,10 +1,10 @@
# Description: LInux boot LOader
# URL: http://lilo.alioth.debian.org/
# Maintainer: CRUX System Team, core-ports at crux dot nu
# Depends on: libdevmapper
# Depends on: libdevmapper util-linux
name=lilo
version=24.0
version=24.1
release=1
source=(http://lilo.alioth.debian.org/ftp/sources/$name-$version.tar.gz \
$name-config.patch lilo.conf)

View File

@ -1,15 +1,23 @@
diff -Nru lilo-24.0.orig/Makefile lilo-24.0/Makefile
--- lilo-24.0.orig/Makefile 2013-06-12 13:18:34.784566604 +0200
+++ lilo-24.0/Makefile 2013-06-12 13:18:54.080542493 +0200
@@ -38,7 +38,6 @@
diff -Nru lilo-24.1.orig/Makefile lilo-24.1/Makefile
--- lilo-24.1.orig/Makefile 2014-10-19 09:31:10.871906282 +0200
+++ lilo-24.1/Makefile 2014-10-19 09:33:40.570016027 +0200
@@ -12,7 +12,6 @@
#
all: test
$(MAKE) -C src all
make -C src all
- make -C images all
#
# make help
@@ -45,7 +44,6 @@
#
alles: test
$(MAKE) -C src alles
- $(MAKE) -C images all
#
# everything above plus the statically linked version
@@ -104,12 +103,8 @@
# documentation files
@@ -104,12 +102,8 @@
#
install: all
$(MAKE) -C src install
@ -22,9 +30,9 @@ diff -Nru lilo-24.0.orig/Makefile lilo-24.0/Makefile
tidy:
$(MAKE) -C src tidy
diff -Nru lilo-24.0.orig/make.vars lilo-24.0/make.vars
--- lilo-24.0.orig/make.vars 2013-06-12 13:18:34.787899817 +0200
+++ lilo-24.0/make.vars 2013-06-12 13:18:54.080542493 +0200
diff -Nru lilo-24.1.orig/make.vars lilo-24.1/make.vars
--- lilo-24.1.orig/make.vars 2014-10-19 09:31:10.868573065 +0200
+++ lilo-24.1/make.vars 2014-10-19 09:31:38.537607503 +0200
@@ -70,14 +70,14 @@
# XL_SECS=n Support for extra large (non-standard) floppies.
@ -42,10 +50,10 @@ diff -Nru lilo-24.0.orig/make.vars lilo-24.0/make.vars
# set the compiler optimization level
OPT=-Os
diff -Nru lilo-24.0.orig/man/Makefile lilo-24.0/man/Makefile
--- lilo-24.0.orig/man/Makefile 2013-06-12 13:18:34.791233030 +0200
+++ lilo-24.0/man/Makefile 2013-06-12 13:41:18.675519397 +0200
@@ -6,7 +6,7 @@
diff -Nru lilo-24.1.orig/man/Makefile lilo-24.1/man/Makefile
--- lilo-24.1.orig/man/Makefile 2014-10-19 09:31:10.868573065 +0200
+++ lilo-24.1/man/Makefile 2014-10-19 09:31:38.537607503 +0200
@@ -12,7 +12,7 @@
PODFILES := lilo-uuid-diskid lilo liloconfig
MANFILES5 := lilo.conf
@ -54,10 +62,10 @@ diff -Nru lilo-24.0.orig/man/Makefile lilo-24.0/man/Makefile
all:
diff -Nru lilo-24.0.orig/scripts/Makefile lilo-24.0/scripts/Makefile
--- lilo-24.0.orig/scripts/Makefile 2013-06-12 13:18:34.791233030 +0200
+++ lilo-24.0/scripts/Makefile 2013-06-12 13:18:54.080542493 +0200
@@ -8,7 +8,6 @@
diff -Nru lilo-24.1.orig/scripts/Makefile lilo-24.1/scripts/Makefile
--- lilo-24.1.orig/scripts/Makefile 2014-10-19 09:31:10.871906282 +0200
+++ lilo-24.1/scripts/Makefile 2014-10-19 09:31:38.537607503 +0200
@@ -15,7 +15,6 @@
install:
mkdir -p $$DESTDIR$(USRSBIN_DIR)
@ -65,10 +73,10 @@ diff -Nru lilo-24.0.orig/scripts/Makefile lilo-24.0/scripts/Makefile
install -m 0755 lilo-uuid-diskid $$DESTDIR$(USRSBIN_DIR)
clean:
diff -Nru lilo-24.0.orig/src/Makefile lilo-24.0/src/Makefile
--- lilo-24.0.orig/src/Makefile 2013-06-12 13:18:34.784566604 +0200
+++ lilo-24.0/src/Makefile 2013-06-12 13:40:05.981468832 +0200
@@ -48,7 +48,7 @@
diff -Nru lilo-24.1.orig/src/Makefile lilo-24.1/src/Makefile
--- lilo-24.1.orig/src/Makefile 2014-10-19 09:31:10.868573065 +0200
+++ lilo-24.1/src/Makefile 2014-10-19 09:34:59.340601665 +0200
@@ -47,7 +47,7 @@
#
# everything needed to run, just short of installation
#
@ -77,11 +85,10 @@ diff -Nru lilo-24.0.orig/src/Makefile lilo-24.0/src/Makefile
#
# everything above plus the statically linked version
@@ -245,8 +245,6 @@
strip lilo
cp lilo $$DESTDIR$(SBIN_DIR)/lilo
- [ -x lilo.static ] && strip lilo.static
@@ -248,7 +248,6 @@
strip lilo.static; \
cp lilo.static $$DESTDIR$(SBIN_DIR)/lilo.static; \
fi
- cp ../mkrescue $$DESTDIR$(USRSBIN_DIR)/mkrescue
cp ../keytab-lilo.pl $$DESTDIR$(USRSBIN_DIR)/keytab-lilo