[arch-commits] Commit in syslinux/trunk (4 files)
Date: Monday, October 13, 2014 @ 21:26:09
Author: anatolik
Revision: 224295
redo/simplify PKGBUILD
Modified:
syslinux/trunk/PKGBUILD
syslinux/trunk/syslinux-install_update
syslinux/trunk/syslinux.cfg
syslinux/trunk/syslinux.install
-+
PKGBUILD| 301 --
syslinux-install_update |6
syslinux.cfg|6
syslinux.install| 43 ++
4 files changed, 77 insertions(+), 279 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-13 18:43:50 UTC (rev 224294)
+++ PKGBUILD2014-10-13 19:26:09 UTC (rev 224295)
@@ -1,27 +1,25 @@
-# Maintainer : Tobias Powalowski tp...@archlinux.org
-# Maintainer : Thomas Bächler tho...@archlinux.org
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+# Maintainer: Thomas Bächler tho...@archlinux.org
+# Maintainer: Anatol Pomozov anatol.pomo...@gmail.com
# Contributor: Keshav Amburay (the ddoott ridikulus ddoott rat) (aatt)
(gemmaeiil) (ddoott) (ccoomm)
-## 1 to enable IA32-EFI build in Arch x86_64, 0 to disable
-_IA32_EFI_IN_ARCH_X64=1
-
-_VER=6.03
-_GIT_TAG=syslinux-${_VER}
-
-pkgname=syslinux
-pkgver=${_VER/-/}
-pkgrel=1
-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/;
-license=('GPL2')
-options=('!makeflags' '!emptydirs')
-backup=('boot/syslinux/syslinux.cfg')
-makedepends=('git' 'python2' 'nasm' 'ncurses')
-if [[ $CARCH == x86_64 ]]; then
- makedepends+=('lib32-glibc')
+pkgname=syslinux
+pkgver=6.03
+_tag=syslinux-$pkgver
+pkgrel=2
+pkgdesc='Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs
filesystems, from CDs and via PXE'
+url='http://www.syslinux.org/'
+arch=(i686 x86_64)
+backup=(boot/syslinux/syslinux.cfg)
+install=syslinux.install
+license=(GPL2)
+# syslinux build system is a mess of submakes that does not work with -jN
+options=(!makeflags)
+makedepends=(git python2 nasm upx asciidoc)
+if [[ $CARCH == x86_64 ]]; then
+ # efi32 needs it
+ makedepends+=(lib32-glibc)
fi
-depends=('glibc')
optdepends=('perl-passwd-md5: For md5pass'
'perl-digest-sha1: For sha1pass'
'mtools: For mkdiskimage and syslinux support'
@@ -29,243 +27,56 @@
'util-linux: For isohybrid'
'efibootmgr: For EFI support'
'dosfstools: For EFI support')
-install=${pkgname}.install
-source=(${pkgname}::git+http://git.zytor.com/syslinux/syslinux.git#tag=${_GIT_TAG};
-
gnu-efi::git+http://git.code.sf.net/p/gnu-efi/code#commit=3c62e78556aea01e9798380cd46794c6ca09d4bd;
-'syslinux.cfg'
-'syslinux-install_update')
-md5sums=('SKIP'
- 'SKIP'
- '46ca150f53322ff8f1597d9a342f7e40'
- '9376f18fa3e42fc36cffa4cff0a84c09')
+# The syslinux-install_update script is maintained at
https://gist.github.com/pyther/772138
+# Script not yet updated for syslinux-efi
+source=(git://git.kernel.org/pub/scm/boot/syslinux/syslinux.git#tag=$_tag
+syslinux.cfg
+syslinux-install_update)
+sha1sums=('SKIP'
+ '0640bd89e2ba609bab20db671e14f74e26554873'
+ '15db7e99259bed1c88907d0561f1af4174d1cc65')
-_pkgver() {
-cd ${srcdir}/${pkgname}/
-echo $(git describe --tags) | sed -e 's|syslinux-||g' -e 's|-pre|pre|g'
-e 's|-|.|g'
-}
+_targets='bios efi32'
+case $CARCH in
+ x86_64) _targets+=' efi64' ;;
+esac
prepare() {
-
-mv ${srcdir}/${pkgname} ${srcdir}/${pkgname}-${pkgver}/
-cd ${srcdir}/${pkgname}-${pkgver}/
-
-msg Run git clean
-git clean -x -d -f
-
-msg Do not try to build the Windows or DOS installers and DIAG files
-sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g'
-i ${srcdir}/${pkgname}-${pkgver}/Makefile || true
-sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i
${srcdir}/${pkgname}-${pkgver}/Makefile || true
-sed 's|dosutil/*.com dosutil/*.sys||g' -i
${srcdir}/${pkgname}-${pkgver}/Makefile || true
-sed 's|dos/syslinux.com||g' -i ${srcdir}/${pkgname}-${pkgver}/Makefile
|| true
-sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32
utils|g' -i ${srcdir}/${pkgname}-${pkgver}/Makefile || true
-sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|#
install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i
${srcdir}/${pkgname}-${pkgver}/Makefile || true
-sed 's|-include $(MAKEDIR)/devel.mk||g' -i
${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk || true
-
-msg Fix FHS manpage path
-sed 's|/usr/man|/usr/share/man|g' -i
${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk || true
-
-cd ${srcdir}/gnu-efi/
-
-msg Run git clean for gnu-efi
-git clean -x -d -f
-
-msg Revert gnu-efi Makefile 'make install' problamatic commit
-git revert --no-commit
[arch-commits] Commit in syslinux/trunk (4 files)
Date: Monday, October 6, 2014 @ 20:45:45
Author: anatolik
Revision: 223931
upgpkg: syslinux 6.03-1
Modified:
syslinux/trunk/PKGBUILD
Deleted:
syslinux/trunk/syslinux-6.02-fix-bios-isolinux.patch
syslinux/trunk/syslinux-6.02-fix-chainloading.patch
syslinux/trunk/syslinux-6.02-fix-efi-ovmf.patch
---+
PKGBUILD |2
syslinux-6.02-fix-bios-isolinux.patch | 12
syslinux-6.02-fix-chainloading.patch | 47 --
syslinux-6.02-fix-efi-ovmf.patch | 621
4 files changed, 1 insertion(+), 681 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-06 16:22:25 UTC (rev 223930)
+++ PKGBUILD2014-10-06 18:45:45 UTC (rev 223931)
@@ -5,7 +5,7 @@
## 1 to enable IA32-EFI build in Arch x86_64, 0 to disable
_IA32_EFI_IN_ARCH_X64=1
-_VER=6.03-pre20
+_VER=6.03
_GIT_TAG=syslinux-${_VER}
pkgname=syslinux
Deleted: syslinux-6.02-fix-bios-isolinux.patch
===
--- syslinux-6.02-fix-bios-isolinux.patch 2014-10-06 16:22:25 UTC (rev
223930)
+++ syslinux-6.02-fix-bios-isolinux.patch 2014-10-06 18:45:45 UTC (rev
223931)
@@ -1,12 +0,0 @@
-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
Deleted: syslinux-6.02-fix-chainloading.patch
===
--- syslinux-6.02-fix-chainloading.patch2014-10-06 16:22:25 UTC (rev
223930)
+++ syslinux-6.02-fix-chainloading.patch2014-10-06 18:45:45 UTC (rev
223931)
@@ -1,47 +0,0 @@
-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;
Deleted: syslinux-6.02-fix-efi-ovmf.patch
===
--- syslinux-6.02-fix-efi-ovmf.patch2014-10-06 16:22:25 UTC (rev 223930)
+++ syslinux-6.02-fix-efi-ovmf.patch2014-10-06 18:45:45 UTC (rev 223931)
@@ -1,621 +0,0 @@
-The value of the field rva_and_sizes_nr is used by OVMF to check the
-consistency of the PE file with respect to the field optional_hdr_sz. It
-now have the right value.
-
-Signed-off-by: Celelibi celelibi at gmail.com
- efi/wrapper.c | 6 +++---
- efi/wrapper.h | 28
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/efi/wrapper.c b/efi/wrapper.c
-index 04c895f..ec77271 100644
a/efi/wrapper.c
-+++ b/efi/wrapper.c
-@@ -102,7 +102,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t
data_size,
- e_hdr.image_sz = total_sz;
- e_hdr.headers_sz = 512;
- e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
-- e_hdr.rva_and_sizes_nr = 1;
-+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) /
sizeof(__uint64_t);
- fwrite(e_hdr, sizeof(e_hdr), 1, f);
- }
- else if (class == ELFCLASS64) {
-@@ -130,7 +130,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t
data_size,
- e_hdr_pe32p.image_sz = total_sz;
- e_hdr_pe32p.headers_sz = 512;
- e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
-- e_hdr_pe32p.rva_and_sizes_nr = 1;
-+
