From owner-svn-soc-all@FreeBSD.ORG  Sat Jun 20 18:54:18 2015
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
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 9A76DC5E
 for <svn-soc-all@hub.freebsd.org>; Sat, 20 Jun 2015 18:54:18 +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 88E24FDD
 for <svn-soc-all@FreeBSD.org>; Sat, 20 Jun 2015 18:54:18 +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 t5KIsIg9049989
 for <svn-soc-all@FreeBSD.org>; Sat, 20 Jun 2015 18:54:18 GMT
 (envelope-from kczekirda@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5KIsHT0049985
 for svn-soc-all@FreeBSD.org; Sat, 20 Jun 2015 18:54:17 GMT
 (envelope-from kczekirda@FreeBSD.org)
Date: Sat, 20 Jun 2015 18:54:17 GMT
Message-Id: <201506201854.t5KIsHT0049985@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: r287390 - in soc2015/kczekirda/ipxe: . files
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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2015 18:54:18 -0000

Author: kczekirda
Date: Sat Jun 20 18:54:17 2015
New Revision: 287390
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287390

Log:
  embeded script support and portlint WARNING fix

Added:
  soc2015/kczekirda/ipxe/files/embedded.ipxe
Modified:
  soc2015/kczekirda/ipxe/Makefile

Modified: soc2015/kczekirda/ipxe/Makefile
==============================================================================
--- soc2015/kczekirda/ipxe/Makefile	Sat Jun 20 17:28:30 2015	(r287389)
+++ soc2015/kczekirda/ipxe/Makefile	Sat Jun 20 18:54:17 2015	(r287390)
@@ -97,8 +97,8 @@
 DEFINESGENERAL+=	IMAGE_ELF
 .endif
 
-.if ${PORT_OPTIONS:MIMAGE_MOOLTIBOOT}
-DEFINESGENERAL+=	IMAGE_MOOLTIBOOT
+.if ${PORT_OPTIONS:MIMAGE_MULTIBOOT}
+DEFINESGENERAL+=	IMAGE_MULTIBOOT
 .endif
 
 .if ${PORT_OPTIONS:MIMAGE_PXE}
@@ -217,6 +217,10 @@
 UNDEFINES+=			DOWNLOAD_PROTO_NFS
 .endif
 
+EMBEDED_SCR=    ${FILESDIR}/embedded.ipxe
+
+MAKE_ARGS+=     EMBEDDED_IMAGE=${EMBEDED_SCR}
+
 BINLIST=		bin/undionly.kpxe bin/ipxe.iso bin/ipxe.usb
 
 ALL_TARGET?=	${BINLIST}
@@ -244,7 +248,7 @@
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${BINLIST} ${STAGEDIR}${DATADIR}
-#	${INSTALL_DATA} ${EMBEDED_SCR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${EMBEDED_SCR} ${STAGEDIR}${DATADIR}
 	${LN} -sfh ${PORTVERSION} ${STAGEDIR}${DATADIR}/VER
 
 .include <bsd.port.mk>

Added: soc2015/kczekirda/ipxe/files/embedded.ipxe
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2015/kczekirda/ipxe/files/embedded.ipxe	Sat Jun 20 18:54:17 2015	(r287390)
@@ -0,0 +1,4 @@
+#!ipxe
+
+dhcp
+shell