update to 6.03 [release 6.03-1mamba;Thu Oct 30 2014]

This commit is contained in:
Silvan Calarco 2024-01-05 18:17:50 +01:00
parent 5ad9eb011f
commit 810c03482d
2 changed files with 32 additions and 22 deletions

View File

@ -1,10 +0,0 @@
--- syslinux-4.06/Makefile.orig 2013-01-24 01:39:42.513967399 +0000
+++ syslinux-4.06/Makefile 2013-01-24 01:40:35.714396971 +0000
@@ -43,7 +43,6 @@
mbr/*.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
gpxe/gpxelinux.0 dos/syslinux.com \
- win32/syslinux.exe \
dosutil/*.com dosutil/*.sys \
$(MODULES)

View File

@ -1,15 +1,14 @@
Name: syslinux Name: syslinux
Version: 6.03
Epoch: 1 Epoch: 1
Version: 4.06 Release: 1mamba
Release: 2mamba
Summary: A boot loader for the Linux operating system for MSDOS/FAT filesystems Summary: A boot loader for the Linux operating system for MSDOS/FAT filesystems
Group: System/Kernel and Hardware Group: System/Kernel and Hardware
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://syslinux.zytor.com/ URL: http://syslinux.zytor.com/
Source: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 Source: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.xz
Patch0: syslinux-4.06-build-without-mingw32.patch
License: GPL License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
@ -19,8 +18,10 @@ BuildRequires: perl-Digest-SHA1
BuildRequires: perl-Crypt-PasswdMD5 BuildRequires: perl-Crypt-PasswdMD5
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
%if "%{stage1}" != "1" %if "%{stage1}" != "1"
%ifnarch x86_64
BuildRequires: cross-mingw32-toolchain BuildRequires: cross-mingw32-toolchain
%endif %endif
%endif
BuildRequires: nasm >= 0.98.39 BuildRequires: nasm >= 0.98.39
BuildRequires: upx BuildRequires: upx
Provides: bootloader Provides: bootloader
@ -31,6 +32,13 @@ SYSLINUX can be used, when properly set up, to completely eliminate the need for
%prep %prep
%setup -q %setup -q
# ld.gold has problems with boot loaders
ld -v | grep "gold" && {
echo "Error: ld GOLD detected, which is incompatible with syslinux. Aborting."
exit 1
}
# Disable win64 installer (requires mingw64) # Disable win64 installer (requires mingw64)
sed -i "s|win64/syslinux64.exe||" Makefile sed -i "s|win64/syslinux64.exe||" Makefile
%if "%{stage1}" == "1" %if "%{stage1}" == "1"
@ -38,15 +46,13 @@ sed -i "s|win32/syslinux.exe||" Makefile
%endif %endif
%build %build
%ifarch x86_64 # NOTE: disabling icecream or it fails
make -j1 %ifnarch x86_64
make -j1 CC=%{_bindir}/gcc all_firmware="bios efi32"
%else %else
%make make -j1 CC=%{_bindir}/gcc
%endif %endif
#cd menu
#% make
%install %install
[ "%{buildroot}" != / ] && rm -rf %{buildroot} [ "%{buildroot}" != / ] && rm -rf %{buildroot}
%makeinstall INSTALLROOT=%{buildroot} MANDIR=%{_mandir} %makeinstall INSTALLROOT=%{buildroot} MANDIR=%{_mandir}
@ -77,14 +83,28 @@ make -j1
#%doc BUGS COPYING NEWS README TODO #%doc BUGS COPYING NEWS README TODO
%{_mandir}/man1/extlinux.1* %{_mandir}/man1/extlinux.1*
%{_mandir}/man1/gethostip.1* %{_mandir}/man1/gethostip.1*
%{_mandir}/man1/isohybrid.1*
%{_mandir}/man1/lss16toppm.1* %{_mandir}/man1/lss16toppm.1*
%{_mandir}/man1/memdiskfind.1*
%{_mandir}/man1/ppmtolss16.1* %{_mandir}/man1/ppmtolss16.1*
%{_mandir}/man1/syslinux.1* %{_mandir}/man1/syslinux.1*
%{_mandir}/man1/syslinux2ansi.1* %{_mandir}/man1/syslinux2ansi.1*
%changelog %changelog
* Mon Aug 12 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 4.06-2mamba * Thu Oct 30 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 6.03-1mamba
- revert to version 4, 5.x doesn't work for me - update to 6.03
* Sun Aug 11 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 5.10-2mamba
- rebuilt with ld (bfd), added check
* Sun Jun 09 2013 Automatic Build System <autodist@mambasoft.it> 5.10-1mamba
- automatic version update by autodist
* Sat Feb 02 2013 Automatic Build System <autodist@mambasoft.it> 5.01-1mamba
- automatic version update by autodist
* Mon Jan 07 2013 Automatic Build System <autodist@mambasoft.it> 5.00-1mamba
- automatic version update by autodist
* Wed Oct 24 2012 Automatic Build System <autodist@mambasoft.it> 4.06-1mamba * Wed Oct 24 2012 Automatic Build System <autodist@mambasoft.it> 4.06-1mamba
- automatic version update by autodist - automatic version update by autodist