From 47fd68ef024abaeae5964a61640a8e030bc21575 Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Sun, 9 Jun 2013 21:14:56 +0200 Subject: [PATCH] Update all patches --- debian/changelog | 1 + debian/patches/02_lilo-version-debian.patch | 4 +- debian/patches/02_lilo-version-ubuntu.patch | 4 +- debian/patches/04_lilo.8-debian-based.patch | 19 -- debian/patches/07_bad-partition-warn.patch | 6 +- .../patches/09_use-of-newer-debhelper.patch | 3 +- debian/patches/10_fix-src-makefile.patch | 26 +++ .../11_update-lilo-conf-manpage1.patch | 114 ----------- .../12_update-lilo-conf-manpage2.patch | 38 ---- debian/patches/13_lilo-conf-append-info.patch | 66 ------- .../patches/14_update-mkrescue-script.patch | 184 ------------------ .../15_fix-typos-in-lilo-manpage.patch | 52 ----- debian/patches/16_fix-typos-in-user-tex.patch | 33 ---- debian/patches/17_liloconfig-for-linux3.patch | 39 ---- debian/patches/18_do-not-create-pdfs.patch | 62 ------ debian/patches/series | 10 +- debian/patches/ubuntu.series | 10 +- debian/update-lilo | 2 +- 18 files changed, 38 insertions(+), 635 deletions(-) delete mode 100644 debian/patches/04_lilo.8-debian-based.patch create mode 100644 debian/patches/10_fix-src-makefile.patch delete mode 100644 debian/patches/11_update-lilo-conf-manpage1.patch delete mode 100644 debian/patches/12_update-lilo-conf-manpage2.patch delete mode 100644 debian/patches/13_lilo-conf-append-info.patch delete mode 100644 debian/patches/14_update-mkrescue-script.patch delete mode 100644 debian/patches/15_fix-typos-in-lilo-manpage.patch delete mode 100644 debian/patches/16_fix-typos-in-user-tex.patch delete mode 100644 debian/patches/17_liloconfig-for-linux3.patch delete mode 100644 debian/patches/18_do-not-create-pdfs.patch diff --git a/debian/changelog b/debian/changelog index 05513eb..b526078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ lilo (1:24.0-1) unstable; urgency=low - Better support for GPT hard disks. - Support for kernel 3.x series. - Now compatible to gcc 4.8 (and higher). Closes: #701315, #709818 + * Update some patches, remove some patches. -- Joachim Wiedorn Fri, 07 Jun 2013 21:41:34 +0200 diff --git a/debian/patches/02_lilo-version-debian.patch b/debian/patches/02_lilo-version-debian.patch index 437abef..3f6bd8b 100644 --- a/debian/patches/02_lilo-version-debian.patch +++ b/debian/patches/02_lilo-version-debian.patch @@ -2,14 +2,14 @@ Package: lilo Subject: add lilo version for Debian Author: Joachim Wiedorn Forwarded: no -Last-Update: 2011-05-06 +Last-Update: 2013-06-07 --- diff -urN s01/src/crt.S s02/src/crt.S --- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 +++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200 -@@ -694,7 +694,7 @@ +@@ -693,7 +693,7 @@ str_title: diff --git a/debian/patches/02_lilo-version-ubuntu.patch b/debian/patches/02_lilo-version-ubuntu.patch index 197984a..ba8ac39 100644 --- a/debian/patches/02_lilo-version-ubuntu.patch +++ b/debian/patches/02_lilo-version-ubuntu.patch @@ -2,14 +2,14 @@ Package: lilo Subject: add lilo version for Ubuntu Author: Joachim Wiedorn Forwarded: no -Last-Update: 2011-05-06 +Last-Update: 2013-06-07 --- diff -urN s01/src/crt.S s02/src/crt.S --- s01/src/crt.S 2010-11-01 16:32:09.000000000 +0100 +++ s02/src/crt.S 2011-05-06 17:26:25.856704412 +0200 -@@ -694,7 +694,7 @@ +@@ -693,7 +693,7 @@ str_title: diff --git a/debian/patches/04_lilo.8-debian-based.patch b/debian/patches/04_lilo.8-debian-based.patch deleted file mode 100644 index f0fc6dd..0000000 --- a/debian/patches/04_lilo.8-debian-based.patch +++ /dev/null @@ -1,19 +0,0 @@ -Package: lilo -Subject: lilo.8 for Debian-based systems -Author: Joachim Wiedorn -Forwarded: no -Last-Update: 2011-01-28 - ---- - -diff -urN v04/man/lilo.8 v05/man/lilo.8 ---- v04/man/lilo.8 2010-06-28 22:40:35.000000000 +0200 -+++ v05/man/lilo.8 2010-07-03 09:25:47.995224569 +0200 -@@ -490,6 +490,7 @@ - The lilo distribution comes with very extensive TeX documentation through - Version 21. Text file README's in the source directory provide updates on - more recent topics. -+This can be found in /usr/share/doc/lilo-doc/ on Debian-based systems. - .SH "AUTHORS" - Werner Almesberger (versions 0 to 21) - .br diff --git a/debian/patches/07_bad-partition-warn.patch b/debian/patches/07_bad-partition-warn.patch index b2c1166..975bab8 100644 --- a/debian/patches/07_bad-partition-warn.patch +++ b/debian/patches/07_bad-partition-warn.patch @@ -2,15 +2,15 @@ Package: lilo Subject: only warning about bad partition Author: Joachim Wiedorn Forwarded: no -Last-Update: 2010-11-11 +Last-Update: 2013-06-07 --- diff -urN v09/src/partition.c v10/src/partition.c --- v09/src/partition.c 2010-06-19 23:52:05.000000000 +0200 +++ v10/src/partition.c 2010-07-03 09:41:28.687586169 +0200 -@@ -231,11 +231,10 @@ - dos ? " A DOS/Windows/OS2 system may be rendered unbootable." +@@ -226,11 +226,10 @@ + dos ? " A DOS/Windows system may be rendered unbootable." "\n The backup copy of this boot sector should be retained." : "" ); + fprintf (errstd, "I will assume that you know what you're doing and I will proceed.\n"); diff --git a/debian/patches/09_use-of-newer-debhelper.patch b/debian/patches/09_use-of-newer-debhelper.patch index d95ebb9..3e78fa9 100644 --- a/debian/patches/09_use-of-newer-debhelper.patch +++ b/debian/patches/09_use-of-newer-debhelper.patch @@ -39,7 +39,7 @@ diff -urN s08/images/Makefile s09/images/Makefile diff -urN s08/Makefile s09/Makefile --- s08/Makefile 2011-04-09 17:14:05.000000000 +0200 +++ s09/Makefile 2011-05-06 17:45:57.304713832 +0200 -@@ -8,6 +8,14 @@ +@@ -8,6 +8,13 @@ # # @@ -48,7 +48,6 @@ diff -urN s08/Makefile s09/Makefile +all: test + make -C src all + make -C images all -+ make -C doc all + +# # make help diff --git a/debian/patches/10_fix-src-makefile.patch b/debian/patches/10_fix-src-makefile.patch new file mode 100644 index 0000000..b7c87a1 --- /dev/null +++ b/debian/patches/10_fix-src-makefile.patch @@ -0,0 +1,26 @@ +Package: lilo +Subject: 10 fix src makefile +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2013-06-07 + +The newer dash shell do not want "-x" inside an makefile. +In the long version it is running without errors. Now +lilo.static will stored to /sbin/ too. +--- + +diff -urN s09/src/Makefile s10/src/Makefile +--- s09/src/Makefile 2013-06-07 22:46:42.315254388 +0200 ++++ s10/src/Makefile 2013-06-07 22:44:13.000000000 +0200 +@@ -245,7 +245,10 @@ + + strip lilo + cp lilo $$DESTDIR$(SBIN_DIR)/lilo +- [ -x lilo.static ] && strip lilo.static ++ if [ -x lilo.static ]; then \ ++ 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 + diff --git a/debian/patches/11_update-lilo-conf-manpage1.patch b/debian/patches/11_update-lilo-conf-manpage1.patch deleted file mode 100644 index 548001c..0000000 --- a/debian/patches/11_update-lilo-conf-manpage1.patch +++ /dev/null @@ -1,114 +0,0 @@ -Package: lilo -Subject: update and optimize lilo.conf.5 -Author: Joachim Wiedorn -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=629321 -Forwarded: yes -Last-Update: 2011-06-18 - -Update and optimize lilo.conf.5. Remove information about -very old lilo versions. ---- - -diff -urN s10/man/lilo.conf.5 s11/man/lilo.conf.5 ---- s10/man/lilo.conf.5 2011-04-09 16:56:47.000000000 +0200 -+++ s11/man/lilo.conf.5 2011-06-18 16:04:46.916604045 +0200 -@@ -69,22 +69,22 @@ - This configuration file specifies that lilo uses the Master - Boot Record on /dev/hda. (For a discussion of the various ways - to use lilo, and the interaction with other operating systems, --see user.tex from the lilo documentation.) -+see user.pdf from the lilo documentation.) - .LP - When booting, the boot loader will issue its - .I "boot:" --prompt and wait for you to enter the label of the kernel (and any options) --which you wish to boot. At any time you may hit [Tab] to see --a list of kernel/other labels. -+prompt and wait for you to enter the label of the kernel (and any -+options) which you wish to boot. At any time you may hit [Tab] to -+see a list of kernel/other labels. - Alternately, if the \fBmenu\fP boot loader is installed, - a menu of boot options will be presented for your selection. - The title of this menu is overridden with the menu - title specification in this configuration file. --If you enter nothing, --then the default kernel image, the first mentioned, (/boot/zImage-1.5.99) --will be booted after a timeout of 15 seconds (150 deciseconds). --There may be at least 16 images mentioned in lilo.conf. (The exact number depends --upon compilation options.) -+If you enter nothing, then the default kernel image, the first -+mentioned, (in the example /boot/vmlinuz-2.6.29-1-i386) will be -+booted after a timeout of 15 seconds (150 deciseconds). There may -+be at least 16 images mentioned in lilo.conf. (The exact number -+depends upon compilation options.) - .LP - As can be seen above, a configuration file starts with a number - of global options (the top 9 lines in the example), -@@ -95,7 +95,7 @@ - - .SH "GLOBAL OPTIONS" - There are many possible keywords. The description below is --almost literally from user.tex (just slightly abbreviated). -+almost literally from user.pdf (just slightly abbreviated). - .TP - .BI "backup=" - Specifies the location where a copy of any modified boot sector will be -@@ -119,8 +119,8 @@ - as certain RAID installations may benefit from knowing that the - BIOS is 100% reliable. Its use should be considered experimental. - .sp --N.B.: This option may not be retained in releases beyond 22.5.1, and --may be specified on the command line with the '\-Z' switch: yes=1, no=0. -+This option may be specified on the command line with the '\-Z' switch: -+yes=1, no=0. - .TP - .BI "bitmap=" - Specifies use of a 640x480x16 (VGA BIOS) or 640x480x256 (VGA/VESA BIOS) -@@ -138,12 +138,12 @@ - and 'bmp-timer' options together with the 'bitmap' option are stored in - the special LILO header of the bitmap image file by the - .BI "lilo -E" --+command. Another way works without these special header information: All --+the information about 'bmp-colors', 'bmp-table' and 'bmp-timer' options --+together with the 'bitmap' option are stored in the configuration file. --+Any use of the 'bmp-' options within the configuration file overrides --+the options stored in the bitmap file header. If lilo cannot find any of --+the 'bmp-' options, then default values are used. -+command. Another way works without these special header information: All -+the information about 'bmp-colors', 'bmp-table' and 'bmp-timer' options -+together with the 'bitmap' option are stored in the configuration file. -+Any use of the 'bmp-' options within the configuration file overrides -+the options stored in the bitmap file header. If lilo cannot find any of -+the 'bmp-' options, then default values are used. - .TP - .BI "bmp-colors=" ,,,,, - Specifies the decimal values of the colors to be used for the menu display -@@ -189,9 +189,7 @@ - from (and possibly written to) the device that is currently mounted as root. - .sp - A raid installation is initiated by specifying a RAID1 device as the boot --device; e.g., "boot=/dev/md0". Note that LILO version 22.0 and later --operate differently from earlier versions with respect to the actual --location of the boot records. -+device; e.g., "boot=/dev/md0". - .sp - On newer systems you need an unique ID for the boot device. If the boot - sector should write to a partition you can use its UUID in the same manner -@@ -230,7 +228,7 @@ - are used in a - .I change - section (see below), with the suffixes "_normal" or "_hidden" appended. --See section "Partition type change rules" of user.tex for more details. -+See section "Partition type change rules" of user.pdf for more details. - .TP - .BI "compact" - Tries to merge read requests for adjacent sectors into a single -@@ -260,7 +258,7 @@ - .TP - .BI "disk=" - Defines non-standard parameters for the specified disk. --See section "Disk geometry" of user.tex for details. -+See section "Disk geometry" of user.pdf for details. - For versions of LILO prior to 22.5, the `bios=' parameter - is quite useful for specifying how the BIOS has assigned - device codes to your disks. diff --git a/debian/patches/12_update-lilo-conf-manpage2.patch b/debian/patches/12_update-lilo-conf-manpage2.patch deleted file mode 100644 index 3a22383..0000000 --- a/debian/patches/12_update-lilo-conf-manpage2.patch +++ /dev/null @@ -1,38 +0,0 @@ -Package: lilo -Subject: optimize infos in lilo.conf.5 -Author: Joachim Wiedorn -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=283281 -Forwarded: yes -Last-Update: 2011-06-18 - -Optimize infos about "boot=" and "root=" option in lilo.conf.5. ---- - -diff -urN s11/man/lilo.conf.5 s12/man/lilo.conf.5 ---- s11/man/lilo.conf.5 2011-06-18 16:04:46.916604045 +0200 -+++ s12/man/lilo.conf.5 2011-06-18 16:07:05.112620983 +0200 -@@ -184,9 +184,9 @@ - display entirely. - .TP - .BI "boot=" --Sets the name of the device (e.g. a hard disk partition) that contains --the boot sector. If this keyword is omitted, the boot sector is read --from (and possibly written to) the device that is currently mounted as root. -+Sets the name of the device (e.g. hard disk or partition) that contains -+the boot sector and where the new boot sector should be written to. Notice: -+The boot-device should be the device with the currently mounted root partition. - .sp - A raid installation is initiated by specifying a RAID1 device as the boot - device; e.g., "boot=/dev/md0". -@@ -767,9 +767,8 @@ - is used, the root device is set to the device on which the root file - system is currently mounted. If the root has been changed with \-r , - the respective device is used. If the variable `root' is omitted, --the root device setting contained in the kernel image is used. --(And that is set at compile time using the ROOT_DEV variable in --the kernel Makefile, and can later be changed with the rdev(8) program.) -+the root device setting contained in the running kernel image is used. -+Warning: This can induce to an unbootable system! - .sp - The root filesystem may also be specified by a - .B LABEL= diff --git a/debian/patches/13_lilo-conf-append-info.patch b/debian/patches/13_lilo-conf-append-info.patch deleted file mode 100644 index abde3c0..0000000 --- a/debian/patches/13_lilo-conf-append-info.patch +++ /dev/null @@ -1,66 +0,0 @@ -Package: lilo -Subject: add info in lilo.conf.5 about append options -Author: Joachim Wiedorn -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=368133 -Forwarded: yes -Last-Update: 2011-06-18 - -Add some infos for right usage of "append=" and "addappend=" option -in lilo.conf.5. ---- - -diff -urN s12/man/lilo.conf.5 s13/man/lilo.conf.5 ---- s12/man/lilo.conf.5 2011-06-18 16:07:05.112620983 +0200 -+++ s13/man/lilo.conf.5 2011-06-18 16:32:15.389514340 +0200 -@@ -705,17 +705,26 @@ - command line parameters to this kernel. - .TP - .BI "addappend=" --(22.6) The kernel parameters from the specified string, are concatenated to the -+The kernel parameters of this string are concatenated to the - parameter(s) from an - .B "append=" --specification (see below). --The string must be enclosed within double quotes. Usually, the previous -+option (see below). -+The string of addappend must be enclosed within double quotes. -+Usually, the previous - .B "append=" --will specify parameters common to all kernels by appearing in the top, --or global, section of the configuration file and -+will set parameters common to all kernels by appearing in the global -+section of the configuration file and - .B "addappend=" - will be used to add local parameter(s) to an individual image. --Addappend= may be used only once per "image=" section. -+The addappend option may be used only once per "image=" section. -+.sp -+If the string is a very long line, this line can be divided -+in more lines using "\\" as last character of a line, e.g. -+.sp -+.nf -+ addappend="noapic acpi=off pci=usepirqmask \\ -+ pnpbios=off pnpacpi=off noisapnp" -+.fi - .TP - .BI "append=" - Appends the options specified to the parameter line passed to the kernel. -@@ -724,14 +733,16 @@ - kernel parameters are separated by a blank space, and the string must be - enclosed in double quotes. A local append= appearing withing an image= - section overrides any --global append= appearing in the top section of the configuration file. --Append= may be used only once per "image=" -+global append= appearing in the global section of the configuration file. -+The append option may be used only once per "image=" - section. To concatenate parameter strings, use "addappend=". Example: - .sp - .nf - append="mem=96M hd=576,64,32 console=ttyS1,9600" - .fi - .sp -+If the string is a very long line, this line can be divided in more lines -+using "\\" as last character of a line. See example of addappend option. - .TP - .BI "initrd=" - Specifies the initial ramdisk image to be loaded with the kernel. The diff --git a/debian/patches/14_update-mkrescue-script.patch b/debian/patches/14_update-mkrescue-script.patch deleted file mode 100644 index 5f7ad43..0000000 --- a/debian/patches/14_update-mkrescue-script.patch +++ /dev/null @@ -1,184 +0,0 @@ -Package: lilo -Subject: update mkrescue script -Author: Joachim Wiedorn -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627120 -Forwarded: yes -Last-Update: 2011-06-18 - -The last small change of mkrescue were incomplete. The script don't -run successfully. Now I have made a larger update of this old script. -Changes of needed tools: genisoimage instead of mkisofs, wodim as -other tool for cdrecord. ---- - -diff -urN s13/mkrescue s14/mkrescue ---- s13/mkrescue 2011-04-09 17:05:16.000000000 +0200 -+++ s14/mkrescue 2011-06-18 23:29:51.000000000 +0200 -@@ -1,39 +1,35 @@ - #!/bin/bash - # --# mkrescue --# --# 30-Oct-2001 original version 1.0 --# --# Revision history: --# 09-Apr-2002 John Coffman modify for lilo 22.3 1.1 --# 09-Jun-2002 John Coffman get keyboard translation table 1.2 --# (suggested by Qing Liu) --# 07-May-2003 John Coffman add nowarn for lilo 22.5.2 1.3 --# 13-May-2003 John Coffman use default image, add append= 1.4 --# 24-May-2003 John Coffman specify ext2 params for xtra space --# 26-May-2003 John Coffman el-torito-bootable-CD 2.1 --# 30-May-2003 " add lilo version check 2.1 --# 07-Jul-2003 " determine loopback dynamically 2.3 --# 29-Aug-2004 " allow --root LABEL=lblname 2.4 --# 01-Sep-2004 " fix check for LILO version 2.4 --# 03-Oct-2004 " get root= from /etc/fstab 2.5 --# 15-Nov-2004 " support --iso --size HD 3.0 --# 18-Aug-2005 " applied temp-file security patch 3.1 --# 25-Sep-2005 " log config file on --debug 3.2 --# 04-Oct-2005 " new 'master' determination 3.2 --# 07-Oct-2005 " add -v0 -w to usages of -I 3.2 -+# mkrescue - create a boot floppy or cd image with the current kernel - # -+# Copyright 2001-2005 John Coffman -+# Copyright 2010-2011 Joachim Wiedorn -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+# MA 02110-1301, USA. - - debug=false - #debug=true - - # set the version number on this command --version=3.2 -+version=3.8 - - # set the version of LILO required to run - major=22 --minor=6 --revision=1 -+minor=8 -+revision=0 - - log=$(pwd)/mkrescue.log - clog=$(pwd)/mkrescue.conf.log -@@ -50,32 +46,29 @@ - [--root ] [--nocompact] [--noformat] - [--iso] [--size 1440|1200|2880|HD] - -- --device is the floppy drive; e.g., /dev/fd0 -- --fast specifies creation using a loopback device, which may be faster -- --fs is the filesystem to make on the device; e.g., ext2 -- --help prints this helpfile -- --iso create a bootable ISO image to burn to a CD-R or CD-RW -- --keymap is the keyboard translation table; default to same as lilo.conf -+ --device is the floppy drive; e.g., /dev/fd0 -+ --fast specifies creation using a loopback device, which may be faster -+ --fs is the filesystem to make on the device; e.g., ext2 -+ --help prints this helpfile -+ --iso create a bootable ISO image to burn to a CD-R or CD-RW -+ --keymap is the keyboard translation table; default to same as lilo.conf - --noformat bypasses creation of a new filesystem on device - --nocompact omits lilo map file compaction -- --size is assumed to be 1440 (1.44M), unless 1200 or 2880 is specified -- HD may be specified for ISO images -- --image specifies the label of the kernel/initrd if not the default -- --install text is the default for floppies, menu for ISO images -- --initrd and --kernel are the initial ramdisk & kernel files -- --append is a string used to specify kernel options -- --root is the root filesystem for the boot floppy; e.g., current -+ --size is assumed to be 1440 (1.44M), unless 1200 or 2880 is specified -+ HD may be specified for ISO images -+ --image specifies the label of the kernel/initrd if not the default -+ --install 'text' is the default for floppies, 'menu' for ISO images -+ --initrd and --kernel are the initial ramdisk & kernel files -+ --append is a string used to specify kernel options -+ --root is the root filesystem for the boot floppy; e.g., current - --version prints the version number of `basename $0` -+ --debug provide verbose output and pausing after defined steps - - Used without any arguments, `basename $0` will use the default kernel in - /etc/lilo.conf, the companion initrd (if any), and the specified root - filesystem to make a bootable rescue floppy. - - EOF --# --# --install & --debug are undocumented above --# --# - exit $1 - } - -@@ -96,11 +89,9 @@ - compact=-c - device=/dev/fd0 - fs=ext2 --tmpbase="`mktemp -dt $(basename $0).XXXXXXXXXX`" || exit --if [ "$debug" != true ]; then -- trap 'rm -rf -- "$tmpbase"' EXIT -- trap 'trap - EXIT; rm -rf -- "$tmpbase"; exit 1' HUP INT QUIT TERM --fi -+tmpbase="`mktemp -dt $(basename $0).XXXXXXXXXX`" || { -+ echo "Could not create temporary directory."; exit 1 -+} - mount="$tmpbase/mkrescue-flp" - mfile="$tmpbase/mkrescue-emu" - mtemp="$tmpbase/mkrescue-tmp" -@@ -191,11 +182,6 @@ - rm -rf $mount/* - > $mfile - --mkdir $tmpbase || { -- echo "Could not create temporary directory." -- exit 1 --} -- - master=`mount | grep " / " | cut -d " " -f 1` - master=`echo $master | sed "s/part[0-9]*$/disc/"` - master=`echo $master | sed "s/[0-9]*$//"` -@@ -674,7 +660,8 @@ - fi - - if [ $isoimage = yes ]; then -- echo MKISOFS -+ echo START MakeISOFS: -+ echo - out=$device - opt= - if [ $size = $hdsize ]; then -@@ -683,18 +670,19 @@ - opt=-hard-disk-boot - fi - mv $mfile $mount/boot.bin -- mkisofs $opt -J -R -T \ -+ genisoimage $opt -J -R -T \ - -V LILO_BOOT -A "Linux Boot CD created by LILO mkrescue" \ - -b boot.bin -c boot.cat -o $out $mount - cat <] [dev=] $device -+ wodim [] [dev=] $device - - EOF - elif [ "$fast" = fast ]; then diff --git a/debian/patches/15_fix-typos-in-lilo-manpage.patch b/debian/patches/15_fix-typos-in-lilo-manpage.patch deleted file mode 100644 index 0a9325c..0000000 --- a/debian/patches/15_fix-typos-in-lilo-manpage.patch +++ /dev/null @@ -1,52 +0,0 @@ -Package: lilo -Subject: fix typos in lilo manpage -Author: Joachim Wiedorn -Forwarded: yes -Last-Update: 2012-03-03 - -Usually extended partitions can not directly be used. -Here it means logical partitions. ---- - -diff -urN s14/man/lilo.8 s15/man/lilo.8 ---- s14/man/lilo.8 2011-06-18 14:22:53.104617863 +0200 -+++ s15/man/lilo.8 2012-03-03 19:11:05.797177106 +0100 -@@ -84,14 +84,14 @@ - the Extended Master Boot Loader is present on the Master Boot Record - of the device - (see the \fI-M\fP option), any partition may be made active. Whether the --actual OS in the partition will boot from an extended partition depends on --the characteristics of the OS. LILO boot records for Linux --may be booted from an extended partition. -+actual OS in the partition will boot from a logical partition depends on -+the characteristics of the OS. LILO boot records for Linux may be booted -+from a logical partition. - .TP - .BI "\-\^b " bootdev - Specify the boot device; i.e., where the boot loader will be installed. - "\-b /dev/hda" specifies the Master Boot Record; "\-b /dev/sdb5" specifies --the first extended partition on the second SCSI disk. -+the first logical partition on the second SATA disk. - .TP - .BI "\-\^B " bitmap-file - Specify a bitmap file for the boot-time graphics screen, preferably one -@@ -176,8 +176,8 @@ - .TP - .BI "\-\^L" - Generate 32-bit Logical Block Addresses instead of cylinder/head/sector --addresses, allowing --access to all partitions on disks with more than 1024 cylinders. -+addresses, allowing access to all partitions on disks with more than 1024 -+cylinders. - .TP - .BI "\-\^m " map-file - Use specified map file instead of the default. -@@ -204,7 +204,7 @@ - .B """""" - in the configuration file. - .TP --.BI "\-\^P " "{fix|ignore|\}" -+.BI "\-\^P " "{fix|ignore|}" - Fix or ignore `corrupt' partition tables, i.e., partition tables - with linear and cylinder/head/sector addresses that do not correspond. - Always try diff --git a/debian/patches/16_fix-typos-in-user-tex.patch b/debian/patches/16_fix-typos-in-user-tex.patch deleted file mode 100644 index 8331950..0000000 --- a/debian/patches/16_fix-typos-in-user-tex.patch +++ /dev/null @@ -1,33 +0,0 @@ -Package: lilo -Subject: fix typos in user tex -Author: Joachim Wiedorn -Forwarded: yes -Last-Update: 2012-03-04 - -EBDA means Extended BIOS Data Area. So EDBA is the false string. ---- - -diff -urN s15/doc/user.tex s16/doc/user.tex ---- s15/doc/user.tex 2010-11-02 00:30:01.000000000 +0100 -+++ s16/doc/user.tex 2012-03-04 00:32:14.853171226 +0100 -@@ -2824,9 +2824,9 @@ - \item[\raw{IGNORECASE}] Makes image name matching case-insensitive, i.e. - ``linux'' and ``Linux'' are identical. This option is enabled by - default. Note that password matching is always case-sensitive. -- \item[\raw{LARGE\_EDBA}] Loads \LILO\ at a lower address in order to -+ \item[\raw{LARGE\_EBDA}] Loads \LILO\ at a lower address in order to - leave more space for the EBDA (Extended BIOS Data Area). This is -- necessary on some recent MP systems. Note that enabling \raw{LARGE\_EDBA} -+ necessary on some recent MP systems. Note that enabling \raw{LARGE\_EBDA} - reduces the maximum size of ``small'' images (e.g. ``Image'' or - ``zImage''). - \item[\raw{NO1STDIAG}] Do not generate diagnostics on read errors in the -@@ -3181,7 +3181,7 @@ - \item[\raw{Kernel \meta{name} is too big}]~\\ - The kernel image (without the setup - code) is bigger than 512 kbytes (or 448 kbytes, if built with -- \raw{LARGE\_EDBA}). \LILO\ would overwrite itself when trying -+ \raw{LARGE\_EBDA}). \LILO\ would overwrite itself when trying - to load such a kernel. This limitation only applies to old kernels which - are loaded below 0x10000 (e.g. ``Image'' or ``zImage''). Try building the - kernel with ``bzImage''. If this is undesirable for some reason, try diff --git a/debian/patches/17_liloconfig-for-linux3.patch b/debian/patches/17_liloconfig-for-linux3.patch deleted file mode 100644 index 17d428f..0000000 --- a/debian/patches/17_liloconfig-for-linux3.patch +++ /dev/null @@ -1,39 +0,0 @@ -Package: lilo -Subject: liloconfig for linux 3.x -Author: Joachim Wiedorn -Forwarded: yes -Last-Update: 2012-04-15 - -Add support for linux 3.x in script liloconfig. ---- - -diff -urN s16/scripts/liloconfig s17/scripts/liloconfig ---- s16/scripts/liloconfig 2011-04-09 17:08:01.000000000 +0200 -+++ s17/scripts/liloconfig 2012-04-15 10:18:15.936797140 +0200 -@@ -2,7 +2,7 @@ - - # liloconfig - creating a new lilo.conf file - # --# Copyright 2011 Joachim Wiedorn -+# Copyright 2011-2012 Joachim Wiedorn - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -52,7 +52,7 @@ - our $idpath = "/dev/disk/by-id"; - our $uuidpath = "/dev/disk/by-uuid"; - our $lblpath = "/dev/disk/by-label"; --our $template = "/etc/lilo.conf_example"; -+our $template = "/usr/share/doc/lilo/examples/lilo.example.conf.gz"; - - our $rootpart; # found root part - our $root_dev; # /dev/hdX9, /dev/sdX9, /dev/md/* -@@ -456,7 +456,7 @@ - my $nr2; - - # search for kernel image files -- my @vmlinuz = readpipe("/bin/ls -t -1 /boot/vmlinuz-2* 2>/dev/null"); -+ my @vmlinuz = readpipe("/bin/ls -t -1 /boot/vmlinuz-* 2>/dev/null"); - - # append to new lilo.conf - open(MYFH_NEW, ">> $liloconfnew") or die "Cannot open file: $!"; diff --git a/debian/patches/18_do-not-create-pdfs.patch b/debian/patches/18_do-not-create-pdfs.patch deleted file mode 100644 index d639c74..0000000 --- a/debian/patches/18_do-not-create-pdfs.patch +++ /dev/null @@ -1,62 +0,0 @@ -Package: lilo -Subject: do not create pdf documentation -Author: Joachim Wiedorn -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666320 -Forwarded: no -Last-Update: 2012-04-15 - -Because of changes in texlive packages creating pdf files -fails. But the better way is now using html documentation. ---- - -diff -urN s17/Makefile s18/Makefile ---- s17/Makefile 2011-06-18 14:23:13.296616033 +0200 -+++ s18/Makefile 2012-04-14 22:49:58.597260377 +0200 -@@ -13,7 +13,7 @@ - all: test - make -C src all - make -C images all -- make -C doc all -+ #make -C doc all - - # - # make help -diff -urN s17/man/lilo.conf.5 s18/man/lilo.conf.5 ---- s17/man/lilo.conf.5 2011-06-18 18:18:41.764608846 +0200 -+++ s18/man/lilo.conf.5 2012-04-14 22:51:23.020479500 +0200 -@@ -69,7 +69,7 @@ - This configuration file specifies that lilo uses the Master - Boot Record on /dev/hda. (For a discussion of the various ways - to use lilo, and the interaction with other operating systems, --see user.pdf from the lilo documentation.) -+see user.pdf / user.html from the lilo documentation.) - .LP - When booting, the boot loader will issue its - .I "boot:" -@@ -95,7 +95,7 @@ - - .SH "GLOBAL OPTIONS" - There are many possible keywords. The description below is --almost literally from user.pdf (just slightly abbreviated). -+almost literally from user.pdf / user.html (just slightly abbreviated). - .TP - .BI "backup=" - Specifies the location where a copy of any modified boot sector will be -@@ -228,7 +228,7 @@ - are used in a - .I change - section (see below), with the suffixes "_normal" or "_hidden" appended. --See section "Partition type change rules" of user.pdf for more details. -+See section "Partition type change rules" of user.pdf / user.html for more details. - .TP - .BI "compact" - Tries to merge read requests for adjacent sectors into a single -@@ -258,7 +258,7 @@ - .TP - .BI "disk=" - Defines non-standard parameters for the specified disk. --See section "Disk geometry" of user.pdf for details. -+See section "Disk geometry" of user.pdf / user.html for details. - For versions of LILO prior to 22.5, the `bios=' parameter - is quite useful for specifying how the BIOS has assigned - device codes to your disks. diff --git a/debian/patches/series b/debian/patches/series index dd2c824..67043c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,17 +1,9 @@ 01_makefile-adds.patch 02_lilo-version-debian.patch 03_keytab-lilo.8-debian-based.patch -04_lilo.8-debian-based.patch 05_readme.disk-change.patch 06_notinteractive.patch 07_bad-partition-warn.patch 08_install-also-dat-files.patch 09_use-of-newer-debhelper.patch -11_update-lilo-conf-manpage1.patch -12_update-lilo-conf-manpage2.patch -13_lilo-conf-append-info.patch -14_update-mkrescue-script.patch -15_fix-typos-in-lilo-manpage.patch -16_fix-typos-in-user-tex.patch -17_liloconfig-for-linux3.patch -18_do-not-create-pdfs.patch +10_fix-src-makefile.patch diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series index e21bfeb..7e09052 100644 --- a/debian/patches/ubuntu.series +++ b/debian/patches/ubuntu.series @@ -1,17 +1,9 @@ 01_makefile-adds.patch 02_lilo-version-ubuntu.patch 03_keytab-lilo.8-debian-based.patch -04_lilo.8-debian-based.patch 05_readme.disk-change.patch 06_notinteractive.patch 07_bad-partition-warn.patch 08_install-also-dat-files.patch 09_use-of-newer-debhelper.patch -11_update-lilo-conf-manpage1.patch -12_update-lilo-conf-manpage2.patch -13_lilo-conf-append-info.patch -14_update-mkrescue-script.patch -15_fix-typos-in-lilo-manpage.patch -16_fix-typos-in-user-tex.patch -17_liloconfig-for-linux3.patch -18_do-not-create-pdfs.patch +10_fix-src-makefile.patch diff --git a/debian/update-lilo b/debian/update-lilo index 0f1351a..4b9597a 100644 --- a/debian/update-lilo +++ b/debian/update-lilo @@ -2,7 +2,7 @@ # update-lilo - execute lilo in special debconf mode # -# Copyright 2010-2012 Joachim Wiedorn +# Copyright 2010-2013 Joachim Wiedorn # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- 2.39.2