[arch-commits] Commit in syslinux/trunk (5 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Fri Feb 1 13:19:39 UTC 2013
Date: Friday, February 1, 2013 @ 14:19:39
Author: tpowa
Revision: 176847
upgpkg: syslinux 5.01-1
bump to 5.01, updated syslinux-install_update script, added new hints for 5.01 update
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch
syslinux/trunk/syslinux-install_update
syslinux/trunk/syslinux.cfg
syslinux/trunk/syslinux.install
-----------------------------------------------+
PKGBUILD | 10 ++++----
syslinux-dont-build-dos-windows-targets.patch | 4 +--
syslinux-install_update | 30 ++++++++++++++++--------
syslinux.cfg | 22 +++++++----------
syslinux.install | 13 ++++++++++
5 files changed, 50 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-01 12:30:25 UTC (rev 176846)
+++ PKGBUILD 2013-02-01 13:19:39 UTC (rev 176847)
@@ -3,7 +3,7 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=syslinux
-pkgver=5.00
+pkgver=5.01
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE"
@@ -22,10 +22,10 @@
syslinux-dont-build-dos-windows-targets.patch
syslinux.cfg
syslinux-install_update)
-md5sums=('21e8e5fa3ca0d4d025147ee5e624a8a4'
- '4f3216b88c174748e04f804bd3fd3d10'
- '832595501944fbcabcdc1207f4724fe7'
- '680750f73dc2e587ac567d057d485813')
+md5sums=('6c21244277fa4e444967ba45469de863'
+ '25af85a05e7b212b7fb8b7587175e492'
+ 'd0c58b16de6e5660a28b3bc248185a38'
+ 'c1c4fcbafc39dc8a8fb00f6f452b8741')
build() {
# Do not try to build syslinux with our default LDFLAGS, it will fail
Modified: syslinux-dont-build-dos-windows-targets.patch
===================================================================
--- syslinux-dont-build-dos-windows-targets.patch 2013-02-01 12:30:25 UTC (rev 176846)
+++ syslinux-dont-build-dos-windows-targets.patch 2013-02-01 13:19:39 UTC (rev 176847)
@@ -5,8 +5,8 @@
# files that depend only on the B phase, but may have to be regenerated
# for "make installer".
BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
-- diag libinstaller dos win32 win64 dosutil
-+ libinstaller
+- diag libinstaller dos win32 win64 dosutil txt
++ libinstaller txt
ITARGET =
IOBJECTS = $(ITARGET) \
utils/gethostip utils/isohybrid utils/mkdiskimage \
Modified: syslinux-install_update
===================================================================
--- syslinux-install_update 2013-02-01 12:30:25 UTC (rev 176846)
+++ syslinux-install_update 2013-02-01 13:19:39 UTC (rev 176847)
@@ -30,8 +30,8 @@
bootpath="/boot/syslinux"
extlinux="/usr/sbin/extlinux"
+core_modules=(ldlinux.c32)
autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
-com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
pciids_file=/usr/share/hwdata/pci.ids
## Helper functions ##
@@ -294,9 +294,10 @@
}
_install() {
- # Copy files to /boot
- for file in "${com32_files[@]}"; do
- # Symlink files even if links exist
+ # Copy all com32 files to /boot
+ for file in "${libpath}"/*.c32; do
+ file=${file##*/}
+ # Symlink files if /boot resides on the same partition as root
if [[ "$boot" = root ]]; then
ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
elif [[ "$boot" = boot ]]; then
@@ -304,8 +305,8 @@
fi
done
- # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
- if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then
+ # Copy / Symlink pci.ids if pci.ids exists on the FS
+ if [[ -f $pciids_file ]]; then
if [[ "$boot" = root ]]; then
ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
elif [[ "$boot" = boot ]]; then
@@ -331,10 +332,10 @@
}
update() {
- # Update any com and c32 files in /boot
+ # Update c32 files in /boot, if /boot is not on same fs
if [[ "$boot" = boot ]]; then
- for file in "$bootpath"/*.{c32,com}; do
- file=$(basename "$file")
+ for file in "$bootpath"/*.{c32}; do
+ file=${file##*/}
cp "$libpath/$file" "$bootpath/$file" &> /dev/null
done
if [[ -f "$bootpath/pci.ids" ]]; then
@@ -342,6 +343,17 @@
fi
fi
+ # Ensure core modules exist and if not install them
+ for file in "${core_modules[@]}"; do
+ if [[ ! -f $bootpath/$file ]]; then
+ if [[ "$boot" = root ]]; then
+ ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
+ elif [[ "$boot" = boot ]]; then
+ cp "$libpath/$file" "$bootpath/$file"
+ fi
+ fi
+ done
+
if device_is_raid $bootpart; then
echo "Detected RAID on /boot - installing Syslinux with --raid"
"$extlinux" --update "$bootpath" -r &> /dev/null
Modified: syslinux.cfg
===================================================================
--- syslinux.cfg 2013-02-01 12:30:25 UTC (rev 176846)
+++ syslinux.cfg 2013-02-01 13:19:39 UTC (rev 176847)
@@ -50,16 +50,16 @@
#-*
LABEL arch
- MENU LABEL Arch Linux
- LINUX ../vmlinuz-linux
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux.img
+ MENU LABEL Arch Linux
+ LINUX ../vmlinuz-linux
+ APPEND root=/dev/sda3 ro
+ INITRD ../initramfs-linux.img
LABEL archfallback
- MENU LABEL Arch Linux Fallback
- LINUX ../vmlinuz-linux
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux-fallback.img
+ MENU LABEL Arch Linux Fallback
+ LINUX ../vmlinuz-linux
+ APPEND root=/dev/sda3 ro
+ INITRD ../initramfs-linux-fallback.img
#LABEL windows
# MENU LABEL Windows
@@ -69,11 +69,7 @@
LABEL hdt
MENU LABEL HDT (Hardware Detection Tool)
COM32 hdt.c32
-
+
LABEL reboot
MENU LABEL Reboot
COM32 reboot.c32
-
-LABEL off
- MENU LABEL Power Off
- COMBOOT poweroff.com
Modified: syslinux.install
===================================================================
--- syslinux.install 2013-02-01 12:30:25 UTC (rev 176846)
+++ syslinux.install 2013-02-01 13:19:39 UTC (rev 176847)
@@ -8,6 +8,19 @@
post_upgrade() {
# auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
/usr/sbin/syslinux-install_update -s
+ # update to 5.01 message
+ if [ "$(vercmp $2 5.01)" -lt 0 ]; then
+ echo "If you used syslinux-install_update to install syslinux:"
+ echo "==> If you want to use syslinux with menu and all modules please rerun"
+ echo "==> # /usr/sbin/syslinux-install_update -i -a -m"
+ echo ""
+ echo "If you manually installed syslinux:"
+ echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
+ echo "==> If (/ and /boot on seperate fs):"
+ echo "==> # cp /usr/lib/syslinux/*.c32 /boot/syslinux"
+ echo "==> If (/ and /boot on same fs):"
+ echo "==> # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux"
+ fi
}
# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list