From 3c2a2f36f0e25eb363afddf19a8c5a1b598ccc08 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 16 Nov 2014 20:46:35 -0500
Subject: Drop patch, issue fixed upstream

---
diff --git a/changelog b/changelog
index e852ada..2b8736e 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 lilo (24.1-1) trunk
 
   * New upstream version.
+  * Drop patch for a build system issue fixed upstream.
   * Add a kernel prerm hook to back up /boot/vmlinuz to
     /boot/vmlinuz.old before upgrading the linux-image package.
   * Also create /boot/vmlinuz.old when first installing linux-image.
diff --git a/patches/01_fix-src-makefile.patch b/patches/01_fix-src-makefile.patch
deleted file mode 100644
index b7cac48..0000000
--- a/patches/01_fix-src-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Author: "P. J. McDermott" <pj@pehjota.net>
-Subject: Fix src/Makefile
-
-Before:
-
-    $ opkbuild -bcT install
-    [...]
-    make -C src install
-    make[2]: Entering directory '/pkg/lilo/tmp/src/src'
-    mkdir -p $DESTDIR/sbin $DESTDIR/etc 
-    mkdir -p $DESTDIR/boot $DESTDIR/usr/sbin
-    if [ -f chain.b -a  1 -eq 0 ]; then cp chain.b $DESTDIR/boot; fi
-    if [ -f mbr.b   -a  1 -eq 0 ]; then cp mbr.b   $DESTDIR/boot; fi
-    if [ -f diag1.img ]; then cp -f diag1.img $DESTDIR/boot; fi
-    if [ -f diag2.img ]; then cp -f diag2.img $DESTDIR/boot; fi
-    strip lilo
-    cp lilo $DESTDIR/sbin/lilo
-    [ -x lilo.static ] && strip lilo.static
-    Makefile:225: recipe for target 'install' failed
-    make[2]: *** [install] Error 1
-    make[2]: Leaving directory '/pkg/lilo/tmp/src/src'
-    Makefile:106: recipe for target 'install' failed
-    make[1]: *** [install] Error 2
-    make[1]: Leaving directory '/pkg/lilo/tmp/src'
-    ../build:13: recipe for target 'install' failed
-    make: *** [install] Error 2
-
-diff -Naur src.orig/src/Makefile src/src/Makefile
---- src.orig/src/Makefile	2013-06-07 09:23:05.000000000 -0400
-+++ src/src/Makefile	2014-06-27 13:56:49.112704987 -0400
-@@ -245,7 +245,7 @@
- 
- 	strip lilo
- 	cp lilo $$DESTDIR$(SBIN_DIR)/lilo
--	[ -x lilo.static ] && strip lilo.static
-+	if [ -x lilo.static ]; then strip lilo.static; fi
- 	cp ../mkrescue $$DESTDIR$(USRSBIN_DIR)/mkrescue
- 	cp ../keytab-lilo.pl $$DESTDIR$(USRSBIN_DIR)/keytab-lilo
- 
--
cgit v0.9.1