From owner-svn-soc-all@FreeBSD.ORG Sat Jun 20 12:52:27 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21360C26 for ; Sat, 20 Jun 2015 12:52:27 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 039F7253 for ; Sat, 20 Jun 2015 12:52:27 +0000 (UTC) (envelope-from kczekirda@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KCqQEo047652 for ; Sat, 20 Jun 2015 12:52:26 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5KCqQm4047647 for svn-soc-all@FreeBSD.org; Sat, 20 Jun 2015 12:52:26 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sat, 20 Jun 2015 12:52:26 GMT Message-Id: <201506201252.t5KCqQm4047647@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287379 - soc2015/kczekirda/ipxe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Jun 2015 12:52:27 -0000 Author: kczekirda Date: Sat Jun 20 12:52:25 2015 New Revision: 287379 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287379 Log: unnecessary options cleaning Modified: soc2015/kczekirda/ipxe/Makefile Modified: soc2015/kczekirda/ipxe/Makefile ============================================================================== --- soc2015/kczekirda/ipxe/Makefile Sat Jun 20 12:47:38 2015 (r287378) +++ soc2015/kczekirda/ipxe/Makefile Sat Jun 20 12:52:25 2015 (r287379) @@ -24,32 +24,15 @@ USE_GCC= any WRKSRC= ${WRKDIR}/${DISTNAME}/src -OPTIONS_DEFINE= NET_PROTO_IPV4 NET_PROTO_IPV6 NET_PROTO_FCOE \ - PXE_STACK PXE_MENU \ - DOWNLOAD_PROTO_TFTP DOWNLOAD_PROTO_HTTP \ - DOWNLOAD_PROTO_HTTPS DOWNLOAD_PROTO_FTP \ - DOWNLOAD_PROTO_SLAM DOWNLOAD_PROTO_NFS \ - SANBOOT_PROTO_ISCSI SANBOOT_PROTO_AOE SANBOOT_PROTO_IB_SRP \ - SANBOOT_PROTO_FCP \ - CRYPTO_80211_WEP CRYPTO_80211_WPA CRYPTO_80211_WPA2 \ - DNS_RESOLVER \ - IMAGE_NBI IMAGE_ELF IMAGE_MULTIBOOT IMAGE_PXE \ - IMAGE_SCRIPT IMAGE_BZIMAGE IMAGE_COMBOOT IMAGE_EFI \ - IMAGE_SDI IMAGE_PNM IMAGE_PNG \ - CMD_AUTOBOOT CMD_NVO CMD_CONFIG CMD_IFMGMT CMD_IWMGMT \ - CMD_FCMGMT CMD_ROUTE CMD_IMAGE CMD_DHCP CMD_SANBOOT \ - CMD_MENU CMD_LOGIN CMD_SYNC CMD_NSLOOKUP CMD_TIME \ - CMD_DIGEST CMD_LOTEST CMD_VLAN CMD_PXE CMD_REBOOT \ - CMD_POWEROFF CMD_IMAGE_TRUST CMD_PCI CMD_PARAM \ - CMD_NEIGHBOUR CMD_PING CMD_CONSOLE CMD_IPSTAT CMD_PROFSTAT \ - ERRMSG_80211 \ - CONF_PCI_SETTINGS CONF_CPUID_SETTINGS \ - CONF_MEMMAP_SETTINGS CONF_VMWARE_SETTINGS \ - CONF_VRAM_SETTINGS \ - USB_HCD_XHCI USB_HCD_EHCI USB_HCD_UHCI USB_KEYBOARD \ - CON_PCBIOS CON_SERIAL CON_DIRECT_VGA CON_PC_KBD \ - CON_SYSLOG CON_SYSLOGS CON_VMWARE CON_DEBUGCON CON_VESAFB \ - CON_INT13 +OPTIONS_DEFINE= NET_PROTO_IPV6 NET_PROTO_FCOE DOWNLOAD_PROTO_HTTPS \ + DOWNLOAD_PROTO_FTP DOWNLOAD_PROTO_NFS \ + IMAGE_ELF IMAGE_MULTIBOOT IMAGE_PXE IMAGE_SCRIPT \ + IMAGE_BZIMAGE IMAGE_COMBOOT IMAGE_EFI \ + CMD_NSLOOKUP CMD_DIGEST CMD_VLAN CMD_PXE CMD_REBOOT \ + CMD_POWEROFF CMD_IMAGE_TRUST CMD_PCI CMD_PING CMD_IPSTAT \ + CONF_CPUID_SETTINGS CONF_MEMMAP_SETTINGS \ + CON_PCBIOS CON_SERIAL CON_SYSLOG CON_SYSLOGS CON_VMWARE \ + CON_DEBUGCON CON_VESAFB \ #DEBUG_DESC= with DEBUG=$$DEBUG e.g =dhcp,tcp #VIRTUALBOX_DESC= build VirtualBox PXE-ROM images @@ -57,44 +40,17 @@ # Network protocols: -NET_PROTO_IPV4_DESC= IPv4 protocol NET_PROTO_IPV6_DESC= IPv6 protocol NET_PROTO_FCOE_DESC= Fibre Channel over Ethernet protocol -# PXE support - -PXE_STACK_DESC= PXE stack in iPXE - you want this! -PXE_MENU_DESC= PXE menu booting - # Download protocols -DOWNLOAD_PROTO_TFTP_DESC= Trivial File Transfer Protocol -DOWNLOAD_PROTO_HTTP_DESC= Hypertext Transfer Protocol DOWNLOAD_PROTO_HTTPS_DESC= Secure Hypertext Transfer Protocol DOWNLOAD_PROTO_FTP_DESC= File Transfer Protocol -DOWNLOAD_PROTO_SLAM_DESC= Scalable Local Area Multicast DOWNLOAD_PROTO_NFS_DESC= Network File System Protocol -# SAN boot protocols - -SANBOOT_PROTO_ISCSI_DESC= iSCSI protocol -SANBOOT_PROTO_AOE_DESC= AoE protocol -SANBOOT_PROTO_IB_SRP_DESC= Infiniband SCSI RDMA protocol -SANBOOT_PROTO_FCP_DESC= Fibre Channel protocol - -# 802.11 cryptosystems and handshaking protocols - -CRYPTO_80211_WEP_DESC= WEP encryption (deprecated and insecure!) -CRYPTO_80211_WPA_DESC= WPA Personal, authenticating with passphrase -CRYPTO_80211_WPA2_DESC= Add support for stronger WPA cryptography - -# Name resolution modules - -DNS_RESOLVER_DESC= DNS Resolver - # Image types -IMAGE_NBI_DESC= NBI image support IMAGE_ELF_DESC= ELF image support IMAGE_MULTIBOOT_DESC= MultiBoot image support IMAGE_PXE_DESC= PXE image support @@ -102,91 +58,34 @@ IMAGE_BZIMAGE_DESC= Linux bzImage image support IMAGE_COMBOOT_DESC= SYSLINUX COMBOOT image support IMAGE_EFI_DESC= EFI image support -IMAGE_SDI_DESC= SDI image support -IMAGE_PNM_DESC= PNM image support -IMAGE_PNG_DESC= PNG image support # Command-line commands to include -CMD_AUTOBOOT_DESC= Automatic booting -CMD_NVO_DESC= Non-volatile option storage commands -CMD_CONFIG_DESC= Option configuration console -CMD_IFMGMT_DESC= Interface management commands -CMD_IWMGMT_DESC= Wireless interface management commands -CMD_FCMGMT_DESC= Fibre Channel management commands -CMD_ROUTE_DESC= Routing table management commands -CMD_IMAGE_DESC= Image management commands -CMD_DHCP_DESC= DHCP management commands -CMD_SANBOOT_DESC= SAN boot commands -CMD_MENU_DESC= Menu commands -CMD_LOGIN_DESC= Login command -CMD_SYNC_DESC= Sync command CMD_NSLOOKUP_DESC= DNS resolving command -CMD_TIME_DESC= Time commands CMD_DIGEST_DESC= Image crypto digest commands -CMD_LOTEST_DESC= Loopback testing commands CMD_VLAN_DESC= VLAN commands CMD_PXE_DESC= PXE commands CMD_REBOOT_DESC= Reboot command CMD_POWEROFF_DESC= Power off command CMD_IMAGE_TRUST_DESC= Image trust management commands CMD_PCI_DESC= PCI commands -CMD_PARAM_DESC= Form parameter commands -CMD_NEIGHBOUR_DESC= Neighbour management commands CMD_PING_DESC= Ping command -CMD_CONSOLE_DESC= Console command CMD_IPSTAT_DESC= IP statistics commands -CMD_PROFSTAT_DESC= Profiling commands - -# Error message tables to include - -ERRMSG_80211_DESC= All 802.11 error descriptions (~3.3kb) # Configuration settings -CONF_PCI_SETTINGS_DESC= PCI device settings CONF_CPUID_SETTINGS_DESC= CPUID settings CONF_MEMMAP_SETTINGS_DESC= Memory map settings -CONF_VMWARE_SETTINGS_DESC= VMware GuestInfo settings -CONF_VRAM_SETTINGS_DESC= Video RAM dump settings - -# USB configuration - -# USB host controllers (all enabled by default) -USB_HCD_XHCI_DESC= xHCI USB host controller -USB_HCD_EHCI_DESC= EHCI USB host controller -USB_HCD_UHCI_DESC= UHCI USB host controller -# USB peripherals -USB_KEYBOARD_DESC= USB keyboards #Console configuration CON_PCBIOS_DESC= Default BIOS console CON_SERIAL_DESC= Serial port -CON_DIRECT_VGA_DESC= Direct access to VGA card -CON_PC_KBD_DESC= Direct access to PC keyboard CON_SYSLOG_DESC= Syslog console CON_SYSLOGS_DESC= Encrypted syslog console CON_VMWARE_DESC= VMware logfile console CON_DEBUGCON_DESC= Debug port console CON_VESAFB_DESC= VESA framebuffer console -CON_INT13_DESC= INT13 disk log console - -OPTIONS_DEFAULT= NET_PROTO_IPV4 \ - PXE_STACK PXE_MENU \ - DOWNLOAD_PROTO_TFTP DOWNLOAD_PROTO_HTTP \ - SANBOOT_PROTO_ISCSI SANBOOT_PROTO_AOE SANBOOT_PROTO_IB_SRP \ - SANBOOT_PROTO_FCP \ - CRYPTO_80211_WEP CRYPTO_80211_WPA CRYPTO_80211_WPA2 \ - DNS_RESOLVER \ - IMAGE_NBI IMAGE_ELF IMAGE_MULTIBOOT IMAGE_PXE \ - IMAGE_SCRIPT IMAGE_BZIMAGE IMAGE_COMBOOT IMAGE_EFI \ - IMAGE_SDI IMAGE_PNM IMAGE_PNG \ - CMD_AUTOBOOT CMD_NVO CMD_CONFIG CMD_IFMGMT CMD_IWMGMT \ - CMD_FCMGMT CMD_ROUTE CMD_IMAGE CMD_DHCP CMD_SANBOOT \ - CMD_MENU CMD_LOGIN CMD_SYNC \ - CONF_PCI_SETTINGS \ - USB_HCD_XHCI USB_HCD_EHCI USB_HCD_UHCI USB_KEYBOARD .include @@ -194,6 +93,58 @@ MAKE_ARGS+= ARCH=i386 .endif +# ON + +# change //#define to #define + +# IMAGE_ELF IMAGE_MULTIBOOT IMAGE_PXE +# IMAGE_SCRIPT IMAGE_BZIMAGE IMAGE_COMBOOT IMAGE_EFI +# CMD_NSLOOKUP +# CMD_DIGEST CMD_VLAN CMD_PXE CMD_REBOOT +# CMD_POWEROFF CMD_IMAGE_TRUST CMD_PCI +# CMD_PING CMD_IPSTAT + +.if ${PORT_OPTIONS:MIMAGE_ELF} +DEFINES+= IMAGE_ELF +.endif + +.if ${PORT_OPTIONS:MIMAGE_MOOLTIBOOT} +DEFINES+= IMAGE_MOOLTIBOOT +.endif + +.if ${PORT_OPTIONS:MIMAGE_PXE} +DEFINES+= IMAGE_PXE +.endif + +.if ${PORT_OPTIONS:MIMAGE_SCRIPT} +DEFINES+= IMAGE_SCRIPT +.endif + +.if ${PORT_OPTIONS:MIMAGE_BZIMAGE} +DEFINES+= IMAGE_BZIMAGE +.endif + +.if ${PORT_OPTIONS:MIMAGE_COMBOOT} +DEFINES+= IMAGE_COMBOOT +.endif + +.if ${PORT_OPTIONS:MIMAGE_EFI} +DEFINES+= IMAGE_EFI +.endif + +# +# CONF_CPUID_SETTINGS CONF_MEMMAP_SETTINGS + +# +# CON_PCBIOS CON_SERIAL \ +# CON_SYSLOG CON_SYSLOGS CON_VMWARE CON_DEBUGCON CON_VESAFB \ + +# chande undef to define: + +# NET_PROTO_IPV6 NET_PROTO_FCOE +# DOWNLOAD_PROTO_HTTPS DOWNLOAD_PROTO_FTP +# DOWNLOAD_PROTO_NFS + BINLIST= bin/undionly.kpxe bin/ipxe.iso bin/ipxe.usb ALL_TARGET?= ${BINLIST}