wip: build

Change-Id: I89af44f12b4911c1106ddd58e1a80d11117b1591
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>

diff --git a/Makefile b/Makefile
index fb387c5..4dd98a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # Main Makefile for SYSLINUX
 #
 
-all_firmware := bios efi32 efi64
+all_firmware := bios
 
 #
 # topdir is only set when we are doing a recursive make. Do a bunch of

diff --git a/efi/Makefile b/efi/Makefile
index d5443bd..6df7cd5 100644 (file)
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -101,7 +101,7 @@ tidy dist:
        rm -f *.so *.o wrapper
        find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \
                xargs -0r rm -f
-       $(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
+       -$(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
 
 clean: tidy
 

diff --git a/mk/efi.mk b/mk/efi.mk
index f097ad2..8a53b95 100644 (file)
--- a/mk/efi.mk
+++ b/mk/efi.mk
@@ -48,7 +48,9 @@ LIBEFI = $(objdir)/lib/libefi.a
 
 $(LIBEFI):
        @echo Building gnu-efi for $(EFI_SUBARCH)
-       $(topdir)/efi/check-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
+       $(topdir)/efi/check-gnu-efi.sh $(EFI_SUBARCH) $(objdir) \
+       || $(topdir)/efi/build-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
+
 
 %.o: %.S       # Cancel old rule
 

diff --git a/packaging/syslinux.spec b/packaging/syslinux.spec
index f66156b..56746dd 100644 (file)
--- a/packaging/syslinux.spec
+++ b/packaging/syslinux.spec
@@ -1,3 +1,4 @@
+# -*- rpm -*-
 Summary: Kernel loader which uses a FAT, ext2/3 or iso9660 filesystem or a PXE network
 Name: syslinux
 Version: 6.03
@@ -67,16 +68,22 @@ booting in the /var/lib/tftpboot directory.
 
 %build
 cp %{SOURCE1001} .
-make CC='%{my_cc}' %{?_smp_mflags} clean
-make CC='%{my_cc}' %{?_smp_mflags}
+#touch efi/tiny
+#make CC='%{my_cc}' %{?_smp_mflags} clean
+touch efi/tiny
+make CC='%{my_cc}' -j1 \
+    all_firmware=bios
 
 %install
 rm -rf %{buildroot}
-make CC='%{my_cc}' install-all \
+
+make \
+    CC='%{my_cc}' install \
        INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
        LIBDIR=%{_libdir} DATADIR=%{_datadir} \
        MANDIR=%{_mandir} INCDIR=%{_includedir} \
-       TFTPBOOT=/var/lib/tftpboot EXTLINUXDIR=/boot/extlinux
+       TFTPBOOT=/var/lib/tftpboot EXTLINUXDIR=/boot/extlinux \
+    all_firmware=bios
 
 %clean
 rm -rf %{buildroot}
@@ -107,12 +114,12 @@ rm -rf %{buildroot}
 %manifest syslinux.manifest
 %defattr(-,root,root)
 %{_sbindir}/extlinux
-/boot/extlinux
+#/boot/extlinux
 
 %files tftpboot
 %manifest syslinux.manifest
 %defattr(-,root,root)
-/var/lib/tftpboot
+#/var/lib/tftpboot
 
 %post extlinux
 # If we have a /boot/extlinux.conf file, assume extlinux is our bootloader