Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (328db204f73742b653933a0c4d1ad7424a9764ae)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (328db204f73742b653933a0c4d1ad7424a9764ae)
  • Date: Thu, 15 Jul 2010 17:14:33 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
disk/lilo/BUILD | 3 +--
disk/lilo/CONFIGURE | 2 +-
disk/lilo/DEPENDS | 1 +
disk/lilo/DETAILS | 37 ++++++++++++++-----------------------
disk/lilo/FINAL | 4 ++--
disk/lilo/HISTORY | 11 +++++++++++
disk/lilo/INSTALL | 10 ++++++----
disk/lilo/POST_REMOVE | 2 +-
disk/lilo/lilo.gpg | 0
10 files changed, 37 insertions(+), 33 deletions(-)

New commits:
commit 328db204f73742b653933a0c4d1ad7424a9764ae
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

lilo: => 23.0

diff --git a/disk/lilo/BUILD b/disk/lilo/BUILD
index 2cace4e..ce6a970 100755
--- a/disk/lilo/BUILD
+++ b/disk/lilo/BUILD
@@ -1,2 +1 @@
-sedit 's/\/usr\/man/\/usr\/share\/man/' Makefile &&
-make ROOT=$INSTALL_ROOT all
+make DESTDIR="$INSTALL_ROOT" OPT="$CFLAGS" all
diff --git a/disk/lilo/CONFIGURE b/disk/lilo/CONFIGURE
index c388b4e..cd4cb2e 100755
--- a/disk/lilo/CONFIGURE
+++ b/disk/lilo/CONFIGURE
@@ -1 +1 @@
-config_query RUN_LILO "Run LILO automatically upon LILO upgrades?" n
+config_query RUN_LILO "Run LILO automatically upon LILO upgrades?" n
diff --git a/disk/lilo/DEPENDS b/disk/lilo/DEPENDS
index a4137bd..53797f9 100755
--- a/disk/lilo/DEPENDS
+++ b/disk/lilo/DEPENDS
@@ -1,4 +1,5 @@
depends gnupg &&
depends LD86 &&
depends smgl-fhs &&
+
optional_depends lvm '' '' 'device mapper support'
diff --git a/disk/lilo/DETAILS b/disk/lilo/DETAILS
index 5813b8d..9e6f0f6 100755
--- a/disk/lilo/DETAILS
+++ b/disk/lilo/DETAILS
@@ -1,29 +1,20 @@
SPELL=lilo
- VERSION=22.8
- SOURCE=lilo-${VERSION}.src.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://home.san.rr.com/johninsd/pub/linux/lilo/$SOURCE
-
SOURCE_URL[1]=http://www.ibiblio.org/pub/Linux/system/boot/${SPELL}/${SOURCE}
-
SOURCE_URL[2]=ftp://ftp.uni-tuebingen.de/pub/mirrors/ftp.metalab.unc.edu/pub/Linux/system/boot/${SPELL}/${SOURCE}
- SOURCE_URL[3]=ftp://ftp.sai.msu.su/pub/Linux/boot/${SOURCE}
-
SOURCE_URL[4]=ftp://planetmirror.com/raid/2/ibiblio/system/boot/${SPELL}/${SOURCE}
- SOURCE2=$SOURCE.sig
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=lilo.gpg:$SOURCE.sig:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
- WEB_SITE=http://lilo.go.dyndns.org/
+ VERSION=23.0
+ SOURCE=lilo-${VERSION}.tar.gz
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3315/$SOURCE
+
SOURCE_HASH=sha512:6d6b870a7042ff8519b0b4a156bc2f1e0543616daaa48326072cd1c003357b0e165a98f59cc6a075366b43690a1ada328bcd122d502925d4a00495de27192876
+ WEB_SITE=http://lilo.alioth.debian.org/
ENTERED=20010922
LICENSE[0]=BSD
- PATCHLEVEL=1
KEYWORDS="disk"
- SHORT="Boot loader for Linux/x86 and other PC operating systems."
+ SHORT="Boot loader for Linux/x86 and other PC operating systems"
cat << EOF
-Lilo is a Boot loader for Linux/x86 and other PC operating systems.
-Lilo is responsible for loading your Linux kernel from either a floppy
-or a hard drive and giving it control of the system. It can also be used
-to boot many other operating sysetms, including the BSD variants, DOS,
-and OS/2. The Lilo distribution includes full source, documentation and
-support files, but no pre-compiled binaries. Lilo is capable of booting
-beyond cylinder 1024 of a hard disk if the BIOS supports EDD packet call
-extensions to the int 0x13 interface.
+Lilo is a Boot loader for Linux/x86 and other PC operating systems. Lilo is
+responsible for loading your Linux kernel from either a floppy or a hard
drive
+and giving it control of the system. It can also be used to boot many other
+operating sysetms, including the BSD variants, DOS, and OS/2. The Lilo
+distribution includes full source, documentation and support files, but no
+pre-compiled binaries. Lilo is capable of booting beyond cylinder 1024 of a
hard
+disk if the BIOS supports EDD packet call extensions to the int 0x13
interface.
EOF
diff --git a/disk/lilo/FINAL b/disk/lilo/FINAL
index 55d6245..0cb2b50 100755
--- a/disk/lilo/FINAL
+++ b/disk/lilo/FINAL
@@ -1,3 +1,3 @@
-if [ "$RUN_LILO" == "y" ]; then
- $INSTALL_ROOT/sbin/lilo || true
+if [[ $RUN_LILO == y ]]; then
+ "$INSTALL_ROOT/sbin/lilo" || true
fi
diff --git a/disk/lilo/HISTORY b/disk/lilo/HISTORY
index 68a5abd..9fe4eb2 100644
--- a/disk/lilo/HISTORY
+++ b/disk/lilo/HISTORY
@@ -1,3 +1,14 @@
+2010-07-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 23.0; renewed website, source urls, descs;
+ quoting paths; gpg -> hash
+ * BUILD: removed some dirty sed hacks, use DESTDIR and INSTALL_ROOT;
+ custom CFLAGS are passed via OPT
+ * CONFIGURE, DEPENDS: cleaned up
+ * FINAL, POST_REMOVE: use INSTALL_ROOT; cleaned up; quoting paths
+ * INSTALL: removed tabs; use DESTDIR and INSTALL_ROOT; quoting paths;
+ multijob OK; added verbosity to cp
+ * lilo.gpg: removed, not needed anymore
+
2009-02-26 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: device-mapper is provided by lvm now

