summaryrefslogtreecommitdiff
path: root/source/a/syslinux
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2010-05-19 08:58:23 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:43:05 +0200
commitb76270bf9e6dd375e495fec92140a79a79415d27 (patch)
tree3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/a/syslinux
parent5a12e7c134274dba706667107d10d231517d3e05 (diff)
downloadcurrent-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
Diffstat (limited to 'source/a/syslinux')
-rw-r--r--source/a/syslinux/syslinux-3.52.tar.bz2.sign8
-rw-r--r--source/a/syslinux/syslinux-3.84.tar.bz2.sign8
-rwxr-xr-xsource/a/syslinux/syslinux.SlackBuild45
3 files changed, 34 insertions, 27 deletions
diff --git a/source/a/syslinux/syslinux-3.52.tar.bz2.sign b/source/a/syslinux/syslinux-3.52.tar.bz2.sign
deleted file mode 100644
index 1d319cd3..00000000
--- a/source/a/syslinux/syslinux-3.52.tar.bz2.sign
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-Comment: See http://www.kernel.org/signature.html for info
-
-iD8DBQBG+aOayGugalF9Dw4RAtvoAJ93vpkYgJsPYBI95vXW1/qLIQC2lwCcCOPf
-NhphOdhGCaUwMdqZH9tahC0=
-=OS5y
------END PGP SIGNATURE-----
diff --git a/source/a/syslinux/syslinux-3.84.tar.bz2.sign b/source/a/syslinux/syslinux-3.84.tar.bz2.sign
new file mode 100644
index 00000000..987a8ed9
--- /dev/null
+++ b/source/a/syslinux/syslinux-3.84.tar.bz2.sign
@@ -0,0 +1,8 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+Comment: See http://www.kernel.org/signature.html for info
+
+iD8DBQBLLBRQyGugalF9Dw4RAmsiAJ9geAzuilvLYCEc03sP1mJLG77UaQCeJlV+
+TgEccKCkyIkwwpBYDHesUjA=
+=1AUa
+-----END PGP SIGNATURE-----
diff --git a/source/a/syslinux/syslinux.SlackBuild b/source/a/syslinux/syslinux.SlackBuild
index e084f96f..1e7baad7 100755
--- a/source/a/syslinux/syslinux.SlackBuild
+++ b/source/a/syslinux/syslinux.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,18 @@
PKGNAM=syslinux
-VERSION=${VERSION:-3.52}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.84}
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
@@ -48,18 +57,13 @@ find . \
# Build:
make -j4 || exit 1
-make install-all INSTALLROOT=/tmp/package-syslinux
-make mkdiskimage
-make libsyslinux.a
-cp -a unix/syslinux-nomtools mkdiskimage $PKG/usr/bin
-chmod 755 $PKG/usr/bin/*
+# Without -i, the following fails trying to install w32 junk:
+make -i install INSTALLROOT=/tmp/package-syslinux
-mkdir -p $PKG/usr/lib
-cp -a libsyslinux.a $PKG/usr/lib
-mkdir -p $PKG/usr/include
-cp -a syslinux.h $PKG/usr/include
+cp -a linux/syslinux-nomtools $PKG/usr/bin
+chmod 755 $PKG/usr/bin/*
-rm -rf $PKG/usr/lib/syslinux/com32
+rm -rf $PKG/usr/share/syslinux/com32
# Compress and link manpages, if any:
if [ -d $PKG/usr/man ]; then
@@ -77,14 +81,17 @@ if [ -d $PKG/usr/man ]; then
fi
# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION/{cmenu,com32}
cp -a \
BUGS COPYING NEWS README* TODO \
- distrib.doc isolinux.doc pxelinux.doc syslinux.doc \
- com32/LICENSE \
- memdisk/memdisk.doc \
- menu \
+ doc \
$PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a com32/LICENCE $PKG/usr/doc/${PKGNAM}-$VERSION/com32
+( cd com32/cmenu
+ cp -a \
+ CHANGES HISTORY MANUAL MENU_FORMAT README TODO \
+ $PKG/usr/doc/${PKGNAM}-$VERSION/cmenu
+)
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc