From 099a27a2d19db01f926dc793b29ece7bd3e87d92 Mon Sep 17 00:00:00 2001 From: Joachim Wiedorn Date: Fri, 19 Nov 2010 16:30:11 +0100 Subject: [PATCH] Add (new) patches for use in Debian --- debian/changelog | 3 + debian/patches/01_makefile-adds.patch | 32 +++++++++ debian/patches/02_lilo-version-debian.patch | 39 +++++++++++ debian/patches/03_keytab-lilo.8-debian.patch | 19 +++++ debian/patches/04_lilo.8-for-debian.patch | 19 +++++ debian/patches/05_readme.disk-change.patch | 24 +++++++ debian/patches/06_notinteractive.patch | 22 ++++++ debian/patches/07_bad-partition-warn.patch | 24 +++++++ .../patches/08_install-also-dat-files.patch | 35 ++++++++++ .../patches/09_use-of-newer-debhelper.patch | 70 +++++++++++++++++++ debian/patches/series | 9 +++ 11 files changed, 296 insertions(+) create mode 100644 debian/patches/01_makefile-adds.patch create mode 100644 debian/patches/02_lilo-version-debian.patch create mode 100644 debian/patches/03_keytab-lilo.8-debian.patch create mode 100644 debian/patches/04_lilo.8-for-debian.patch create mode 100644 debian/patches/05_readme.disk-change.patch create mode 100644 debian/patches/06_notinteractive.patch create mode 100644 debian/patches/07_bad-partition-warn.patch create mode 100644 debian/patches/08_install-also-dat-files.patch create mode 100644 debian/patches/09_use-of-newer-debhelper.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 78ed92d..2568677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,9 @@ lilo (1:23.1-1) unstable; urgency=low * Add link creation for menu background sarge.bmp and sid.bmp for compatibility in file debian/lilo.postinst. * Remove hook scripts for kernel and initramfs and use upstream scripts. + * debian/patches: + - Add new patches for Debian. + - Add patches for simple rules using dh 7. -- Joachim Wiedorn Thu, 18 Nov 2010 20:32:02 +0100 diff --git a/debian/patches/01_makefile-adds.patch b/debian/patches/01_makefile-adds.patch new file mode 100644 index 0000000..eb45576 --- /dev/null +++ b/debian/patches/01_makefile-adds.patch @@ -0,0 +1,32 @@ +Package: lilo +Subject: add autoauto and diag1.img to makefile +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-11 + +--- + +diff -urN s00/make.vars s01/make.vars +--- s00/make.vars 2010-06-28 22:47:31.000000000 +0200 ++++ s01/make.vars 2010-11-04 23:15:56.367070520 +0100 +@@ -65,7 +65,7 @@ + + CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \ + -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \ +- -DMDPRAID -DDEVMAPPER ++ -DMDPRAID -DDEVMAPPER -DAUTOAUTO + + # set the following if you wish LILO.COM to be installed + DOS_DIR=/dosC/boot +diff -urN s00/src/Makefile s01/src/Makefile +--- s00/src/Makefile 2010-11-04 16:35:52.000000000 +0100 ++++ s01/src/Makefile 2010-11-04 23:15:50.831064767 +0100 +@@ -41,7 +41,7 @@ + # + # everything needed to run, just short of installation + # +-all: lilo bootsect.b ++all: lilo bootsect.b diag1.img + + # + # everything above plus the statically linked version diff --git a/debian/patches/02_lilo-version-debian.patch b/debian/patches/02_lilo-version-debian.patch new file mode 100644 index 0000000..4a6b406 --- /dev/null +++ b/debian/patches/02_lilo-version-debian.patch @@ -0,0 +1,39 @@ +Package: lilo +Subject: add lilo version for Debian +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-13 + +--- + +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 2010-11-05 00:30:35.183058179 +0100 +@@ -694,7 +694,7 @@ + + + str_title: +- .ascii "GNU/Linux - " ++ .ascii "Debian - " + .ascii "LILO " + #ifdef LCF_VERSION + .ascii SA(VERSION_MAJOR) +diff -urN s01/src/lilo.c s02/src/lilo.c +--- s01/src/lilo.c 2010-06-28 23:29:23.000000000 +0200 ++++ s02/src/lilo.c 2010-11-05 00:29:44.219065803 +0100 +@@ -819,6 +819,7 @@ + printf("LILO version %d.%d%s%s", VERSION_MAJOR, VERSION_MINOR, + VERSION_EDIT, test ? " (test mode)" : ""); + if (version && verbose<=0) { ++ printf (" (Debian GNU/Linux)"); + printf("\n"); + return 0; + } +@@ -843,6 +844,7 @@ + } + #endif + } ++ printf ("Debian GNU/Linux\n"); + printf("\n"); + if (version) { + if (verbose>=2) configuration(); diff --git a/debian/patches/03_keytab-lilo.8-debian.patch b/debian/patches/03_keytab-lilo.8-debian.patch new file mode 100644 index 0000000..57f1b3f --- /dev/null +++ b/debian/patches/03_keytab-lilo.8-debian.patch @@ -0,0 +1,19 @@ +Package: lilo +Subject: keytab-lilo.8 for Debian +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-11 + +--- + +diff -urN v03/man/keytab-lilo.8 v04/man/keytab-lilo.8 +--- v03/man/keytab-lilo.8 2010-06-28 22:41:18.000000000 +0200 ++++ v04/man/keytab-lilo.8 2010-07-03 09:21:19.560354947 +0200 +@@ -100,3 +100,7 @@ + .BR lilo (8), + .BR keytables (5), + .BR gzip (1) ++ ++.B lilo ++comes with extensive documentation which can be found in ++/usr/share/doc/lilo/ on Debian systems. diff --git a/debian/patches/04_lilo.8-for-debian.patch b/debian/patches/04_lilo.8-for-debian.patch new file mode 100644 index 0000000..b9fe990 --- /dev/null +++ b/debian/patches/04_lilo.8-for-debian.patch @@ -0,0 +1,19 @@ +Package: lilo +Subject: lilo.8 for Debian +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-11 + +--- + +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 on Debian systems. + .SH "AUTHORS" + Werner Almesberger (versions 0 to 21) + .br diff --git a/debian/patches/05_readme.disk-change.patch b/debian/patches/05_readme.disk-change.patch new file mode 100644 index 0000000..9b10c57 --- /dev/null +++ b/debian/patches/05_readme.disk-change.patch @@ -0,0 +1,24 @@ +Package: lilo +Subject: readme.disk for Debian based systems +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-11 + +--- + +diff -urN v06/readme/README.disk v07/readme/README.disk +--- v06/readme/README.disk 2001-01-04 06:04:37.000000000 +0100 ++++ v07/readme/README.disk 2010-07-03 09:32:51.596354341 +0200 +@@ -7,9 +7,9 @@ + + Creating the floppy + =================== +-Change into the LILO source code directory. Insert a formatted floppy +-disk into the A: drive (/dev/fd0). Type the command "make floppy". +-After the files have assembled, the bootable floppy disk will be created. ++Change into the /usr/lib/lilo directory. Insert a formatted floppy ++disk into the A: drive (/dev/fd0). Type the command "make -f Makefile". ++A bootable floppy disk will be created. + + Running the diagnostic + ====================== diff --git a/debian/patches/06_notinteractive.patch b/debian/patches/06_notinteractive.patch new file mode 100644 index 0000000..d10d095 --- /dev/null +++ b/debian/patches/06_notinteractive.patch @@ -0,0 +1,22 @@ +Package: lilo +Subject: notinteractive for debian +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-11 + +--- + +diff -urN v08/src/device.c v09/src/device.c +--- v08/src/device.c 2010-07-03 09:36:00.637903317 +0200 ++++ v09/src/device.c 2010-07-03 09:37:44.660354270 +0200 +@@ -847,7 +847,9 @@ + "This caution does not apply to Windows 95 or 98, or to NT data disks.\n" + , vm->name, MAJOR(dev), MINOR(dev), dev); + +- ++ if (test) ++ return 0; ++ + ret = yesno("\nIs the above disk an NT boot disk? ", 1); + + if (ret && fatal) { diff --git a/debian/patches/07_bad-partition-warn.patch b/debian/patches/07_bad-partition-warn.patch new file mode 100644 index 0000000..b2c1166 --- /dev/null +++ b/debian/patches/07_bad-partition-warn.patch @@ -0,0 +1,24 @@ +Package: lilo +Subject: only warning about bad partition +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-11 + +--- + +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." + "\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"); + #if 0 + if (!dos && !cfg_get_flag(cf_options,"ignore-table")) + die("You may proceed by using either '-P ignore' or 'ignore-table'"); +-#else +- if (!yesno("\nProceed? ", 0)) exit(0); + #endif + } + cyl = part_table[part].cyl+((part_table[part].sector >> 6) << 8); diff --git a/debian/patches/08_install-also-dat-files.patch b/debian/patches/08_install-also-dat-files.patch new file mode 100644 index 0000000..5afffaa --- /dev/null +++ b/debian/patches/08_install-also-dat-files.patch @@ -0,0 +1,35 @@ +Package: lilo +Subject: install also dat files of menu backgrounds +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-13 + +In some situations it is fine to have the original config files +for the menu background images. So let us install these dat files. +--- + +diff -urN s07/images/Makefile s08/images/Makefile +--- s07/images/Makefile 2010-11-04 13:26:28.000000000 +0100 ++++ s08/images/Makefile 2010-11-13 18:39:14.558043894 +0100 +@@ -6,6 +6,8 @@ + BINLILO := ../src/lilo + BMPS8 := coffee.bmp + BMPS4 := debian.bmp debian-de.bmp debianlilo.bmp inside.bmp onlyblue.bmp tuxlogo.bmp ++NAME8 := coffee ++NAME4 := debian debian-de debianlilo inside onlyblue tuxlogo + + + all: $(BMPS4) $(BMPS8) +@@ -21,6 +23,12 @@ + install: all + mkdir -p $$DESTDIR$(BOOT_DIR) + install -m 0644 $(BMPS4) $(BMPS8) $$DESTDIR$(BOOT_DIR) ++ for i in $(NAME8); do ++ cp $(NAME8)_256c.dat $$DESTDIR$(BOOT_DIR) ++ done ++ for i in $(NAME4); do ++ cp $(NAME4)_16c.dat $$DESTDIR$(BOOT_DIR) ++ done + + clean: + rm -f $(BMPS4) $(BMPS8) diff --git a/debian/patches/09_use-of-newer-debhelper.patch b/debian/patches/09_use-of-newer-debhelper.patch new file mode 100644 index 0000000..ff044ea --- /dev/null +++ b/debian/patches/09_use-of-newer-debhelper.patch @@ -0,0 +1,70 @@ +Package: lilo +Subject: use of newer debhelper 7.0.50 and above +Author: Joachim Wiedorn +Forwarded: no +Last-Update: 2010-11-13 + +With the possibilities of debhelper of 7.0.50 and above and some +direct patches in the sources the rules can be reduced to few +lines. +--- + +diff -urN s08/images/Makefile s09/images/Makefile +--- s08/images/Makefile 2010-11-13 18:39:14.558043894 +0100 ++++ s09/images/Makefile 2010-11-13 20:23:08.510034528 +0100 +@@ -23,11 +23,11 @@ + install: all + mkdir -p $$DESTDIR$(BOOT_DIR) + install -m 0644 $(BMPS4) $(BMPS8) $$DESTDIR$(BOOT_DIR) +- for i in $(NAME8); do +- cp $(NAME8)_256c.dat $$DESTDIR$(BOOT_DIR) ++ for i in $(NAME8); do \ ++ cp $${i}_256c.dat $$DESTDIR$(BOOT_DIR)/$${i}.dat; \ + done +- for i in $(NAME4); do +- cp $(NAME4)_16c.dat $$DESTDIR$(BOOT_DIR) ++ for i in $(NAME4); do \ ++ cp $${i}_16c.dat $$DESTDIR$(BOOT_DIR)/$${i}.dat; \ + done + + clean: +@@ -37,4 +37,7 @@ + + uninstall: + (cd $$DESTDIR$(BOOT_DIR); rm -f $(BMPS4) $(BMPS8)) ++ for i in $(NAME4) $(NAME8); do \ ++ rm -f $$DESTDIR$(BOOT_DIR)/$${i}.dat; \ ++ done + +diff -urN s08/Makefile s09/Makefile +--- s08/Makefile 2010-11-04 16:35:15.000000000 +0100 ++++ s09/Makefile 2010-11-13 20:23:08.498047887 +0100 +@@ -1,6 +1,14 @@ + # -*- makefile -*- + + # ++# everything needed to run, just short of installation ++# ++all: test ++ make -C src all ++ make -C images all ++ make -C doc all ++ ++# + # make help + # + help: +@@ -27,13 +35,6 @@ + @echo "" + + # +-# everything needed to run, just short of installation +-# +-all: test +- make -C src all +- make -C images all +- +-# + # everything above plus the statically linked version + # + alles: test diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..4f0f503 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,9 @@ +01_makefile-adds.patch +02_lilo-version-debian.patch +03_keytab-lilo.8-debian.patch +04_lilo.8-for-debian.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 -- 2.39.2