diff --git a/disk/lilo/INSTALL b/disk/lilo/INSTALL
index 0a06b45..34eea1b 100755
--- a/disk/lilo/INSTALL
+++ b/disk/lilo/INSTALL
@@ -1,4 +1,6 @@
-make ROOT=$INSTALL_ROOT install &&
+make_single &&
+make DESTDIR="$INSTALL_ROOT" install &&
+make_normal &&

sed -i '/install\ =\ menu/a\
\
@@ -10,9 +12,9 @@ sed -i '/install\ =\ menu/a\
#bmp-table=227p,233p,1,7\
#bmp-colors=13,0,,11,0,13\
#bmp-timer=76,30,11,0\
-' sample/lilo.sample.conf &&
+' sample/lilo.sample.conf &&

-cp sample/*.conf /etc &&
-cp $SCRIPT_DIRECTORY/boot.bmp /boot
+cp -av sample/*.conf "$INSTALL_ROOT/etc" &&
+cp -av "$SPELL_DIRECTORY/boot.bmp" "$INSTALL_ROOT/boot/boot.bmp" &&

message "A sample lilo.conf file has been installed as /etc/lilo.sample.conf"
diff --git a/disk/lilo/POST_REMOVE b/disk/lilo/POST_REMOVE
index 002587a..b1b82d5 100755
--- a/disk/lilo/POST_REMOVE
+++ b/disk/lilo/POST_REMOVE
@@ -1,2 +1,2 @@
# /boot is protected, we remove /boot/boot.bmp by hand
-rm -f /boot/boot.bmp
+rm -f "$INSTALL_ROOT/boot/boot.bmp"
diff --git a/disk/lilo/lilo.gpg b/disk/lilo/lilo.gpg
deleted file mode 100644
index db3e473..0000000
Binary files a/disk/lilo/lilo.gpg and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (328db204f73742b653933a0c4d1ad7424a9764ae), Vlad Glagolev, 07/15/2010

Archive powered by MHonArc 2.6.24.

Top of Page