mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 10:01:32 +02:00
chore(sys-boot/syslinux): move into portage-stable
This commit is contained in:
parent
252e1d5418
commit
1813578e88
@ -1,2 +0,0 @@
|
|||||||
DIST syslinux-3.83.tar.bz2 3184349 RMD160 b4cff023c44a421a5f788f4cf556b537986117f9 SHA1 0dbbdd5a36362ce0e3284d9f4047a355d527d5d0 SHA256 9ec84d6dcc188f082a875b69796b196f98ea8c0102b55b03123616a285c2d9f9
|
|
||||||
DIST syslinux-4.03.tar.bz2 4381187 RMD160 11dcf7d0bf58dd8cb4fc573212f9206bfb81a472 SHA1 24e260facca404f075485a635f0ddffd6f97fd1a SHA256 c65567e324f9d1f7f794ae8f9578a0292bbd47d7b8d895a004d2f0152d0bda38
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -ur a/com32/MCONFIG b/com32/MCONFIG
|
|
||||||
--- a/com32/MCONFIG 2008-09-26 01:46:02.000000000 +0200
|
|
||||||
+++ b/com32/MCONFIG 2008-10-28 16:10:16.107964907 +0100
|
|
||||||
@@ -19,6 +19,8 @@
|
|
||||||
GCCOPT := $(call gcc_ok,-std=gnu99,) \
|
|
||||||
$(call gcc_ok,-m32,) \
|
|
||||||
$(call gcc_ok,-fno-stack-protector,) \
|
|
||||||
+ $(call gcc_ok,-nopie,) \
|
|
||||||
+ $(call gcc_ok,-fno-pie,) \
|
|
||||||
-mregparm=3 -DREGPARM=3 -march=i386 -Os
|
|
||||||
|
|
||||||
com32 = $(topdir)/com32
|
|
@ -1,36 +0,0 @@
|
|||||||
diff -ur a/linux/Makefile b/linux/Makefile
|
|
||||||
--- a/linux/Makefile 2008-09-26 01:46:02.000000000 +0200
|
|
||||||
+++ b/linux/Makefile 2008-10-28 15:56:25.818399544 +0100
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
OPTFLAGS = -g -Os
|
|
||||||
INCLUDES = -I. -I.. -I../libinstaller
|
|
||||||
CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
||||||
-LDFLAGS = -s
|
|
||||||
+LDFLAGS =
|
|
||||||
|
|
||||||
SRCS = syslinux.c \
|
|
||||||
../libinstaller/syslxmod.c \
|
|
||||||
diff -ur a/mtools/Makefile b/mtools/Makefile
|
|
||||||
--- a/mtools/Makefile 2008-09-26 01:46:02.000000000 +0200
|
|
||||||
+++ b/mtools/Makefile 2008-10-28 15:56:45.113477480 +0100
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
OPTFLAGS = -g -Os
|
|
||||||
INCLUDES = -I. -I.. -I../libfat -I../libinstaller
|
|
||||||
CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
||||||
-LDFLAGS = -s
|
|
||||||
+LDFLAGS =
|
|
||||||
|
|
||||||
SRCS = syslinux.c \
|
|
||||||
../libinstaller/syslxmod.c \
|
|
||||||
diff -ur a/utils/Makefile b/utils/Makefile
|
|
||||||
--- a/utils/Makefile 2008-09-26 01:46:02.000000000 +0200
|
|
||||||
+++ b/utils/Makefile 2008-10-28 15:56:55.843968018 +0100
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
include $(topdir)/MCONFIG
|
|
||||||
|
|
||||||
CFLAGS = -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
|
|
||||||
-LDFLAGS = -O2 -s
|
|
||||||
+LDFLAGS = -O2
|
|
||||||
|
|
||||||
TARGETS = mkdiskimage isohybrid gethostip
|
|
||||||
ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi
|
|
@ -1,155 +0,0 @@
|
|||||||
diff -U5 -r syslinux-3.82-orig/core/diskstart.inc syslinux-3.82/core/diskstart.inc
|
|
||||||
--- syslinux-3.82-orig/core/diskstart.inc 2009-06-09 10:19:25.000000000 -0700
|
|
||||||
+++ syslinux-3.82/core/diskstart.inc 2009-06-17 17:49:03.000000000 -0700
|
|
||||||
@@ -506,12 +506,12 @@
|
|
||||||
sti ; In case of broken INT 13h BIOSes
|
|
||||||
|
|
||||||
;
|
|
||||||
; Tell the user we got this far
|
|
||||||
;
|
|
||||||
- mov si,syslinux_banner
|
|
||||||
- call writestr_early
|
|
||||||
+ ;mov si,syslinux_banner
|
|
||||||
+ ;call writestr_early
|
|
||||||
|
|
||||||
;
|
|
||||||
; Tell the user if we're using EBIOS or CBIOS
|
|
||||||
;
|
|
||||||
print_bios:
|
|
||||||
@@ -519,11 +519,11 @@
|
|
||||||
cmp byte [getlinsec.jmp+1],(getlinsec_ebios-(getlinsec.jmp+2))
|
|
||||||
jne .cbios
|
|
||||||
mov si,ebios_name
|
|
||||||
.cbios:
|
|
||||||
mov [BIOSName],si
|
|
||||||
- call writestr_early
|
|
||||||
+ ;call writestr_early
|
|
||||||
|
|
||||||
section .bss
|
|
||||||
%define HAVE_BIOSNAME 1
|
|
||||||
BIOSName resw 1
|
|
||||||
|
|
||||||
@@ -659,12 +659,12 @@
|
|
||||||
all_read:
|
|
||||||
;
|
|
||||||
; Let the user (and programmer!) know we got this far. This used to be
|
|
||||||
; in Sector 1, but makes a lot more sense here.
|
|
||||||
;
|
|
||||||
- mov si,copyright_str
|
|
||||||
- call writestr_early
|
|
||||||
+ ;mov si,copyright_str
|
|
||||||
+ ;call writestr_early
|
|
||||||
|
|
||||||
|
|
||||||
;
|
|
||||||
; Insane hack to expand the DOS superblock to dwords
|
|
||||||
;
|
|
||||||
diff -U5 -r syslinux-3.82-orig/core/isolinux.asm syslinux-3.82/core/isolinux.asm
|
|
||||||
--- syslinux-3.82-orig/core/isolinux.asm 2009-06-09 10:19:25.000000000 -0700
|
|
||||||
+++ syslinux-3.82/core/isolinux.asm 2009-06-17 17:49:03.000000000 -0700
|
|
||||||
@@ -284,18 +284,18 @@
|
|
||||||
mov [BIOSType],si
|
|
||||||
mov eax,[si]
|
|
||||||
mov [GetlinsecPtr],eax
|
|
||||||
|
|
||||||
; Show signs of life
|
|
||||||
- mov si,syslinux_banner
|
|
||||||
- call writestr_early
|
|
||||||
+ ;mov si,syslinux_banner
|
|
||||||
+ ;call writestr_early
|
|
||||||
%ifdef DEBUG_MESSAGES
|
|
||||||
- mov si,copyright_str
|
|
||||||
+ ;mov si,copyright_str
|
|
||||||
%else
|
|
||||||
- mov si,[BIOSName]
|
|
||||||
+ ;mov si,[BIOSName]
|
|
||||||
%endif
|
|
||||||
- call writestr_early
|
|
||||||
+ ;call writestr_early
|
|
||||||
|
|
||||||
;
|
|
||||||
; Before modifying any memory, get the checksum of bytes
|
|
||||||
; 64-2048
|
|
||||||
;
|
|
||||||
@@ -679,17 +679,17 @@
|
|
||||||
.norge: jmp short .norge
|
|
||||||
|
|
||||||
; Information message (DS:SI) output
|
|
||||||
; Prefix with "isolinux: "
|
|
||||||
;
|
|
||||||
-writemsg: push ax
|
|
||||||
- push si
|
|
||||||
- mov si,isolinux_str
|
|
||||||
- call writestr_early
|
|
||||||
- pop si
|
|
||||||
- call writestr_early
|
|
||||||
- pop ax
|
|
||||||
+writemsg: ;push ax
|
|
||||||
+ ;push si
|
|
||||||
+ ;mov si,isolinux_str
|
|
||||||
+ ;call writestr_early
|
|
||||||
+ ;pop si
|
|
||||||
+ ;call writestr_early
|
|
||||||
+ ;pop ax
|
|
||||||
ret
|
|
||||||
|
|
||||||
;
|
|
||||||
; Write a character to the screen. There is a more "sophisticated"
|
|
||||||
; version of this in the subsequent code, so we patch the pointer
|
|
||||||
diff -U5 -r syslinux-3.82-orig/core/localboot.inc syslinux-3.82/core/localboot.inc
|
|
||||||
--- syslinux-3.82-orig/core/localboot.inc 2009-06-09 10:19:25.000000000 -0700
|
|
||||||
+++ syslinux-3.82/core/localboot.inc 2009-06-17 17:49:03.000000000 -0700
|
|
||||||
@@ -27,13 +27,13 @@
|
|
||||||
local_boot:
|
|
||||||
call vgaclearmode
|
|
||||||
RESET_STACK_AND_SEGS dx ; dx <- 0
|
|
||||||
mov fs,dx
|
|
||||||
mov gs,dx
|
|
||||||
- mov si,localboot_msg
|
|
||||||
- call writestr
|
|
||||||
+ ;mov si,localboot_msg
|
|
||||||
+ ;call writestr
|
|
||||||
call cleanup_hardware
|
|
||||||
cmp ax,-1
|
|
||||||
je .int18
|
|
||||||
|
|
||||||
; Load boot sector from the specified BIOS device and jump to it.
|
|
||||||
mov dl,al
|
|
||||||
diff -U5 -r syslinux-3.82-orig/core/ui.inc syslinux-3.82/core/ui.inc
|
|
||||||
--- syslinux-3.82-orig/core/ui.inc 2009-06-09 10:19:25.000000000 -0700
|
|
||||||
+++ syslinux-3.82/core/ui.inc 2009-06-17 17:49:03.000000000 -0700
|
|
||||||
@@ -240,28 +240,28 @@
|
|
||||||
call get_msg_file
|
|
||||||
jmp short fk_wrcmd
|
|
||||||
|
|
||||||
print_version:
|
|
||||||
push di ; Command line write pointer
|
|
||||||
- mov si,syslinux_banner
|
|
||||||
- call writestr
|
|
||||||
+ ;mov si,syslinux_banner
|
|
||||||
+ ;call writestr
|
|
||||||
%ifdef HAVE_BIOSNAME
|
|
||||||
mov si,[BIOSName]
|
|
||||||
call writestr
|
|
||||||
%endif
|
|
||||||
- mov si,copyright_str
|
|
||||||
- call writestr
|
|
||||||
+ ;mov si,copyright_str
|
|
||||||
+ ;call writestr
|
|
||||||
|
|
||||||
; ... fall through ...
|
|
||||||
|
|
||||||
; Write the boot prompt and command line again and
|
|
||||||
; wait for input. Note that this expects the cursor
|
|
||||||
; to already have been CRLF'd, and that the old value
|
|
||||||
; of DI (the command line write pointer) is on the stack.
|
|
||||||
fk_wrcmd:
|
|
||||||
- mov si,boot_prompt
|
|
||||||
- call writestr
|
|
||||||
+ ;mov si,boot_prompt
|
|
||||||
+ ;call writestr
|
|
||||||
pop di ; Command line write pointer
|
|
||||||
push di
|
|
||||||
mov byte [di],0 ; Null-terminate command line
|
|
||||||
mov si,command_line
|
|
||||||
call writestr ; Write command line so far
|
|
@ -1,31 +0,0 @@
|
|||||||
diff --git syslinux-3.82-orig/core/diskstart.inc syslinux-3.82-new/core/diskstart.inc
|
|
||||||
index f7ae1da..25b7131 100644
|
|
||||||
--- syslinux-3.82-orig/core/diskstart.inc
|
|
||||||
+++ syslinux-3.82-new/core/diskstart.inc
|
|
||||||
@@ -510,6 +510,7 @@ ldlinux_ent:
|
|
||||||
;
|
|
||||||
;mov si,syslinux_banner
|
|
||||||
;call writestr_early
|
|
||||||
+ call disable_cursor
|
|
||||||
|
|
||||||
;
|
|
||||||
; Tell the user if we're using EBIOS or CBIOS
|
|
||||||
@@ -593,6 +594,18 @@ verify_checksum:
|
|
||||||
|
|
||||||
;
|
|
||||||
;
|
|
||||||
+; disable_cursor: Disable cursor emulation.
|
|
||||||
+; This assumes we're on page 0.
|
|
||||||
+;
|
|
||||||
+disable_cursor:
|
|
||||||
+ pushad
|
|
||||||
+ mov ch, 020h ; Set bit 5 to disable cursor
|
|
||||||
+ mov ah, 01h ; Set text-mode cursor shape
|
|
||||||
+ int 10h ; Video BIOS services
|
|
||||||
+ popad
|
|
||||||
+ ret
|
|
||||||
+
|
|
||||||
+;
|
|
||||||
; writestr_early: write a null-terminated string to the console
|
|
||||||
; This assumes we're on page 0. This is only used for early
|
|
||||||
; messages, so it should be OK.
|
|
@ -1,24 +0,0 @@
|
|||||||
diff -Naur -b syslinux-3.83.orig/Makefile syslinux-3.83.new/Makefile
|
|
||||||
--- syslinux-3.83.orig/Makefile 2009-10-05 15:06:06.000000000 -0700
|
|
||||||
+++ syslinux-3.83.new/Makefile 2010-04-27 13:57:38.000000000 -0700
|
|
||||||
@@ -42,7 +42,7 @@
|
|
||||||
mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
|
|
||||||
mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
|
|
||||||
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
|
|
||||||
- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
|
|
||||||
+ gpxe/gpxelinux.0 dos/syslinux.com \
|
|
||||||
$(MODULES)
|
|
||||||
|
|
||||||
# BSUBDIRs build the on-target binary components.
|
|
||||||
@@ -66,9 +66,9 @@
|
|
||||||
# Things to install in /usr/lib/syslinux
|
|
||||||
INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
|
|
||||||
core/isolinux-debug.bin \
|
|
||||||
- dos/syslinux.com dos/copybs.com win32/syslinux.exe \
|
|
||||||
+ dos/syslinux.com dos/copybs.com \
|
|
||||||
mbr/*.bin $(MODULES)
|
|
||||||
-INSTALL_AUX_OPT = win32/syslinux.exe
|
|
||||||
+INSTALL_AUX_OPT =
|
|
||||||
|
|
||||||
# These directories manage their own installables
|
|
||||||
INSTALLSUBDIRS = com32 utils
|
|
@ -1,36 +0,0 @@
|
|||||||
diff -ur syslinux-3.83/MCONFIG.embedded syslinux-3.83.good/MCONFIG.embedded
|
|
||||||
--- syslinux-3.83/MCONFIG.embedded 2009-10-05 15:06:06.000000000 -0700
|
|
||||||
+++ syslinux-3.83.good/MCONFIG.embedded 2010-06-24 15:55:42.000000000 -0700
|
|
||||||
@@ -28,7 +28,7 @@
|
|
||||||
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
|
|
||||||
|
|
||||||
LD += -m elf_i386
|
|
||||||
-CFLAGS = $(GCCOPT) -g -W -Wall -Wno-sign-compare $(OPTFLAGS) $(INCLUDES)
|
|
||||||
+CFLAGS = $(GCCOPT) -fno-pic -g -W -Wall -Wno-sign-compare $(OPTFLAGS) $(INCLUDES)
|
|
||||||
SFLAGS = $(CFLAGS) -D__ASSEMBLY__
|
|
||||||
|
|
||||||
.SUFFIXES: .c .o .S .s .i .elf .com .bin .asm .lst .c32 .lss
|
|
||||||
diff -ur syslinux-3.83/com32/lib/MCONFIG syslinux-3.83.good/com32/lib/MCONFIG
|
|
||||||
--- syslinux-3.83/com32/lib/MCONFIG 2009-10-05 15:06:06.000000000 -0700
|
|
||||||
+++ syslinux-3.83.good/com32/lib/MCONFIG 2010-06-24 15:48:04.000000000 -0700
|
|
||||||
@@ -26,7 +26,7 @@
|
|
||||||
-falign-labels=0 -ffast-math -fomit-frame-pointer
|
|
||||||
WARNFLAGS = -W -Wall -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
|
|
||||||
|
|
||||||
-CFLAGS = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS)
|
|
||||||
+CFLAGS = -fno-pic $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS)
|
|
||||||
LDFLAGS = -m elf32_i386
|
|
||||||
|
|
||||||
.SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss
|
|
||||||
diff -ur syslinux-3.83/gpxe/src/Makefile syslinux-3.83.good/gpxe/src/Makefile
|
|
||||||
--- syslinux-3.83/gpxe/src/Makefile 2009-10-05 15:06:06.000000000 -0700
|
|
||||||
+++ syslinux-3.83.good/gpxe/src/Makefile 2010-06-24 15:54:31.000000000 -0700
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
#
|
|
||||||
|
|
||||||
CLEANUP :=
|
|
||||||
-CFLAGS :=
|
|
||||||
+CFLAGS := -fno-pic
|
|
||||||
ASFLAGS :=
|
|
||||||
LDFLAGS :=
|
|
||||||
MAKEDEPS := Makefile
|
|
@ -1,111 +0,0 @@
|
|||||||
diff --git a/syslinux-3.83/MCONFIG.embedded b/syslinux-3.83.patch/MCONFIG.embedded
|
|
||||||
index 3237cd7..4451929 100644
|
|
||||||
--- a/syslinux-3.83/MCONFIG.embedded
|
|
||||||
+++ b/syslinux-3.83.patch/MCONFIG.embedded
|
|
||||||
@@ -28,6 +28,7 @@ GCCOPT := $(call gcc_ok,-m32,) \
|
|
||||||
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
|
|
||||||
|
|
||||||
LD += -m elf_i386
|
|
||||||
+LDOPTS = -m elf_i386
|
|
||||||
CFLAGS = $(GCCOPT) -fno-pic -g -W -Wall -Wno-sign-compare $(OPTFLAGS) $(INCLUDES)
|
|
||||||
SFLAGS = $(CFLAGS) -D__ASSEMBLY__
|
|
||||||
|
|
||||||
diff --git a/syslinux-3.83/core/Makefile b/syslinux-3.83.patch/core/Makefile
|
|
||||||
index 65418c4..1d11bd1 100644
|
|
||||||
--- a/syslinux-3.83/core/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/core/Makefile
|
|
||||||
@@ -78,7 +78,7 @@ iso%.bin: iso%.elf checksumiso.pl
|
|
||||||
-l $(@:.o=.lsr) -o $@ $<
|
|
||||||
|
|
||||||
%.elf: %.o syslinux.ld
|
|
||||||
- $(LD) $(LDFLAGS) -T syslinux.ld -M -o $@ $< > $(@:.elf=.map)
|
|
||||||
+ $(LD) $(LDOPTS) $(LDFLAGS) -T syslinux.ld -M -o $@ $< > $(@:.elf=.map)
|
|
||||||
$(OBJDUMP) -h $@ > $(@:.elf=.sec)
|
|
||||||
$(PERL) lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst)
|
|
||||||
|
|
||||||
diff --git a/syslinux-3.83/dos/Makefile b/syslinux-3.83.patch/dos/Makefile
|
|
||||||
index fa2ed0a..225a6d3 100644
|
|
||||||
--- a/syslinux-3.83/dos/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/dos/Makefile
|
|
||||||
@@ -49,7 +49,7 @@ spotless: clean
|
|
||||||
installer:
|
|
||||||
|
|
||||||
syslinux.elf: $(OBJS) libcom.a
|
|
||||||
- $(LD) $(LDFLAGS) -o $@ $^
|
|
||||||
+ $(LD) $(LDOPTS) $(LDFLAGS) -o $@ $^
|
|
||||||
|
|
||||||
libcom.a: $(LIBOBJS)
|
|
||||||
-rm -f $@
|
|
||||||
diff --git a/syslinux-3.83/mbr/Makefile b/syslinux-3.83.patch/mbr/Makefile
|
|
||||||
index c3eb97a..01d50cc 100644
|
|
||||||
--- a/syslinux-3.83/mbr/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/mbr/Makefile
|
|
||||||
@@ -33,7 +33,7 @@ all: mbr.bin altmbr.bin gptmbr.bin isohdpfx.bin isohdppx.bin \
|
|
||||||
|
|
||||||
.PRECIOUS: %.elf
|
|
||||||
%.elf: %.o mbr.ld
|
|
||||||
- $(LD) $(LDFLAGS) -T mbr.ld -e _start -o $@ $<
|
|
||||||
+ $(LD) $(LDOPTS) $(LDFLAGS) -T mbr.ld -e _start -o $@ $<
|
|
||||||
|
|
||||||
%.bin: %.elf checksize.pl
|
|
||||||
$(OBJCOPY) -O binary $< $@
|
|
||||||
diff --git a/syslinux-3.83/memdisk/Makefile b/syslinux-3.83.patch/memdisk/Makefile
|
|
||||||
index d185d87..2bf477d 100644
|
|
||||||
--- a/syslinux-3.83/memdisk/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/memdisk/Makefile
|
|
||||||
@@ -72,13 +72,13 @@ memdisk16.o: memdisk16.asm
|
|
||||||
$(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $<
|
|
||||||
|
|
||||||
memdisk_%.o: memdisk_%.bin
|
|
||||||
- $(LD) -r -b binary -o $@ $<
|
|
||||||
+ $(LD) $(LDOPTS) -r -b binary -o $@ $<
|
|
||||||
|
|
||||||
memdisk16.elf: $(OBJS16)
|
|
||||||
- $(LD) -Ttext 0 -o $@ $^
|
|
||||||
+ $(LD) $(LDOPTS) -Ttext 0 -o $@ $^
|
|
||||||
|
|
||||||
memdisk32.elf: memdisk.ld $(OBJS32)
|
|
||||||
- $(LD) -o $@ -T $^
|
|
||||||
+ $(LD) $(LDOPTS) -o $@ -T $^
|
|
||||||
|
|
||||||
%.bin: %.elf
|
|
||||||
$(OBJCOPY) -O binary $< $@
|
|
||||||
diff --git a/syslinux-3.83/memdump/Makefile b/syslinux-3.83.patch/memdump/Makefile
|
|
||||||
index 05f2638..a324dc7 100644
|
|
||||||
--- a/syslinux-3.83/memdump/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/memdump/Makefile
|
|
||||||
@@ -43,7 +43,7 @@ spotless: clean
|
|
||||||
installer:
|
|
||||||
|
|
||||||
memdump.elf: $(OBJS) libcom.a
|
|
||||||
- $(LD) $(LDFLAGS) -o $@ $^
|
|
||||||
+ $(LD) $(LDOPTS) $(LDFLAGS) -o $@ $^
|
|
||||||
|
|
||||||
libcom.a: $(LIBOBJS)
|
|
||||||
-rm -f $@
|
|
||||||
diff --git a/syslinux-3.83/modules/Makefile b/syslinux-3.83.patch/modules/Makefile
|
|
||||||
index 77020ea..a380aa2 100644
|
|
||||||
--- a/syslinux-3.83/modules/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/modules/Makefile
|
|
||||||
@@ -27,7 +27,7 @@ all: $(BINS)
|
|
||||||
|
|
||||||
.PRECIOUS: %.elf
|
|
||||||
%.elf: c32entry.o %.o $(LIB)
|
|
||||||
- $(LD) -Ttext 0x101000 -e _start -o $@ $^
|
|
||||||
+ $(LD) $(LDOPTS) -Ttext 0x101000 -e _start -o $@ $^
|
|
||||||
|
|
||||||
%.c32: %.elf
|
|
||||||
$(OBJCOPY) -O binary $< $@
|
|
||||||
diff --git a/syslinux-3.83/sample/Makefile b/syslinux-3.83.patch/sample/Makefile
|
|
||||||
index 9fa21c2..e6b4544 100644
|
|
||||||
--- a/syslinux-3.83/sample/Makefile
|
|
||||||
+++ b/syslinux-3.83.patch/sample/Makefile
|
|
||||||
@@ -36,7 +36,7 @@ all: syslogo.lss comecho.com hello.c32 hello2.c32 filetest.c32 c32echo.c32 \
|
|
||||||
|
|
||||||
.PRECIOUS: %.elf
|
|
||||||
%.elf: c32entry.o %.o $(LIB)
|
|
||||||
- $(LD) -Ttext 0x101000 -e _start -o $@ $^
|
|
||||||
+ $(LD) $(LDOPTS) -Ttext 0x101000 -e _start -o $@ $^
|
|
||||||
|
|
||||||
%.c32: %.elf
|
|
||||||
$(OBJCOPY) -O binary $< $@
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -ur a/com32/MCONFIG b/com32/MCONFIG
|
|
||||||
--- a/com32/MCONFIG 2010-02-16 23:53:51.000000000 +0100
|
|
||||||
+++ b/com32/MCONFIG 2010-02-18 22:28:18.791609195 +0100
|
|
||||||
@@ -24,6 +24,8 @@
|
|
||||||
GCCOPT += $(call gcc_ok,-freg-struct-return,)
|
|
||||||
GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
|
|
||||||
GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
|
|
||||||
+GCCOPT += $(call gcc_ok,-nopie,)
|
|
||||||
+GCCOPT += $(call gcc_ok,-fno-pie,)
|
|
||||||
GCCOPT += $(call gcc_ok,-fno-exceptions,)
|
|
||||||
GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
|
|
||||||
GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
|
|
@ -1,74 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.83.ebuild,v 1.3 2010/02/26 12:10:54 fauli Exp $
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="SysLinux, IsoLinux and PXELinux bootloader"
|
|
||||||
HOMEPAGE="http://syslinux.zytor.com/"
|
|
||||||
SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${P}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* amd64 x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="sys-fs/mtools
|
|
||||||
dev-perl/Crypt-PasswdMD5
|
|
||||||
dev-perl/Digest-SHA1"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-lang/nasm"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
unpack ${A}
|
|
||||||
cd "${S}"
|
|
||||||
epatch "${FILESDIR}"/${PN}-3.72-nopie.patch
|
|
||||||
# Don't prestrip, makes portage angry
|
|
||||||
epatch "${FILESDIR}"/${PN}-3.72-nostrip.patch
|
|
||||||
|
|
||||||
# Don't try to build win32/syslinux.exe
|
|
||||||
epatch "${FILESDIR}/"${P}-disable_win32.patch
|
|
||||||
|
|
||||||
# Disable the text banner for quieter boot.
|
|
||||||
epatch "${FILESDIR}/"${P}-disable_banner.patch
|
|
||||||
|
|
||||||
# Disable the blinking cursor as early as possible.
|
|
||||||
epatch "${FILESDIR}/"${P}-disable_cursor.patch
|
|
||||||
|
|
||||||
# Don't compile w/ PIC
|
|
||||||
epatch "${FILESDIR}/"${P}-nopic.patch
|
|
||||||
|
|
||||||
# Make it work when the compiler is 64 bit by default.
|
|
||||||
epatch "${FILESDIR}/"${P}-x86_64.patch
|
|
||||||
|
|
||||||
rm -f gethostip #bug 137081
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# By default, syslinux wants you to use pre-built binaries
|
|
||||||
# and only compile part of the package. Since we want to rebuild
|
|
||||||
# everything from scratch we need to remove the prebuilts or else
|
|
||||||
# some things don't get built with standard make.
|
|
||||||
emake spotless || die "make spotless failed"
|
|
||||||
|
|
||||||
# The syslinux build can't tolerate "-Wl,-O*"
|
|
||||||
export LDFLAGS=$(raw-ldflags)
|
|
||||||
|
|
||||||
if [ "${ROOT}" != "/" ]; then
|
|
||||||
tc-export CC CXX AR RANLIB LD NM
|
|
||||||
# Force GNU ld if gold is installed
|
|
||||||
if ${LD}.bfd --version > /dev/null 2>&1; then
|
|
||||||
LD=${LD}.bfd
|
|
||||||
fi
|
|
||||||
emake CC="$CC" CXX="$CXX" AR="$AR" RANLIB="$RANLIB" LD="$LD" \
|
|
||||||
NM="$NM" || die "make failed"
|
|
||||||
else
|
|
||||||
emake || die "make failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
|
|
||||||
dodoc README NEWS TODO doc/*
|
|
||||||
}
|
|
@ -1,60 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.03.ebuild,v 1.3 2010/12/09 09:56:19 phajdan.jr Exp $
|
|
||||||
|
|
||||||
inherit eutils toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
|
|
||||||
HOMEPAGE="http://syslinux.zytor.com/"
|
|
||||||
SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="-* amd64 x86"
|
|
||||||
IUSE="custom-cflags"
|
|
||||||
|
|
||||||
RDEPEND="sys-fs/mtools
|
|
||||||
dev-perl/Crypt-PasswdMD5
|
|
||||||
dev-perl/Digest-SHA1"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-lang/nasm"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${P/_/-}
|
|
||||||
|
|
||||||
# This ebuild is a departure from the old way of rebuilding everything in syslinux
|
|
||||||
# This departure is necessary since hpa doesn't support the rebuilding of anything other
|
|
||||||
# than the installers.
|
|
||||||
|
|
||||||
# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
unpack ${A}
|
|
||||||
cd "${S}"
|
|
||||||
# Fix building on hardened
|
|
||||||
epatch "${FILESDIR}"/${PN}-4.00-nopie.patch
|
|
||||||
|
|
||||||
rm -f gethostip #bug 137081
|
|
||||||
|
|
||||||
# Don't prestrip or override user LDFLAGS, bug #305783
|
|
||||||
local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \
|
|
||||||
sample/Makefile utils/Makefile"
|
|
||||||
sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed"
|
|
||||||
|
|
||||||
if use custom-cflags; then
|
|
||||||
sed -i ${SYSLINUX_MAKEFILES} \
|
|
||||||
-e 's|-g -Os||g' \
|
|
||||||
-e 's|-Os||g' \
|
|
||||||
-e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \
|
|
||||||
|| die "sed custom-cflags failed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake CC=$(tc-getCC) installer || die
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die
|
|
||||||
dodoc README NEWS doc/* || die
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user