Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cb95d872e35cf0d021e728fdda4cebf21dab5081)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cb95d872e35cf0d021e728fdda4cebf21dab5081)
  • Date: Sat, 8 Jun 2013 16:11:21 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

disk/lilo/0001-fix-failure-during-install.patch | 36
++++++++++++++++++++++++
disk/lilo/DETAILS | 2 -
disk/lilo/HISTORY | 4 ++
disk/lilo/PRE_BUILD | 3 ++
4 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit cb95d872e35cf0d021e728fdda4cebf21dab5081
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

disk/lilo: version 24.0

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 0000000..c1a32ed
--- /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 AT 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 bc6a2f3..7666079 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 f0c266e..85e7196 100644
--- a/disk/lilo/HISTORY
+++ b/disk/lilo/HISTORY
@@ -1,3 +1,7 @@
+2013-08-06 Florian Franzmann <siflfran AT 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 AT 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 0000000..1787098
--- /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



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (cb95d872e35cf0d021e728fdda4cebf21dab5081), Florian Franzmann, 06/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page