From patchwork Mon Aug 13 06:36:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 956832 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 41pmHF6sB1z9s9l for ; Mon, 13 Aug 2018 16:37:13 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YsrnhLtw"; 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 41pmHF4ZrnzF0dS for ; Mon, 13 Aug 2018 16:37:13 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YsrnhLtw"; dkim-atps=neutral X-Original-To: pdbg@lists.ozlabs.org Delivered-To: pdbg@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::52b; helo=mail-pg1-x52b.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YsrnhLtw"; dkim-atps=neutral Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 41pmH81xnLzF0bq for ; Mon, 13 Aug 2018 16:37:07 +1000 (AEST) Received: by mail-pg1-x52b.google.com with SMTP id y5-v6so7109050pgv.1 for ; Sun, 12 Aug 2018 23:37:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=7+RkHQlpzQm0zUZR5BzVfHUSJbdo14CzgZQ0xuwQj1Y=; b=YsrnhLtwEcR1zvuMOs8rsdcHCOXDzZW5/Z/IrWt/pNXgT3u+O/Ew+3drPcE7N5J90M S90B9T/yfVzA3B2duWYB+8H2QnNmEQENq7WPBD4pzf/I71MBEhBTcbilpercdQiM6zjt COty+Y3npE9vx1u7kyFiYvUBFAfm3T0voEzY4WWKKRpkZGxSMIF9LdVEjyHUPkepc/bq yxE5OGr1DqAm8EmR2hJYIBS7tGQUtaubnxrypf1Yd3EWDWjBwnbMv2q5Di7l+KU8RL3A B+f5ran7oVNO1cvCuMdnPO/G0GvdJMTBpO2ewHZ9x+VrvxlSVsN8zlaxrHhRVdbE9l2A nrVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=7+RkHQlpzQm0zUZR5BzVfHUSJbdo14CzgZQ0xuwQj1Y=; b=IfNX/n0PJCyfLJmXo6jI28TTbIiMPD2As+7q+SUlmBeUp4A1X4SltqyBbsF+kB7ygd n2RuR42/K+2D38IHiN+NvUUUhvJgGfAqyv6dIWJB0P8r2Lx8+Xg2xVyUHrCEawdfBCPl tmPhC8BJER+AsqBHW+i9w4aisuBfsqAxSGsqnEHjEQ2ZIrAU7Yagu/oAmSBYkrZtDpp+ 5rzsHFmo7nXGjd5AnnkNr5R7+Pxgn/7c3L5Vvp6uBc3N9jIf7wWG+biFaNqoIZNEmP0l sbf+lHkQsvhcFEk7GMcCLliJHl4giH7pmPqltX2SLgEdF1hGaCWpeokhGvNENxyXJjcN BNdA== X-Gm-Message-State: AOUpUlEKCmyxKTKg5/A7wyCTJOyclS8Z3sIjqfyHy1RsgPJ7xHXGgGBk mhhlkoBDuhoLcAIxgDrUkRFa2DGV X-Google-Smtp-Source: AA+uWPz8aECYa15p/xrp+UUOSTImEserYdTy6qUWlw/Ctv/GxTF6G0Ig/gNDXhPsaT4ksZ6koI+V7A== X-Received: by 2002:a63:35c3:: with SMTP id c186-v6mr15809601pga.217.1534142225722; Sun, 12 Aug 2018 23:37:05 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.18]) by smtp.gmail.com with ESMTPSA id x80-v6sm35167992pfe.129.2018.08.12.23.37.03 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Aug 2018 23:37:04 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 13 Aug 2018 16:07:00 +0930 From: Joel Stanley To: pdbg@lists.ozlabs.org Date: Mon, 13 Aug 2018 16:06:51 +0930 Message-Id: <20180813063652.20534-2-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180813063652.20534-1-joel@jms.id.au> References: <20180813063652.20534-1-joel@jms.id.au> Subject: [Pdbg] [PATCH 1/2] Move build.sh to utils directory X-BeenThere: pdbg@lists.ozlabs.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "mailing list for https://github.com/open-power/pdbg development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: pdbg-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Pdbg" Update travis config to point to the new location. Add a symlink so other CI still works, we will remove this once it has been moved over. Signed-off-by: Joel Stanley --- .build.sh | 59 +------------------------------------ .travis.yml | 2 +- .build.sh => utils/build.sh | 0 3 files changed, 2 insertions(+), 59 deletions(-) mode change 100755 => 120000 .build.sh copy .build.sh => utils/build.sh (100%) diff --git a/.build.sh b/utils/build.sh similarity index 100% copy from .build.sh copy to utils/build.sh diff --git a/.build.sh b/.build.sh deleted file mode 100755 index 59fc6c3a524b..000000000000 --- a/.build.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -set -e - -CONTAINER=pdbg-build - -Dockerfile=$(cat << EOF -FROM ubuntu:18.04 -RUN apt-get update && apt-get install --no-install-recommends -yy \ - make \ - gcc-arm-linux-gnueabi \ - libc-dev-armel-cross \ - gcc-powerpc64le-linux-gnu \ - libc-dev-ppc64el-cross \ - autoconf \ - automake \ - libtool \ - git \ - device-tree-compiler -RUN groupadd -g ${GROUPS} ${USER} && useradd -d ${HOME} -m -u ${UID} -g ${GROUPS} ${USER} -USER ${USER} -ENV HOME ${HOME} -RUN /bin/bash -EOF -) - -docker pull ubuntu:18.04 -docker build -t ${CONTAINER} - <<< "${Dockerfile}" - -RUN="docker run --rm=true --user=${USER} -w ${PWD} -v ${HOME}:${HOME} -t ${CONTAINER}" - -${RUN} ./bootstrap.sh - -# Out-of-tree build, arm -# TODO: clean up when the build fails -SRCDIR=$PWD -TEMPDIR=`mktemp -d ${HOME}/pdbgobjXXXXXX` -RUN_TMP="docker run --rm=true --user=${USER} -w ${TEMPDIR} -v ${HOME}:${HOME} -t ${CONTAINER}" -${RUN_TMP} ${SRCDIR}/configure --host=arm-linux-gnueabi -${RUN_TMP} make -rm -rf ${TEMPDIR} - -# In-tree build, arm -${RUN} ./configure --host=arm-linux-gnueabi -${RUN} make -${RUN} make clean - -# In-tree build, powerpc64le -${RUN} ./configure --host=powerpc64le-linux-gnu -${RUN} make -${RUN} make clean - -# In-tree build, amd64 -# TODO: work out how to install a amd64 compiler if we are building on a eg. -# ppc machine in a way that still works when we're on amd64 -${RUN} ./configure --host=x86-64-linux-gnu -${RUN} make -${RUN} make clean diff --git a/.build.sh b/.build.sh new file mode 120000 index 000000000000..d96834636319 --- /dev/null +++ b/.build.sh @@ -0,0 +1 @@ +utils/build.sh \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index e6efef64657d..9e1a86bc3140 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ services: - docker script: - - ./.build.sh + - ./utils/build.sh