lilo: update to 24.0

This commit is contained in:
Juergen Daubert 2013-06-13 17:16:20 +02:00
parent b9deffe596
commit c4e383a061
4 changed files with 30 additions and 27 deletions

View File

@ -9,6 +9,7 @@ drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/lilo.conf.5.gz
drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/keytab-lilo.8.gz
-rw-r--r-- root/root usr/man/man8/lilo-uuid-diskid.8.gz
-rw-r--r-- root/root usr/man/man8/lilo.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/keytab-lilo

View File

@ -1,3 +1,3 @@
51b9b9db665d3b8724919e3d46054d12 lilo-23.2.tar.gz
2f1048f46290dd28de8f7255be015e63 lilo-config.patch
03d7090835a5675314082847f1ac7910 lilo-24.0.tar.gz
9b6b9552e3b4923fe1c2ab92b94fbd9c lilo-config.patch
33ffc1bb0b8ff0b67236cd074f14fcf9 lilo.conf

View File

@ -4,7 +4,7 @@
# Depends on: libdevmapper
name=lilo
version=23.2
version=24.0
release=1
source=(http://lilo.alioth.debian.org/ftp/sources/$name-$version.tar.gz \
$name-config.patch lilo.conf)

View File

@ -1,6 +1,6 @@
diff -Nru lilo-23.2.orig/Makefile lilo-23.2/Makefile
--- lilo-23.2.orig/Makefile 2011-04-10 09:21:37.196868818 +0200
+++ lilo-23.2/Makefile 2011-04-10 09:23:54.932024504 +0200
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 @@
#
all: test
@ -9,7 +9,7 @@ diff -Nru lilo-23.2.orig/Makefile lilo-23.2/Makefile
#
# everything above plus the statically linked version
@@ -105,12 +104,8 @@
@@ -104,12 +103,8 @@
#
install: all
$(MAKE) -C src install
@ -22,9 +22,9 @@ diff -Nru lilo-23.2.orig/Makefile lilo-23.2/Makefile
tidy:
$(MAKE) -C src tidy
diff -Nru lilo-23.2.orig/make.vars lilo-23.2/make.vars
--- lilo-23.2.orig/make.vars 2011-04-10 09:21:37.200202030 +0200
+++ lilo-23.2/make.vars 2011-04-10 09:21:51.399684961 +0200
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
@@ -70,14 +70,14 @@
# XL_SECS=n Support for extra large (non-standard) floppies.
@ -42,20 +42,21 @@ diff -Nru lilo-23.2.orig/make.vars lilo-23.2/make.vars
# set the compiler optimization level
OPT=-Os
diff -Nru lilo-23.2.orig/man/Makefile lilo-23.2/man/Makefile
--- lilo-23.2.orig/man/Makefile 2011-04-10 09:21:37.200202030 +0200
+++ lilo-23.2/man/Makefile 2011-04-10 09:21:51.399684961 +0200
@@ -10,7 +10,6 @@
mkdir -p $$DESTDIR$(MAN_DIR)/man8
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 @@
install -m 0644 lilo.8 $$DESTDIR$(MAN_DIR)/man8
- install -m 0644 mkrescue.8 $$DESTDIR$(MAN_DIR)/man8
install -m 0644 lilo.conf.5 $$DESTDIR$(MAN_DIR)/man5
install -m 0644 keytab-lilo.8 $$DESTDIR$(MAN_DIR)/man8
PODFILES := lilo-uuid-diskid lilo liloconfig
MANFILES5 := lilo.conf
-MANFILES8 := keytab-lilo lilo-uuid-diskid lilo liloconfig mkrescue
+MANFILES8 := keytab-lilo lilo-uuid-diskid lilo
diff -Nru lilo-23.2.orig/scripts/Makefile lilo-23.2/scripts/Makefile
--- lilo-23.2.orig/scripts/Makefile 2011-04-10 09:21:37.203535242 +0200
+++ lilo-23.2/scripts/Makefile 2011-04-10 09:35:24.000183413 +0200
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 @@
install:
mkdir -p $$DESTDIR$(USRSBIN_DIR)
@ -64,9 +65,9 @@ diff -Nru lilo-23.2.orig/scripts/Makefile lilo-23.2/scripts/Makefile
install -m 0755 lilo-uuid-diskid $$DESTDIR$(USRSBIN_DIR)
clean:
diff -Nru lilo-23.2.orig/src/Makefile lilo-23.2/src/Makefile
--- lilo-23.2.orig/src/Makefile 2011-04-10 09:21:37.203535242 +0200
+++ lilo-23.2/src/Makefile 2011-04-10 09:21:51.399684961 +0200
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 @@
#
# everything needed to run, just short of installation
@ -76,10 +77,11 @@ diff -Nru lilo-23.2.orig/src/Makefile lilo-23.2/src/Makefile
#
# everything above plus the statically linked version
@@ -245,7 +245,6 @@
@@ -245,8 +245,6 @@
strip lilo
cp lilo $$DESTDIR$(SBIN_DIR)/lilo
strip $$DESTDIR$(SBIN_DIR)/lilo
- [ -x lilo.static ] && strip lilo.static
- cp ../mkrescue $$DESTDIR$(USRSBIN_DIR)/mkrescue
cp ../keytab-lilo.pl $$DESTDIR$(USRSBIN_DIR)/keytab-lilo