From owner-svn-soc-all@FreeBSD.ORG Fri Jun 5 18:37:40 2015 Return-Path: Delivered-To: svn-soc-all@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 A759347D for ; Fri, 5 Jun 2015 18:37:40 +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 88B401C58 for ; Fri, 5 Jun 2015 18:37:40 +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 t55IbeOv054782 for ; Fri, 5 Jun 2015 18:37:40 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t55Ibc4v054745 for svn-soc-all@FreeBSD.org; Fri, 5 Jun 2015 18:37:38 GMT (envelope-from kczekirda@FreeBSD.org) Date: Fri, 5 Jun 2015 18:37:38 GMT Message-Id: <201506051837.t55Ibc4v054745@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: r286696 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2015 18:37:40 -0000 Author: kczekirda Date: Fri Jun 5 18:37:38 2015 New Revision: 286696 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286696 Log: remove bash from dependencies Added: soc2015/kczekirda/ipxe/files/patch-arch_i386_Makefile.pcbios soc2015/kczekirda/ipxe/files/patch-util_gensdsk Modified: soc2015/kczekirda/ipxe/Makefile soc2015/kczekirda/ipxe/files/patch-util_geniso Modified: soc2015/kczekirda/ipxe/Makefile ============================================================================== --- soc2015/kczekirda/ipxe/Makefile Fri Jun 5 17:26:07 2015 (r286695) +++ soc2015/kczekirda/ipxe/Makefile Fri Jun 5 18:37:38 2015 (r286696) @@ -14,8 +14,8 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64/i386 -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ - mkisofs:${PORTSDIR}/sysutils/cdrtools \ +BUILD_DEPENDS+= mkisofs:${PORTSDIR}/sysutils/cdrtools \ + syslinux:${PORTSDIR}/sysutils/syslinux \ gcc48:${PORTSDIR}/lang/gcc48 MAKE_JOBS_SAFE= yes Added: soc2015/kczekirda/ipxe/files/patch-arch_i386_Makefile.pcbios ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/kczekirda/ipxe/files/patch-arch_i386_Makefile.pcbios Fri Jun 5 18:37:38 2015 (r286696) @@ -0,0 +1,25 @@ +--- arch/i386/Makefile.pcbios.orig 2015-06-04 19:07:30 UTC ++++ arch/i386/Makefile.pcbios +@@ -57,19 +57,19 @@ LIST_NAME_isarom := ROMS + NON_AUTO_MEDIA += iso + %iso: %lkrn util/geniso + $(QM)$(ECHO) " [GENISO] $@" +- $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" bash util/geniso -o $@ $< ++ $(Q)ISOLINUX_BIN=$(ISOLINUX_BIN) VERSION="$(VERSION)" sh util/geniso -o $@ $< + + # rule to make a floppy emulation ISO boot image + NON_AUTO_MEDIA += liso + %liso: %lkrn util/geniso + $(QM)$(ECHO) " [GENISO] $@" +- $(Q)VERSION="$(VERSION)" bash util/geniso -l -o $@ $< ++ $(Q)VERSION="$(VERSION)" sh util/geniso -l -o $@ $< + + # rule to make a syslinux floppy image (mountable, bootable) + NON_AUTO_MEDIA += sdsk + %sdsk: %lkrn util/gensdsk + $(QM)$(ECHO) " [GENSDSK] $@" +- $(Q)bash util/gensdsk $@ $< ++ $(Q)sh util/gensdsk $@ $< + + # rule to write disk images to /dev/fd0 + NON_AUTO_MEDIA += fd0 Modified: soc2015/kczekirda/ipxe/files/patch-util_geniso ============================================================================== --- soc2015/kczekirda/ipxe/files/patch-util_geniso Fri Jun 5 17:26:07 2015 (r286695) +++ soc2015/kczekirda/ipxe/files/patch-util_geniso Fri Jun 5 18:37:38 2015 (r286696) @@ -1,6 +1,55 @@ ---- util/geniso.orig 2015-06-03 19:19:11 UTC +--- util/geniso.orig 2015-06-05 17:32:45 UTC +++ util/geniso -@@ -123,7 +123,7 @@ case "${LEGACY}" in +@@ -2,7 +2,7 @@ + # + # Generate a isolinux ISO boot image + +-function help() { ++help() { + echo "usage: ${0} [OPTIONS] foo.lkrn [bar.lkrn,...]" + echo + echo "where OPTIONS are:" +@@ -40,7 +40,7 @@ fi + # There should either be mkisofs or the compatible genisoimage program + for command in genisoimage mkisofs; do + if ${command} --version >/dev/null 2>/dev/null; then +- mkisofs=(${command}) ++ mkisofs=${command} + break + fi + done +@@ -53,9 +53,9 @@ fi + dir=$(mktemp -d bin/iso.dir.XXXXXX) + cfg=${dir}/isolinux.cfg + +-mkisofs+=(-quiet -l -volid "iPXE" -preparer "iPXE build system" +- -appid "iPXE ${VERSION} - Open Source Network Boot Firmware" +- -publisher "http://ipxe.org/" -c boot.cat) ++mkisofs="$mkisofs -quiet -l -volid \"iPXE\" -preparer \"iPXE build system\"" ++mkisofs="$mkisofs -appid \"iPXE ${VERSION} - Open Source Network Boot Firmware\"" ++mkisofs="$mkisofs -publisher \"http://ipxe.org/\" -c boot.cat" + + # generate the config + cat > ${cfg} </dev/null 2>/dev/null; then Added: soc2015/kczekirda/ipxe/files/patch-util_gensdsk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2015/kczekirda/ipxe/files/patch-util_gensdsk Fri Jun 5 18:37:38 2015 (r286696) @@ -0,0 +1,18 @@ +--- util/gensdsk.orig 2015-06-05 17:32:57 UTC ++++ util/gensdsk +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # + # Generate a syslinux floppy that loads a iPXE image + # +@@ -44,8 +44,7 @@ do + # shorten name for 8.3 filesystem + b=$(basename $f) + g=${b%.lkrn} +- g=${g//[^a-z0-9]} +- g=${g:0:8}.krn ++ g=$(echo $g | sed -e 's/[^a-z0-9]//g' | cut -c1-8).krn + case "$first" in + "") + echo DEFAULT $g