diff --git a/system/boot/syslinux/actions.py b/system/boot/syslinux/actions.py index 510b13c514..e96d624204 100644 --- a/system/boot/syslinux/actions.py +++ b/system/boot/syslinux/actions.py @@ -14,33 +14,24 @@ datadir = "/usr/lib/syslinux" NoStrip = ["/sbin", "/usr/lib"] +pisitools.flags.remove("-fPIC") + def build(): + # shelltools.export("CFLAGS", "-Werror -Wno-unused -finline-limit=2000") shelltools.export("CFLAGS", get.CFLAGS()) shelltools.export("LDFLAGS", "") - # do not swallow efi compilation output to make debugging easier - shelltools.system("sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh") - - # disable debug and development flags to reduce bootloader size - shelltools.system("truncate --size 0 mk/devel.mk") - autotools.make("-j1 PYTHON=python bios efi64 efi32") + autotools.make('DATE="PisiLinux" spotless') + autotools.make('DATE="PisiLinux"') + # autotools.make('DATE="PARDUS" installer') + # autotools.make('DATE="PARDUS" -C sample tidy') def install(): autotools.rawInstall('INSTALLROOT=%s MANDIR="/usr/share/man" AUXDIR="/usr/lib/syslinux"' % get.installDIR()) + for f in tools: + pisitools.insinto(datadir, "utils/"+f) - pisitools.removeDir("/usr/lib/syslinux/com32") - pisitools.removeDir("/usr/lib/syslinux/dosutil") - pisitools.remove("/usr/lib/syslinux/syslinux.com") - - # pisitools.dodir("/usr/lib/syslinux/bios") - - # pisitools.domove("/usr/lib/syslinux/*.c32", "/usr/lib/syslinux/bios") - # pisitools.domove("/usr/lib/syslinux/*.bin", "/usr/lib/syslinux/bios") - # pisitools.domove("/usr/lib/syslinux/*.0", "/usr/lib/syslinux/bios") - # pisitools.domove("/usr/lib/syslinux/memdisk", "/usr/lib/syslinux/bios") - - #for f in tools: - # pisitools.insinto(datadir, "utils/"+f) - + #pisitools.domove("/usr/lib/syslinux/libutil_com.c32","/usr/lib/syslinux/com32/libutil") + #pisitools.domove("/usr/lib/syslinux/libcom32.c32","/usr/lib/syslinux/com32/lib") pisitools.dodoc("README", "NEWS", "doc/*.txt", "doc/logo/LICENSE") pisitools.remove("/usr/bin/gethostip") diff --git a/system/boot/syslinux/pspec.xml b/system/boot/syslinux/pspec.xml index 918e2e45b1..c959891c68 100644 --- a/system/boot/syslinux/pspec.xml +++ b/system/boot/syslinux/pspec.xml @@ -13,21 +13,14 @@ app:console SysLinux, IsoLinux and PXELinux bootloader Lightweight bootloaders for floppy media (SYSLINUX), network booting (PXELINUX), and bootable "El Torito" CD-ROMs (ISOLINUX). The project also includes MEMDISK, a tool to boot legacy operating systems (such as DOS) from nontraditional media; it is usually used in conjunction with PXELINUX and ISOLINUX. - https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.03.tar.xz + https://www.kernel.org/pub/linux/utils/boot/syslinux/4.xx/syslinux-4.07.tar.xz nasm - glibc-32bit - asciidoc - efibootmgr-devel - libutil-linux-devel - 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch - 0035-SYSAPPEND-Fix-space-stripping.patch - gcc-fix-alignment.patch - dont-guess-alignment.patch - btrfs-fix.patch + nopie.patch + fixisohybrid.patch @@ -35,12 +28,7 @@ syslinux mtools - libutil-linux - mtools - efibootmgr - util-linux - dosfstools - gptfdisk + libutil-linux perl-Crypt-PasswdMD5 perl-Digest-SHA1 @@ -54,14 +42,13 @@ pisi-iso/isolinux.cfg pisi-iso/background.png - - 2016-04-02 - 6.03 + 2014-06-14 + 4.07 First release Alihan Öztürk alihan@pisilinux.org