[arch-commits] Commit in syslinux/trunk (2 files)
Date: Wednesday, November 27, 2013 @ 17:25:16
Author: tpowa
Revision: 200385
upgpkg: syslinux 6.02-7
fix isolinux boot issues
Added:
syslinux/trunk/syslinux-6.02-fix-bios-isolinux.patch
Modified:
syslinux/trunk/PKGBUILD
---+
PKGBUILD | 13 ++---
syslinux-6.02-fix-bios-isolinux.patch | 12
2 files changed, 22 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-27 15:53:02 UTC (rev 200384)
+++ PKGBUILD2013-11-27 16:25:16 UTC (rev 200385)
@@ -4,7 +4,7 @@
pkgname=syslinux
pkgver=6.02
-pkgrel=6
+pkgrel=7
arch=('x86_64' 'i686')
pkgdesc=Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE
url=http://syslinux.zytor.com/;
@@ -24,12 +24,15 @@
source=(https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz;
'syslinux.cfg'
'syslinux-install_update'
-'syslinux-6.02-fix-chainloading.patch')
+'syslinux-6.02-fix-chainloading.patch'
+'syslinux-6.02-fix-bios-isolinux.patch')
md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
'46ca150f53322ff8f1597d9a342f7e40'
'9376f18fa3e42fc36cffa4cff0a84c09'
- '9dbede6b71a4de9e46aac4aad65334d7')
+ '9dbede6b71a4de9e46aac4aad65334d7'
+ 'adf71eceb4fccecd9a7efe1ab3d54918')
+
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}/
@@ -50,6 +53,10 @@
# http://www.syslinux.org/archives/2013-October/020971.html
patch -Np1 -i ${srcdir}/syslinux-6.02-fix-chainloading.patch
+# fix bios booting from isohybrid
+# http://www.syslinux.org/archives/2013-November/021189.html
+patch -Np1 -i ${srcdir}/syslinux-6.02-fix-bios-isolinux.patch
+
}
_build_syslinux_bios() {
Added: syslinux-6.02-fix-bios-isolinux.patch
===
--- syslinux-6.02-fix-bios-isolinux.patch (rev 0)
+++ syslinux-6.02-fix-bios-isolinux.patch 2013-11-27 16:25:16 UTC (rev
200385)
@@ -0,0 +1,12 @@
+diff --git a/core/isolinux.asm b/core/isolinux.asm
+index bd4e9556922d..c4db4133e274 100644
+--- a/core/isolinux.asm
b/core/isolinux.asm
+@@ -420,7 +420,7 @@ MaxLMA equ 384*1024; Reasonable
limit (384K)
+ call getlinsec
+ pop eax
+ pop cx
+- mov dx,cx
++ movzx edx,cx
+ pop bp
+ pop bx
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Friday, October 18, 2013 @ 12:38:33
Author: tpowa
Revision: 196765
upgpkg: syslinux 6.02-3
fix chainloading, revert to old build style
Added:
syslinux/trunk/syslinux-6.02-fix-chainloading.patch
Modified:
syslinux/trunk/PKGBUILD
--+
PKGBUILD | 16 +++
syslinux-6.02-fix-chainloading.patch | 47 +
2 files changed, 57 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-18 09:24:56 UTC (rev 196764)
+++ PKGBUILD2013-10-18 10:38:33 UTC (rev 196765)
@@ -4,7 +4,7 @@
pkgname=syslinux
pkgver=6.02
-pkgrel=2
+pkgrel=3
arch=('x86_64' 'i686')
pkgdesc=Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE
url=http://syslinux.zytor.com/;
@@ -22,13 +22,15 @@
'dosfstools: For EFI support')
md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
'46ca150f53322ff8f1597d9a342f7e40'
- '0e7d47e1f791f0c5e7bd40ed5c6d80cc')
+ '0e7d47e1f791f0c5e7bd40ed5c6d80cc'
+ '9dbede6b71a4de9e46aac4aad65334d7')
install=${pkgname}.install
source=(https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz;
'syslinux.cfg'
-'syslinux-install_update')
+'syslinux-install_update'
+'syslinux-6.02-fix-chainloading.patch')
_build_syslinux_bios() {
@@ -38,7 +40,6 @@
## Do not try to build syslinux with our default LDFLAGS, it will fail
unset LDFLAGS
-make PYTHON=python2 bios spotless
make PYTHON=python2 bios
make PYTHON=python2 bios installer
}
@@ -56,7 +57,6 @@
unset LDFLAGS
unset MAKEFLAGS
-make PYTHON=python2 efi64 spotless
make PYTHON=python2 efi64
make PYTHON=python2 efi64 installer
}
@@ -74,7 +74,6 @@
unset LDFLAGS
unset MAKEFLAGS
-make PYTHON=python2 efi32 spotless
make PYTHON=python2 efi32
make PYTHON=python2 efi32 installer
}
@@ -94,6 +93,11 @@
## Fix FHS manpage path
sed 's|/usr/man|/usr/share/man|g' -i
${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk || true
+# fix chainloading
+# http://bugzilla.syslinux.org/show_bug.cgi?id=31
+# http://www.syslinux.org/archives/2013-October/020971.html
+patch -Np1 -i ${srcdir}/syslinux-6.02-fix-chainloading.patch
+
## Build syslinux-efi
if [[ ${CARCH} == x86_64 ]]; then
_build_syslinux_efi64
Added: syslinux-6.02-fix-chainloading.patch
===
--- syslinux-6.02-fix-chainloading.patch(rev 0)
+++ syslinux-6.02-fix-chainloading.patch2013-10-18 10:38:33 UTC (rev
196765)
@@ -0,0 +1,47 @@
+Reported-by: Dark Raven drdarkraven at gmail.com
+Signed-off-by: Raphael S. Carvalho raphael.scarv at gmail.com
+---
+ com32/lib/syslinux/disk.c | 22 ++
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c
+index 0b0c737..47ecb52 100644
+--- a/com32/lib/syslinux/disk.c
b/com32/lib/syslinux/disk.c
+@@ -171,22 +171,28 @@ out:
+ static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t
*inreg,
+uint64_t lba, uint8_t count, uint8_t op_code)
+ {
+-static __lowmem struct disk_ebios_dapa dapa;
++static struct disk_ebios_dapa *dapa = NULL;
+ void *buf;
+
++if (!dapa) {
++ dapa = lmalloc(sizeof *dapa);
++ if (!dapa)
++ return NULL;
++}
++
+ buf = lmalloc(count * diskinfo-bps);
+ if (!buf)
+ return NULL;
+
+-dapa.len = sizeof(dapa);
+-dapa.count = count;
+-dapa.off = OFFS(buf);
+-dapa.seg = SEG(buf);
+-dapa.lba = lba;
++dapa-len = sizeof(*dapa);
++dapa-count = count;
++dapa-off = OFFS(buf);
++dapa-seg = SEG(buf);
++dapa-lba = lba;
+
+ inreg-eax.b[1] = op_code;
+-inreg-esi.w[0] = OFFS(dapa);
+-inreg-ds = SEG(dapa);
++inreg-esi.w[0] = OFFS(dapa);
++inreg-ds = SEG(dapa);
+ inreg-edx.b[0] = diskinfo-disk;
+
+ return buf;
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Saturday, December 8, 2012 @ 03:09:00
Author: tpowa
Revision: 172995
upgpkg: syslinux 5.00-1
bump to latest version
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch
---+
PKGBUILD | 10 +-
syslinux-dont-build-dos-windows-targets.patch |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-12-08 07:20:04 UTC (rev 172994)
+++ PKGBUILD2012-12-08 08:09:00 UTC (rev 172995)
@@ -3,7 +3,7 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=syslinux
-pkgver=4.06
+pkgver=5.00
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,6 +22,10 @@
syslinux-dont-build-dos-windows-targets.patch
syslinux.cfg
syslinux-install_update)
+md5sums=('21e8e5fa3ca0d4d025147ee5e624a8a4'
+ '4f3216b88c174748e04f804bd3fd3d10'
+ '832595501944fbcabcdc1207f4724fe7'
+ '680750f73dc2e587ac567d057d485813')
build() {
# Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -49,7 +53,3 @@
mv $pkgdir/sbin/extlinux $pkgdir/usr/sbin/extlinux
rmdir $pkgdir/sbin
}
-md5sums=('0384ef35b724615074e77b1fc89d5b47'
- '1528c376e43f0eaccaa80d8ad1bc13b4'
- '832595501944fbcabcdc1207f4724fe7'
- '680750f73dc2e587ac567d057d485813')
Modified: syslinux-dont-build-dos-windows-targets.patch
===
--- syslinux-dont-build-dos-windows-targets.patch 2012-12-08 07:20:04 UTC
(rev 172994)
+++ syslinux-dont-build-dos-windows-targets.patch 2012-12-08 08:09:00 UTC
(rev 172995)
@@ -4,7 +4,7 @@
@@ -54,7 +54,7 @@
# files that depend only on the B phase, but may have to be regenerated
# for make installer.
- BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
+ BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
- diag libinstaller dos win32 win64 dosutil
+ libinstaller
ITARGET =
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Tuesday, October 23, 2012 @ 10:50:31 Author: tpowa Revision: 169561 remove not needed patches Deleted: syslinux/trunk/avoid-using-ext2_fs.patch syslinux/trunk/handle-ctors-dtors-via-init_array-and-fini_array.patch + avoid-using-ext2_fs.patch | 965 --- handle-ctors-dtors-via-init_array-and-fini_array.patch | 67 - 2 files changed, 1032 deletions(-) Deleted: avoid-using-ext2_fs.patch === --- avoid-using-ext2_fs.patch 2012-10-23 14:48:47 UTC (rev 169560) +++ avoid-using-ext2_fs.patch 2012-10-23 14:50:31 UTC (rev 169561) @@ -1,965 +0,0 @@ -From a1006762fa6f98750bb77d76dd992cb8ea9f9c99 Mon Sep 17 00:00:00 2001 -From: H. Peter Anvin h...@zytor.com -Date: Mon, 26 Mar 2012 22:51:09 -0700 -Subject: [PATCH] libinstaller: Avoid using linux/ext2_fs.h - -Don't use linux/ext2_fs.h if we can avoid it. - -The ioctl constants have been globalized and moved to linux/fs.h. -Use a private copy of ext2_fs.h from e2fsprogs with the ioctl -constants removed for the data structures. - -Do at least attempt backward compatibility for old kernel headers, but -no real hope of proper operation there... - -Signed-off-by: H. Peter Anvin h...@zytor.com - libinstaller/ext2fs/ext2_fs.h | 856 ++ - libinstaller/linuxioctl.h | 29 +- - libinstaller/syslxcom.c | 12 +- - 3 files changed, 886 insertions(+), 11 deletions(-) - create mode 100644 libinstaller/ext2fs/ext2_fs.h - -diff -urpN syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 syslinux-4.05/libinstaller/ext2fs/ext2_fs.h syslinux-4.05/libinstaller/ext2fs/ext2_fs.h.ext2 2012-08-06 09:48:43.797645032 -0400 -+++ syslinux-4.05/libinstaller/ext2fs/ext2_fs.h2012-08-06 09:48:43.797645032 -0400 -@@ -0,0 +1,856 @@ -+/* -+ * linux/include/linux/ext2_fs.h -+ * -+ * Copyright (C) 1992, 1993, 1994, 1995 -+ * Remy Card (c...@masi.ibp.fr) -+ * Laboratoire MASI - Institut Blaise Pascal -+ * Universite Pierre et Marie Curie (Paris VI) -+ * -+ * from -+ * -+ * linux/include/linux/minix_fs.h -+ * -+ * Copyright (C) 1991, 1992 Linus Torvalds -+ */ -+ -+#ifndef _EXT2FS_EXT2_FS_H -+#define _EXT2FS_EXT2_FS_H -+ -+#include linux/types.h -+ -+/* -+ * The second extended filesystem constants/structures -+ */ -+ -+/* -+ * Define EXT2FS_DEBUG to produce debug messages -+ */ -+#undef EXT2FS_DEBUG -+ -+/* -+ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files -+ */ -+#define EXT2_PREALLOCATE -+#define EXT2_DEFAULT_PREALLOC_BLOCKS 8 -+ -+/* -+ * The second extended file system version -+ */ -+#define EXT2FS_DATE 95/08/09 -+#define EXT2FS_VERSION0.5b -+ -+/* -+ * Special inode numbers -+ */ -+#define EXT2_BAD_INO 1 /* Bad blocks inode */ -+#define EXT2_ROOT_INO 2 /* Root inode */ -+#define EXT4_USR_QUOTA_INO 3 /* User quota inode */ -+#define EXT4_GRP_QUOTA_INO 4 /* Group quota inode */ -+#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ -+#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ -+#define EXT2_RESIZE_INO7 /* Reserved group descriptors inode */ -+#define EXT2_JOURNAL_INO 8 /* Journal inode */ -+#define EXT2_EXCLUDE_INO 9 /* The exclude inode, for snapshots */ -+#define EXT4_REPLICA_INO 10 /* Used by non-upstream feature */ -+ -+/* First non-reserved inode for old ext2 filesystems */ -+#define EXT2_GOOD_OLD_FIRST_INO 11 -+ -+/* -+ * The second extended file system magic number -+ */ -+#define EXT2_SUPER_MAGIC 0xEF53 -+ -+#ifdef __KERNEL__ -+#define EXT2_SB(sb) (((sb)-u.ext2_sb)) -+#else -+/* Assume that user mode programs are passing in an ext2fs superblock, not -+ * a kernel struct super_block. This will allow us to call the feature-test -+ * macros from user land. */ -+#define EXT2_SB(sb) (sb) -+#endif -+ -+/* -+ * Maximal count of links to a file -+ */ -+#define EXT2_LINK_MAX 65000 -+ -+/* -+ * Macro-instructions used to manage several block sizes -+ */ -+#define EXT2_MIN_BLOCK_LOG_SIZE 10 /* 1024 */ -+#define EXT2_MAX_BLOCK_LOG_SIZE 16 /* 65536 */ -+#define EXT2_MIN_BLOCK_SIZE (1 EXT2_MIN_BLOCK_LOG_SIZE) -+#define EXT2_MAX_BLOCK_SIZE (1 EXT2_MAX_BLOCK_LOG_SIZE) -+#ifdef __KERNEL__ -+#define EXT2_BLOCK_SIZE(s)((s)-s_blocksize) -+#define EXT2_BLOCK_SIZE_BITS(s) ((s)-s_blocksize_bits) -+#define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)-addr_per_block_bits) -+#define EXT2_INODE_SIZE(s)(EXT2_SB(s)-s_inode_size) -+#define EXT2_FIRST_INO(s) (EXT2_SB(s)-s_first_ino) -+#else -+#define EXT2_BLOCK_SIZE(s)(EXT2_MIN_BLOCK_SIZE (s)-s_log_block_size) -+#define EXT2_BLOCK_SIZE_BITS(s) ((s)-s_log_block_size + 10) -+#define EXT2_INODE_SIZE(s)(((s)-s_rev_level == EXT2_GOOD_OLD_REV) ? \
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Thursday, August 9, 2012 @ 13:49:54
Author: thomas
Revision: 165047
Fix FS#31065
Added:
syslinux/trunk/handle-ctors-dtors-via-init_array-and-fini_array.patch
Modified:
syslinux/trunk/PKGBUILD
+
PKGBUILD | 10 +-
handle-ctors-dtors-via-init_array-and-fini_array.patch | 67 +++
2 files changed, 74 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-08-09 16:35:44 UTC (rev 165046)
+++ PKGBUILD2012-08-09 17:49:54 UTC (rev 165047)
@@ -4,7 +4,7 @@
pkgname=syslinux
pkgver=4.05
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
pkgdesc=Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE
url=http://syslinux.zytor.com/;
@@ -21,7 +21,8 @@
syslinux-dont-build-dos-windows-targets.patch
syslinux.cfg
syslinux-install_update
-avoid-using-ext2_fs.patch)
+avoid-using-ext2_fs.patch
+handle-ctors-dtors-via-init_array-and-fini_array.patch)
build() {
# Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -31,6 +32,8 @@
patch -p1 -i $srcdir/syslinux-dont-build-dos-windows-targets.patch
# fix #30084
patch -Np1 -i $srcdir/avoid-using-ext2_fs.patch
+ # fix #31065 (booting breaks with gcc 4.7)
+ patch -Np1 -i
$srcdir/handle-ctors-dtors-via-init_array-and-fini_array.patch
# Fix FHS manpage path
sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
make
@@ -52,4 +55,5 @@
'1528c376e43f0eaccaa80d8ad1bc13b4'
'832595501944fbcabcdc1207f4724fe7'
'680750f73dc2e587ac567d057d485813'
- '2e2c674a71c0c0bf265d96cfc19ce985')
+ '2e2c674a71c0c0bf265d96cfc19ce985'
+ 'd016d03f15177b1bb534ce3753b2aa9b')
Added: handle-ctors-dtors-via-init_array-and-fini_array.patch
===
--- handle-ctors-dtors-via-init_array-and-fini_array.patch
(rev 0)
+++ handle-ctors-dtors-via-init_array-and-fini_array.patch 2012-08-09
17:49:54 UTC (rev 165047)
@@ -0,0 +1,67 @@
+From b6be466444740a34bacd140dccbe57f6629b15bc Mon Sep 17 00:00:00 2001
+From: H. Peter Anvin h...@zytor.com
+Date: Mon, 28 May 2012 21:28:52 -0700
+Subject: [PATCH 1/1] com32.ld: handle .init_array and .fini_array
+
+Handle constructors/destructors via .init_array and .fini_array, as
+generated by newer gccs.
+
+Signed-off-by: H. Peter Anvin h...@zytor.com
+---
+ com32/lib/com32.ld | 33 ++---
+ 1 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/com32/lib/com32.ld b/com32/lib/com32.ld
+index 37ee46c..008e4ce 100644
+--- a/com32/lib/com32.ld
b/com32/lib/com32.ld
+@@ -36,36 +36,23 @@ SECTIONS
+ .rodata1: { *(.rodata1) }
+ __rodata_end = .;
+
+- /* Ensure the __preinit_array_start label is properly aligned. We
+- could instead move the label definition inside the section, but
+- the linker would then create the section even if it turns out to
+- be empty, which isn't pretty. */
++ /*
++ * The difference betwee .ctors/.dtors and .init_array/.fini_array
++ * is the ordering, but we don't use prioritization for libcom32, so
++ * just lump them all together and hope that's okay.
++ */
+ . = ALIGN(4);
+- .preinit_array : {
+-PROVIDE (__preinit_array_start = .);
+-*(.preinit_array)
+-PROVIDE (__preinit_array_end = .);
+- }
+- .init_array : {
+-PROVIDE (__init_array_start = .);
+-*(.init_array)
+-PROVIDE (__init_array_end = .);
+- }
+- .fini_array : {
+-PROVIDE (__fini_array_start = .);
+-*(.fini_array)
+-PROVIDE (__fini_array_end = .);
+- }
+ .ctors : {
+ PROVIDE (__ctors_start = .);
+-KEEP (*(SORT(.ctors.*)))
+-KEEP (*(.ctors))
++KEEP (*(SORT(.preinit_array*)))
++KEEP (*(SORT(.init_array*)))
++KEEP (*(SORT(.ctors*)))
+ PROVIDE (__ctors_end = .);
+ }
+ .dtors : {
+ PROVIDE (__dtors_start = .);
+-KEEP (*(SORT(.dtors.*)))
+-KEEP (*(.dtors))
++KEEP (*(SORT(.fini_array*)))
++KEEP (*(SORT(.dtors*)))
+ PROVIDE (__dtors_end = .);
+ }
+
+--
+1.7.6.5
+
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Friday, December 9, 2011 @ 19:40:18
Author: thomas
Revision: 144911
upgpkg: syslinux 4.05-1 - upstream update
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch
---+
PKGBUILD | 10 +-
syslinux-dont-build-dos-windows-targets.patch |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-12-09 17:20:57 UTC (rev 144910)
+++ PKGBUILD2011-12-10 00:40:18 UTC (rev 144911)
@@ -3,8 +3,8 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=syslinux
-pkgver=4.04
-pkgrel=2
+pkgver=4.05
+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
url=http://syslinux.zytor.com/;
@@ -21,8 +21,8 @@
syslinux-dont-build-dos-windows-targets.patch
syslinux.cfg
syslinux-install_update)
-md5sums=('a3936208767eb7ced65320abe2e33a10'
- '5274062f91931eae6573f1ec3cd5b640'
+md5sums=('82299242418385da1274c9479a778cb2'
+ '1528c376e43f0eaccaa80d8ad1bc13b4'
'4dc27d8ab3802f8e50f3dda28168ce6d'
'b5b4953c0a5a01cd16441402f6321765')
@@ -33,7 +33,7 @@
# Do not try to build the Windows or DOS installers
patch -p1 -i $srcdir/syslinux-dont-build-dos-windows-targets.patch
# Fix FHS manpage path
- sed 's|/usr/man|/usr/share/man|g' -i MCONFIG
+ sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
make
}
Modified: syslinux-dont-build-dos-windows-targets.patch
===
--- syslinux-dont-build-dos-windows-targets.patch 2011-12-09 17:20:57 UTC
(rev 144910)
+++ syslinux-dont-build-dos-windows-targets.patch 2011-12-10 00:40:18 UTC
(rev 144911)
@@ -1,7 +1,7 @@
diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.0 +0200
+++ syslinux-4.02//Makefile2010-07-22 11:14:03.325522937 +0200
-@@ -55,7 +55,7 @@
+@@ -54,7 +54,7 @@
# files that depend only on the B phase, but may have to be regenerated
# for make installer.
BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Thursday, April 21, 2011 @ 08:44:04
Author: tpowa
Revision: 120229
upgpkg: syslinux 4.04-1
bump to latest version
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch
---+
PKGBUILD | 12 ++--
syslinux-dont-build-dos-windows-targets.patch |2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-21 09:45:12 UTC (rev 120228)
+++ PKGBUILD2011-04-21 12:44:04 UTC (rev 120229)
@@ -3,8 +3,8 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=syslinux
-pkgver=4.03
-pkgrel=4
+pkgver=4.04
+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
url=http://syslinux.zytor.com/;
@@ -21,10 +21,10 @@
syslinux-dont-build-dos-windows-targets.patch
syslinux.cfg
syslinux-install_update)
-sha256sums=('c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38'
-'7e9301e37113d8bcddadc3a7d2fd6f3f433ef20ef6fa6df9fe9e256fa8868753'
-'b4ba8f9daa67ec35da6e05adb610469bc8c4facf488468c1ec3e5860ba75313d'
-'49573a3b65362326c8b1e9bfa49e83225e0bf9d3710454de4070abc9481c614c')
+md5sums=('a3936208767eb7ced65320abe2e33a10'
+ '5274062f91931eae6573f1ec3cd5b640'
+ '5ad0a9cccd60ada4fd5a93380c76d5df'
+ 'b5b4953c0a5a01cd16441402f6321765')
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 2011-04-21 09:45:12 UTC
(rev 120228)
+++ syslinux-dont-build-dos-windows-targets.patch 2011-04-21 12:44:04 UTC
(rev 120229)
@@ -5,7 +5,7 @@
# files that depend only on the B phase, but may have to be regenerated
# for make installer.
BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
-- libinstaller dos win32 win64 dosutil
+- diag libinstaller dos win32 win64 dosutil
+ libinstaller
ITARGET =
IOBJECTS = $(ITARGET) \
[arch-commits] Commit in syslinux/trunk (2 files)
Date: Thursday, July 22, 2010 @ 05:33:39
Author: thomas
Revision: 85910
Update to 4.02 and clean up the PKGBUILD
Added:
syslinux/trunk/syslinux-dont-build-dos-windows-targets.patch
Modified:
syslinux/trunk/PKGBUILD
---+
PKGBUILD | 24 +---
syslinux-dont-build-dos-windows-targets.patch | 12
2 files changed, 29 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-07-22 09:25:54 UTC (rev 85909)
+++ PKGBUILD2010-07-22 09:33:39 UTC (rev 85910)
@@ -3,7 +3,7 @@
# Maintainer: Tobias Powalowski tp...@archlinux.org
pkgname=syslinux
-pkgver=4.01
+pkgver=4.02
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc=Collection of flexible boot loaders that boot from FAT, ext2/3/4 and
btrfs filesystems, from CDs and via PXE
@@ -15,13 +15,23 @@
'mtools: For mkdiskimage and syslinux'
)
makedepends=('nasm')
-source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('e3cd5cbb60469e1cd614727dda76cc0c68b882da31b0222a71ecbb51f5fa09f6')
+source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2
+syslinux-dont-build-dos-windows-targets.patch)
+sha256sums=('95cfc459954c3b3660e3c03f8cf9553955affaa1348bd9aa3dca65fb5435337f'
+'7e9301e37113d8bcddadc3a7d2fd6f3f433ef20ef6fa6df9fe9e256fa8868753')
build() {
- LDFLAGS=
+ # Do not try to build syslinux with our default LDFLAGS, it will fail
+ unset LDFLAGS
cd $srcdir/$pkgname-${pkgver}
- sed -i -e 's#win32/syslinux.exe##g' Makefile
- make || return 1
- make SBINDIR=$pkgdir/usr/sbin BINDIR=$pkgdir/usr/bin
INCDIR=$pkgdir/usr/include MANDIR=$pkgdir/usr/share/man
AUXDIR=$pkgdir/usr/lib/syslinux install
+ # Do not try to build the Windows or DOS installers
+ patch -p1 -i $srcdir/syslinux-dont-build-dos-windows-targets.patch
+ # Fix FHS manpage path
+ sed 's|/usr/man|/usr/share/man|g' -i MCONFIG
+ make
}
+
+package() {
+ cd $srcdir/$pkgname-${pkgver}
+ make INSTALLROOT=$pkgdir AUXDIR=/usr/lib/syslinux install
+}
Added: syslinux-dont-build-dos-windows-targets.patch
===
--- syslinux-dont-build-dos-windows-targets.patch
(rev 0)
+++ syslinux-dont-build-dos-windows-targets.patch 2010-07-22 09:33:39 UTC
(rev 85910)
@@ -0,0 +1,12 @@
+diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
+--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.0 +0200
syslinux-4.02//Makefile2010-07-22 11:14:03.325522937 +0200
+@@ -55,7 +55,7 @@
+ # files that depend only on the B phase, but may have to be regenerated
+ # for make installer.
+ BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
+- libinstaller dos win32 win64 dosutil
++ libinstaller
+ ITARGET =
+ IOBJECTS = $(ITARGET) \
+ utils/gethostip utils/isohybrid utils/mkdiskimage \
