From owner-svn-soc-all@FreeBSD.ORG Sat Jun 20 17:11:14 2015 Return-Path: Delivered-To: svn-soc-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29C19B22 for ; Sat, 20 Jun 2015 17:11:14 +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 0C66768F for ; Sat, 20 Jun 2015 17:11:14 +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 t5KHBD4t048255 for ; Sat, 20 Jun 2015 17:11:13 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5KHBDCj048235 for svn-soc-all@FreeBSD.org; Sat, 20 Jun 2015 17:11:13 GMT (envelope-from kczekirda@FreeBSD.org) Date: Sat, 20 Jun 2015 17:11:13 GMT Message-Id: <201506201711.t5KHBDCj048235@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: r287387 - 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 17:11:14 -0000 Author: kczekirda Date: Sat Jun 20 17:11:12 2015 New Revision: 287387 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287387 Log: port configuration Modified: soc2015/kczekirda/ipxe/Makefile Modified: soc2015/kczekirda/ipxe/Makefile ============================================================================== --- soc2015/kczekirda/ipxe/Makefile Sat Jun 20 15:55:53 2015 (r287386) +++ soc2015/kczekirda/ipxe/Makefile Sat Jun 20 17:11:12 2015 (r287387) @@ -93,62 +93,154 @@ 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 +DEFINESGENERAL+= IMAGE_ELF .endif .if ${PORT_OPTIONS:MIMAGE_MOOLTIBOOT} -DEFINES+= IMAGE_MOOLTIBOOT +DEFINESGENERAL+= IMAGE_MOOLTIBOOT .endif .if ${PORT_OPTIONS:MIMAGE_PXE} -DEFINES+= IMAGE_PXE +DEFINESGENERAL+= IMAGE_PXE .endif .if ${PORT_OPTIONS:MIMAGE_SCRIPT} -DEFINES+= IMAGE_SCRIPT +DEFINESGENERAL+= IMAGE_SCRIPT .endif .if ${PORT_OPTIONS:MIMAGE_BZIMAGE} -DEFINES+= IMAGE_BZIMAGE +DEFINESGENERAL+= IMAGE_BZIMAGE .endif .if ${PORT_OPTIONS:MIMAGE_COMBOOT} -DEFINES+= IMAGE_COMBOOT +DEFINESGENERAL+= IMAGE_COMBOOT .endif .if ${PORT_OPTIONS:MIMAGE_EFI} -DEFINES+= IMAGE_EFI +DEFINESGENERAL+= IMAGE_EFI +.endif + +.if ${PORT_OPTIONS:MCMD_NSLOOKUP} +DEFINESGENERAL+= NSLOOKUP_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_DIGEST} +DEFINESGENERAL+= DIGEST_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_VLAN} +DEFINESGENERAL+= VLAN_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_PXE} +DEFINESGENERAL+= PXE_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_REBOOT} +DEFINESGENERAL+= REBOOT_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_POWEROFF} +DEFINESGENERAL+= POWEROFF_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_IMAGE_TRUST} +DEFINESGENERAL+= IMAGE_TRUST_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_PCI} +DEFINESGENERAL+= PCI_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_PING} +DEFINESGENERAL+= PING_CMD +.endif + +.if ${PORT_OPTIONS:MCMD_IPSTAT} +DEFINESGENERAL+= IPSTAT_CMD +.endif + +.if ${PORT_OPTIONS:MCONF_CPUID_SETTINGS} +DEFINESSETTINGS+= CPUID_SETTINGS +.endif + +.if ${PORT_OPTIONS:MCONF_MEMMAP_SETTINGS} +DEFINESSETTINGS+= MEMMAP_SETTINGS +.endif + +.if ${PORT_OPTIONS:MCON_PCBIOS} +DEFINESCONSOLE+= CONSOLE_PCBIOS +.endif + +.if ${PORT_OPTIONS:MCON_SERIAL} +DEFINESCONSOLE+= CONSOLE_SERIAL +.endif + +.if ${PORT_OPTIONS:MCON_SYSLOG} +DEFINESCONSOLE+= CONSOLE_SYSLOG +.endif + +.if ${PORT_OPTIONS:MCON_SYSLOGS} +DEFINESCONSOLE+= CONSOLE_SYSLOG +.endif + +.if ${PORT_OPTIONS:MCON_VMWARE} +DEFINESCONSOLE+= CONSOLE_VMWARE +.endif + +.if ${PORT_OPTIONS:MCON_DEBUGCON} +DEFINESCONSOLE+= CONSOLE_DEBUGCON +.endif + +.if ${PORT_OPTIONS:MCON_VESAFB} +DEFINESCONSOLE+= CONSOLE_VESAFB +.endif + +.if ${PORT_OPTIONS:MNET_PROTO_IPV6} +UNDEFINES+= NET_PROTO_IPV6 .endif -# -# CONF_CPUID_SETTINGS CONF_MEMMAP_SETTINGS +.if ${PORT_OPTIONS:MNET_PROTO_FCOE} +UNDEFINES+= NET_PROTO_FCOE +.endif -# -# CON_PCBIOS CON_SERIAL \ -# CON_SYSLOG CON_SYSLOGS CON_VMWARE CON_DEBUGCON CON_VESAFB \ +.if ${PORT_OPTIONS:MDOWNLOAD_PROTO_HTTPS} +UNDEFINES+= DOWNLOAD_PROTO_HTTPS +.endif -# chande undef to define: +.if ${PORT_OPTIONS:MDOWNLOAD_PROTO_FTP} +UNDEFINES+= DOWNLOAD_PROTO_FTP +.endif -# NET_PROTO_IPV6 NET_PROTO_FCOE -# DOWNLOAD_PROTO_HTTPS DOWNLOAD_PROTO_FTP -# DOWNLOAD_PROTO_NFS +.if ${PORT_OPTIONS:MDOWNLOAD_PROTO_NFS} +UNDEFINES+= DOWNLOAD_PROTO_NFS +.endif BINLIST= bin/undionly.kpxe bin/ipxe.iso bin/ipxe.usb ALL_TARGET?= ${BINLIST} +post-configure: + ${CP} -p ${WRKSRC}/config/general.h ${WRKSRC}/config/general.h.orig + for x in ${DEFINESGENERAL} ; do \ + ${REINPLACE_CMD} -E -e "s|.*([[:space:]]$$x[[:space:]].*)|#define\1|" ${WRKSRC}/config/general.h ;\ + done + for x in ${UNDEFINES} ; do \ + ${REINPLACE_CMD} -E -e "s|.*([[:space:]]$$x[[:space:]].*)|#define\1|" ${WRKSRC}/config/general.h ;\ + done + ${CP} -p ${WRKSRC}/config/settings.h ${WRKSRC}/config/settings.h.orig + for x in ${DEFINESSETTINGS} ; do \ + ${REINPLACE_CMD} -E -e "s|.*([[:space:]]$$x[[:space:]].*)|#define\1|" ${WRKSRC}/config/settings.h ;\ + done + ${CP} -p ${WRKSRC}/config/console.h ${WRKSRC}/config/console.h.orig + for x in ${DEFINESCONSOLE} ; do \ + ${REINPLACE_CMD} -E -e "s|.*([[:space:]]$$x[[:space:]].*)|#define\1|" ${WRKSRC}/config/console.h ;\ + done + -@${DIFF} ${WRKSRC}/config/general.h.orig ${WRKSRC}/config/general.h + -@${DIFF} ${WRKSRC}/config/settings.h.orig ${WRKSRC}/config/settings.h + -@${DIFF} ${WRKSRC}/config/console.h.orig ${WRKSRC}/config/console.h + do-install: ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${INSTALL_DATA} ${BINLIST} ${STAGEDIR}${DATADIR}