ports

zandra's ports tree
git clone git://zandra.org/ports
Log | Files | Refs | README | LICENSE

commit 42b062d921f8e6eedeed52e836c92ecf036dc81e
parent 81cf63f9bf16c312301320ae7a7b07c553b14ad3
Author: darklands <darklands@zandra.xyz>
Date:   Fri, 24 Apr 2020 23:27:31 -0400

Bump extlinux

Diffstat:
Mextlinux/checksums | 2+-
Mextlinux/extlinux.conf | 6+++---
Mextlinux/extlinux.mk | 34+++++++++++++++++-----------------
Mextlinux/mkfile | 6++++--
Aextlinux/musl-build.patch | 11+++++++++++
Mextlinux/v.mk | 2+-
6 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/extlinux/checksums b/extlinux/checksums @@ -1 +1 @@ -919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f syslinux-6.02.tar.xz +dd2b2916962b9e93bc1e714182e3ca2a727a229b8afabe913050bcfdd43ee2af51ee3acf79121d8c20caf434583efaa7f3196871e0e07c04d82191323a50fe31 syslinux-6.03.tar.xz diff --git a/extlinux/extlinux.conf b/extlinux/extlinux.conf @@ -1,8 +1,8 @@ -DEFAULT morpheus +DEFAULT zandra PROMPT 1 TIMEOUT 50 -LABEL morpheus - MENU LABEL Morpheus +LABEL zandra + MENU LABEL Zandra LINUX /boot/bzImage APPEND root=/dev/sda1 rootwait ro diff --git a/extlinux/extlinux.mk b/extlinux/extlinux.mk @@ -1,17 +1,18 @@ -BIN = extlinux +BIN = ../extlinux OBJ = bootsect_bin.o ldlinux_bin.o ldlinuxc32_bin.o \ - ../libinstaller/syslxcom.o \ - ../libinstaller/syslxopt.o \ - ../libinstaller/syslxmod.o \ - ../libinstaller/setadv.o \ - ../libinstaller/advio.o \ - ../extlinux/main.o \ - ../extlinux/mountinfo.o + libinstaller/syslxcom.o \ + libinstaller/fs.o \ + libinstaller/syslxopt.o \ + libinstaller/syslxmod.o \ + libinstaller/setadv.o \ + libinstaller/advio.o \ + extlinux/main.o \ + extlinux/mountinfo.o -INSTALL_BIN = extlinux -INSTALL_OTHER1 = ../../extlinux.conf +INSTALL_BIN = ../extlinux +INSTALL_OTHER1 = ../extlinux.conf INSTALL_OTHER1_DIR = /boot -LOCAL_CFLAGS = -I../libinstaller -I../extlinux -I../bios -D_FILE_OFFSET_BITS=64 +LOCAL_CFLAGS = -Ilibinstaller -Iextlinux -Ibios -D_FILE_OFFSET_BITS=64 DEPS = e2fsprogs <$mkbuild/mk.common @@ -20,14 +21,13 @@ CPPFLAGS = bin2c:Q: echo "CC $target" - $HOSTCC -static -o $target ../../bin2c.c + $HOSTCC -static -o $target ../bin2c.c bootsect_bin.c:Q: bin2c - ./bin2c ../bios/core/ldlinux.bss $target syslinux_bootsect + ./bin2c bios/core/ldlinux.bss $target syslinux_bootsect ldlinux_bin.c:Q: bin2c - ./bin2c ../bios/core/ldlinux.sys $target syslinux_ldlinux 512 + ./bin2c bios/core/ldlinux.sys $target syslinux_ldlinux 512 ldlinuxc32_bin.c:Q: bin2c - ./bin2c ../bios/com32/elflink/ldlinux/ldlinux.c32 $target syslinux_ldlinuxc32 - -extlinux: $OBJ + ./bin2c bios/com32/elflink/ldlinux/ldlinux.c32 $target syslinux_ldlinuxc32 +../extlinux: $OBJ diff --git a/extlinux/mkfile b/extlinux/mkfile @@ -1,6 +1,8 @@ <$mkbuild/mk.3rdparty <v.mk -src = syslinux-$v/build +src = syslinux-$v url = https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-$v.tar.xz -mkfile = ../../extlinux.mk +mkfile = ../extlinux.mk +patches = \ + ../musl-build.patch diff --git a/extlinux/musl-build.patch b/extlinux/musl-build.patch @@ -0,0 +1,11 @@ +diff -uri syslinux-6.03/extlinux/main.c patched/extlinux/main.c +--- syslinux-6.03/extlinux/main.c 2020-04-24 23:10:40.025957811 -0400 ++++ patched/extlinux/main.c 2020-04-24 23:14:39.215954533 -0400 +@@ -38,6 +38,7 @@ + #include <sysexits.h> + #include <sys/ioctl.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/mount.h> + #include <sys/vfs.h> diff --git a/extlinux/v.mk b/extlinux/v.mk @@ -1 +1 @@ -v = 6.02 +v = 6.03