From patchwork Wed Aug 1 05:53:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 951953 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41gN9p4m1dz9s3Z for ; Wed, 1 Aug 2018 16:06:54 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="FhflXmlr"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UPLXTroY"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 41gN9p2RGvzF1BS for ; Wed, 1 Aug 2018 16:06:54 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="FhflXmlr"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UPLXTroY"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mendozajonas.com (client-ip=66.111.4.25; helo=out1-smtp.messagingengine.com; envelope-from=sam@mendozajonas.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=mendozajonas.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="FhflXmlr"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="UPLXTroY"; dkim-atps=neutral Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41gMtT45kDzF1Pt for ; Wed, 1 Aug 2018 15:53:37 +1000 (AEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 02EED21903; Wed, 1 Aug 2018 01:53:35 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 01 Aug 2018 01:53:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=EzxtVKZjWWNecWwhTdqd2twRn763910h4v5zqH9CAX8=; b=FhflXmlr KbJpeyxLtqTeqikVNqEpS4KLtWGadryx5kkQbesLE/T7IQSGFp11UD8T96th4Rbe B33YnL21LFSht+NWQdXxzmjnNis85p/3dxmaDVFCZpVigJfe0D/iFqFC10W2tudC LglyCihn9fo6qO5jWPWn4hr/UsthWvifun6eVfV5X+eUYT3HDC+MSUPn37z96KJb EeJydYBRh/M7Ag1NUJNwJz4HY7e8FJBP+hye5Hdr7RV7bONCauwNynj6TODTbIzy WuYp73q00EsX42kRvq9/UsPNyNf3sjShtvdbX009g7erhJ5UZTHlFTa2aaPjv8Of uQtGey4T0WEVHw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=EzxtVKZjWWNecWwhTdqd2twRn763910h4v5zqH9CAX8=; b=UPLXTroY DnMmMtr8rS5ldBOl9bnbgMLy6N5thm43iHE1VzlJrqx70Qoe8UHTWMxw+DaF2QHx FTgP/SbtaEP2izGNxhBeGJ/OrvfmNTd/++b5v5e4LxZB+myqJkjechQw5IhRte1z cPLTPTYnaEPyKHZM9VXyUTLgiJ6gxl02E5sEgXCJQwGg9jGIDSZPSorJIW1uwk5/ 5EovC1BQuRf7Ij4rV5da5yZRHwW2N/ChSLwElL4pXp6+wGw9r1xBIDQTV0QxmI0z OS68oyggqsEmSW+kerbixkellnfp3QFFU40Zme9QVenu8hYDnBMlu4+05b9nGaR1 6p1mR2Raw/ZAlA== X-ME-Proxy: X-ME-Sender: Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 8445310268; Wed, 1 Aug 2018 01:53:33 -0400 (EDT) From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 3/3] docker: Pass extra options to configure Date: Wed, 1 Aug 2018 15:53:18 +1000 Message-Id: <20180801055318.7420-3-sam@mendozajonas.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180801055318.7420-1-sam@mendozajonas.com> References: <20180801055318.7420-1-sam@mendozajonas.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Pass extra configure options and CFLAGS/LDFLAGS to docker to enable building multiple configurations. Signed-off-by: Samuel Mendoza-Jonas --- docker/build-pb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/docker/build-pb b/docker/build-pb index ad08ef9..baac2fd 100755 --- a/docker/build-pb +++ b/docker/build-pb @@ -18,15 +18,18 @@ usage () { echo " -i --interactive - Run an interactive pb-builder container." >&2 echo " -t --tag - Print Docker tag to stdout and exit." >&2 echo " -v --verbose - Verbose execution." >&2 + echo " -o --options - Extra arguments for configure." >&2 echo "Environment:" >&2 echo " DOCKER_TAG - Default: '${DOCKER_TAG}'" >&2 + echo " CFLAGS - Default: '${CFLAGS}'" >&2 + echo " LDFLAGS - Default: '${LDFLAGS}'" >&2 echo "Examples:" >&2 echo " ${name} -vc" echo " ${name} -v" } -short_opts="cdhitv" -long_opts="check,dry-run,help,interactive,tag,verbose" +short_opts="cdhitvo:" +long_opts="check,dry-run,help,interactive,tag,verbose,options:" opts=$(getopt --options ${short_opts} --long ${long_opts} -n "${name}" -- "$@") @@ -43,6 +46,11 @@ while true ; do check=1 shift ;; + -o | --options) + shift + configure_opts=${1} + shift + ;; -d | --dry-run) dry_run=1 shift @@ -112,8 +120,10 @@ else docker_extra="true" fi +flags="CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS}" + cd "${TOP_DIR}" docker_args="${docker_base_args} ${docker_user_args}" run_cmd "docker run ${docker_args} ${DOCKER_TAG} /bin/bash \ -e ${bash_debug} \ - -c './bootstrap && ./configure --with-ncurses && make && ${docker_extra}'" + -c './bootstrap && ${flags} ./configure ${configure_args[@]} && make && ${docker_extra}'"