Skip to contentSkip to conversation

etherboot: apply patches and always build

PATCH In review David Edmondson 2 participants 4 messages Jan 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 etherboot: apply patches and always build

Apply upstream patch to fix TFTP block wrap.

Build eb-roms.h rather than keeping a version in the repository. To that end, modify CFLAGS such that etherboot builds correctly (-std=gnu89 -fno-stack-protector).

tools/firmware/etherboot/Makefile +4 -0
diff -r bbfcd7b8c362 -r 2513951a6369 tools/firmware/etherboot/Makefile
@@ -29,6 +29,9 @@
 	rm -rf $D $E
 	gzip -dc $T | tar xf -
 	cat Config >>$D/src/Config
+	for i in $$(cat patches/series) ; do                 \
+	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
+	done
 	@
 	# override many of the settings in Config
 	echo ARCH=i386 >>$D/src/Config
@@ -44,6 +47,7 @@
 	echo "CFLAGS+=$(CFLAGS)" >>$D/src/Config
 	echo "ASFLAGS+=$(ASFLAGS)" >>$D/src/Config
 	echo "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config
+	echo "CFLAGS+=-std=gnu89 -fno-stack-protector" >>$D/src/Config
 	@
 	set -e; cd $D/src/arch/i386; \
 		sed -e '/ifneq.*GCC_MINORVERSION/,/endif/ s/^/#/' \
tools/firmware/etherboot/eb-roms.h deleted +0 -4099

2,984 lines not on this page · raw message

tools/firmware/etherboot/patches/series new file +1 -0
diff -r bbfcd7b8c362 -r 2513951a6369 tools/firmware/etherboot/patches/series

Lines of this file are not shown. View the raw message.

tools/firmware/etherboot/patches/wrap-tftp-block-index.patch new file +29 -0
diff -r bbfcd7b8c362 -r 2513951a6369 tools/firmware/etherboot/patches/wrap-tftp-block-index.patch

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 7 lines · David Edmondson

Apply upstream patch to fix TFTP block wrap.

Build eb-roms.h rather than keeping a version in the repository. To that end, modify CFLAGS such that etherboot builds correctly (-std=gnu89 -fno-stack-protector).

We had all sorts of problems build etherboot with various versions of gcc and with various environments. Please just update eb-roms.h.

And the patch is missing.

-- Keir

#2 lore raw
Quoted 4 lines · Keir Fraser
Quoted 2 lines · David Edmondson

Apply upstream patch to fix TFTP block wrap.

Quoted 8 lines
Quoted 5 lines

Build eb-roms.h rather than keeping a version in the repository. To that end, modify CFLAGS such that etherboot builds correctly (-std=gnu89 -fno-stack-protector).

We had all sorts of problems build etherboot with various versions of gcc and with various environments. Please just update eb-roms.h.

Updated version attached. The CFLAGS addition is still there to help the next person who has to rebuild.

Quoted 1 line

And the patch is missing.

I don't understand - which bit? The overall patch was there and it contained a patch to fix the TFTP bug.

# HG changeset patch
# User dme@aw
# Date 1233070443 0
# Node ID 16c8ac1554ba028c5a52de4aee31cce73baecf6a # Parent 1603eae85259d7c6ee53845dcf9a328fb35892aa Apply upstream patch to fix TFTP block wrap.

Modify CFLAGS such that etherboot builds correctly (-std=gnu89 -fno-stack-protector).

tools/firmware/etherboot/Makefile +4 -0
@@ -29,6 +29,9 @@
 	rm -rf $D $E
 	gzip -dc $T | tar xf -
 	cat Config >>$D/src/Config
+	for i in $$(cat patches/series) ; do                 \
+	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
+	done
 	@
 	# override many of the settings in Config
 	echo ARCH=i386 >>$D/src/Config
@@ -44,6 +47,7 @@
 	echo "CFLAGS+=$(CFLAGS)" >>$D/src/Config
 	echo "ASFLAGS+=$(ASFLAGS)" >>$D/src/Config
 	echo "LDFLAGS+=$(LDFLAGS_DIRECT)" >>$D/src/Config
+	echo "CFLAGS+=-std=gnu89 -fno-stack-protector" >>$D/src/Config
 	@
 	set -e; cd $D/src/arch/i386; \
 		sed -e '/ifneq.*GCC_MINORVERSION/,/endif/ s/^/#/' \
tools/firmware/etherboot/eb-roms.h +2996 -2996

2,984 lines not on this page · raw message

tools/firmware/etherboot/patches/series new file +1 -0
new file mode 100644

Lines of this file are not shown. View the raw message.

tools/firmware/etherboot/patches/wrap-tftp-block-index.patch new file +29 -0
new file mode 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#3 lore raw
Quoted 4 lines · David Edmondson
Quoted 1 line

And the patch is missing.

I don't understand - which bit? The overall patch was there and it contained a patch to fix the TFTP bug.

Ah, that's my mail client being inclined to not fully download messages and then truncate their display. :-)

-- Keir