summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2011-02-25 18:46:56 +0100
committerMichael Brown2011-02-25 18:46:56 +0100
commit27578ec8c1f5dbde801f82b9b35a741c61fefa01 (patch)
tree6f436b35e9072e2e1ee1c04ada26d918888fc507
parent[iscsi] Clarify support for NOP-In (diff)
downloadipxe-27578ec8c1f5dbde801f82b9b35a741c61fefa01.tar.gz
ipxe-27578ec8c1f5dbde801f82b9b35a741c61fefa01.tar.xz
ipxe-27578ec8c1f5dbde801f82b9b35a741c61fefa01.zip
[linux] Remove Linux-specific code from default (non-Linux) build
Building the Linux-specific code (tap.o et al) requires external headers that have proven to be extremely variable across systems, causing frequent build failures. Until this situation is rectified, remove the Linux-specific code from the default (non-Linux build). Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/Makefile3
-rw-r--r--src/arch/x86/Makefile.linux2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index d51591ee..1a878ef8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -74,8 +74,7 @@ SRCDIRS += drivers/block
SRCDIRS += drivers/nvs
SRCDIRS += drivers/bitbash
SRCDIRS += drivers/infiniband
-SRCDIRS += drivers/linux
-SRCDIRS += interface/pxe interface/efi interface/smbios interface/linux
+SRCDIRS += interface/pxe interface/efi interface/smbios
SRCDIRS += tests
SRCDIRS += crypto crypto/axtls crypto/matrixssl
SRCDIRS += hci hci/commands hci/tui
diff --git a/src/arch/x86/Makefile.linux b/src/arch/x86/Makefile.linux
index c3471dd7..fd56b4b6 100644
--- a/src/arch/x86/Makefile.linux
+++ b/src/arch/x86/Makefile.linux
@@ -1,6 +1,8 @@
MEDIA = linux
INCDIRS += arch/x86/include/linux
+SRCDIRS += interface/linux
+SRCDIRS += drivers/linux
SRCDIRS += arch/x86/core/linux
$(BIN)/%.linux : $(BIN)/%.linux.tmp