summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-06-27 13:59:51 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-06-27 13:59:51 (EDT)
commit3790907540d76771fc849897fdaf39677f402b1f (patch)
tree3afa4ee1a055ff64e7842dce70f9fca287feca95
parent3e48755b7c7927ac29839cd03b9f7017e27725f1 (diff)
Add patch to fix installation.
-rw-r--r--patches/01_fix-src-makefile.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/01_fix-src-makefile.patch b/patches/01_fix-src-makefile.patch
new file mode 100644
index 0000000..b7cac48
--- /dev/null
+++ b/patches/01_fix-src-makefile.patch
@@ -0,0 +1,39 @@
+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
+