diff options
| author | Florian Franzmann | 2013-06-08 23:11:02 +0200 |
|---|---|---|
| committer | Vlad Glagolev | 2015-01-30 11:00:53 +0300 |
| commit | aec908bf1114b56a678c3e7a5f8e84d96964b7e1 (patch) | |
| tree | 032612289f316372b03612f6fbfd027e8bc9543f | |
| parent | 3dd7f5bd0390c1a663d402a8bf2448040e1489ad (diff) | |
disk/lilo: version 24.0
(cherry picked from commit cb95d872e35cf0d021e728fdda4cebf21dab5081)
| -rw-r--r-- | disk/lilo/0001-fix-failure-during-install.patch | 36 | ||||
| -rwxr-xr-x | disk/lilo/DETAILS | 2 | ||||
| -rw-r--r-- | disk/lilo/HISTORY | 4 | ||||
| -rwxr-xr-x | disk/lilo/PRE_BUILD | 3 |
4 files changed, 44 insertions, 1 deletions
diff --git a/disk/lilo/0001-fix-failure-during-install.patch b/disk/lilo/0001-fix-failure-during-install.patch new file mode 100644 index 0000000000..c1a32ed432 --- /dev/null +++ b/disk/lilo/0001-fix-failure-during-install.patch @@ -0,0 +1,36 @@ +From 810806d4d5003dbc61f0efa38f363d0417c66ed3 Mon Sep 17 00:00:00 2001 +From: Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> +Date: Sat, 8 Jun 2013 23:07:57 +0200 +Subject: [PATCH] fix failure during install + +--- + src/Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index feb144e..5d12cad 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -243,9 +243,8 @@ install: + if [ -f diag1.img ]; then cp -f diag1.img $$DESTDIR$(BOOT_DIR); fi + if [ -f diag2.img ]; then cp -f diag2.img $$DESTDIR$(BOOT_DIR); fi + +- strip lilo + cp lilo $$DESTDIR$(SBIN_DIR)/lilo +- [ -x lilo.static ] && strip lilo.static ++ strip $$DESTDIR$(SBIN_DIR)/lilo + cp ../mkrescue $$DESTDIR$(USRSBIN_DIR)/mkrescue + cp ../keytab-lilo.pl $$DESTDIR$(USRSBIN_DIR)/keytab-lilo + +@@ -264,6 +263,8 @@ mkloader: temp.c + tidy: + rm -f core $(LIS) *.shs *.crc $(TMP)* + rm -rf sbin boot usr ++ if [ -x lilo ]; then strip lilo; fi ++ if [ -x lilo.static ]; then strip lilo.static; fi + + clean: + rm -f *.o *.s *.i *.img *.b tmp_make version +-- +1.8.3 + diff --git a/disk/lilo/DETAILS b/disk/lilo/DETAILS index bc6a2f3043..7666079d3b 100755 --- a/disk/lilo/DETAILS +++ b/disk/lilo/DETAILS @@ -1,5 +1,5 @@ SPELL=lilo - VERSION=23.2 + VERSION=24.0 SOURCE=lilo-${VERSION}.tar.gz SOURCE2=$SOURCE.asc SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" diff --git a/disk/lilo/HISTORY b/disk/lilo/HISTORY index f0c266e232..85e719663e 100644 --- a/disk/lilo/HISTORY +++ b/disk/lilo/HISTORY @@ -1,3 +1,7 @@ +2013-08-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 24.0 + * PRE_BUILD, 0001-fix-failure-during-install.patch: fix failure during install + 2011-09-26 Bor Kraljič <pyrobor@ver.si> * DETAILS: converted to upstream signature checking * 1FE1B08B.gpg: added gpg keyring diff --git a/disk/lilo/PRE_BUILD b/disk/lilo/PRE_BUILD new file mode 100755 index 0000000000..17870984b0 --- /dev/null +++ b/disk/lilo/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && +patch -p1 < $SPELL_DIRECTORY/0001-fix-failure-during-install.patch |