From owner-svn-soc-all@FreeBSD.ORG Sun Jun 21 10:44:57 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 04975FF0 for ; Sun, 21 Jun 2015 10:44:57 +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 E6DF22A9 for ; Sun, 21 Jun 2015 10:44:56 +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 t5LAiuqe071831 for ; Sun, 21 Jun 2015 10:44:56 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5LAiuTa071816 for svn-soc-all@FreeBSD.org; Sun, 21 Jun 2015 10:44:56 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sun, 21 Jun 2015 10:44:56 GMT Message-Id: <201506211044.t5LAiuTa071816@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: r287422 - 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: Sun, 21 Jun 2015 10:44:57 -0000 Author: kczekirda Date: Sun Jun 21 10:44:55 2015 New Revision: 287422 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287422 Log: iPXE script image support is default Modified: soc2015/kczekirda/ipxe/Makefile Modified: soc2015/kczekirda/ipxe/Makefile ============================================================================== --- soc2015/kczekirda/ipxe/Makefile Sun Jun 21 08:00:05 2015 (r287421) +++ soc2015/kczekirda/ipxe/Makefile Sun Jun 21 10:44:55 2015 (r287422) @@ -26,7 +26,7 @@ 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_ELF IMAGE_MULTIBOOT IMAGE_PXE \ 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 \ @@ -54,7 +54,6 @@ IMAGE_ELF_DESC= ELF image support IMAGE_MULTIBOOT_DESC= MultiBoot image support IMAGE_PXE_DESC= PXE image support -IMAGE_SCRIPT_DESC= iPXE script image support IMAGE_BZIMAGE_DESC= Linux bzImage image support IMAGE_COMBOOT_DESC= SYSLINUX COMBOOT image support IMAGE_EFI_DESC= EFI image support @@ -105,10 +104,6 @@ DEFINESGENERAL+= IMAGE_PXE .endif -.if ${PORT_OPTIONS:MIMAGE_SCRIPT} -DEFINESGENERAL+= IMAGE_SCRIPT -.endif - .if ${PORT_OPTIONS:MIMAGE_BZIMAGE} DEFINESGENERAL+= IMAGE_BZIMAGE .endif