From df1209aa89fad185783d9b2831ad5d91043fdd58 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Fri, 17 May 2013 12:11:19 +0200 Subject: [PATCH] dde_ipxe: use recent iPXE upstream version --- dde_ipxe/Makefile | 2 +- dde_ipxe/lib/mk/dde_ipxe_nic.inc | 2 +- dde_ipxe/patches/dde_ipxe.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dde_ipxe/Makefile b/dde_ipxe/Makefile index 7d74e1237e..8662bd3c69 100644 --- a/dde_ipxe/Makefile +++ b/dde_ipxe/Makefile @@ -8,7 +8,7 @@ VERBOSE ?= @ ECHO = @echo GIT_URL = http://git.ipxe.org/ipxe.git -GIT_REV = 34a81da0c8dd47628a7408cd3f8d8a926d1ecbee +GIT_REV = c4bce43c3c4d3c5ebb2d926b58ad16dc9642c19d CONTRIB_DIR = contrib PATCH_FILE = patches/dde_ipxe.patch diff --git a/dde_ipxe/lib/mk/dde_ipxe_nic.inc b/dde_ipxe/lib/mk/dde_ipxe_nic.inc index b3a92772d7..b0a820a53b 100644 --- a/dde_ipxe/lib/mk/dde_ipxe_nic.inc +++ b/dde_ipxe/lib/mk/dde_ipxe_nic.inc @@ -5,7 +5,7 @@ LIBS = dde_kit dde_ipxe_support SRC_C = nic.c dde.c dummies.c -SRC_C += $(addprefix core/, iobuf.c string.c bitops.c) +SRC_C += $(addprefix core/, iobuf.c string.c bitops.c list.c random.c) SRC_C += $(addprefix arch/x86/core/, x86_string.c) SRC_C += $(addprefix arch/i386/core/, rdtsc_timer.c) SRC_C += $(addprefix net/, ethernet.c netdevice.c nullnet.c eth_slow.c iobpad.c) diff --git a/dde_ipxe/patches/dde_ipxe.patch b/dde_ipxe/patches/dde_ipxe.patch index cc920eebda..2260034d86 100644 --- a/dde_ipxe/patches/dde_ipxe.patch +++ b/dde_ipxe/patches/dde_ipxe.patch @@ -28,10 +28,10 @@ index 655cbdc..a8016c8 100644 /** * Assert a condition at run-time. diff --git a/src/include/compiler.h b/src/include/compiler.h -index ed9af23..e8c62d7 100644 +index e555924..b430e37 100644 --- a/src/include/compiler.h +++ b/src/include/compiler.h -@@ -262,7 +262,7 @@ REQUEST_EXPANDED ( CONFIG_SYMBOL ); +@@ -263,7 +263,7 @@ REQUEST_EXPANDED ( CONFIG_SYMBOL ); /** printf() for debugging */ extern void __attribute__ (( format ( printf, 1, 2 ) ))