From patchwork Tue May 8 10:22:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 910095 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gFvF5XH4z9ryk for ; Tue, 8 May 2018 20:23:37 +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="co1XgLxq"; 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 40gFvF3qRRzF24N for ; Tue, 8 May 2018 20:23:37 +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="co1XgLxq"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::241; helo=mail-pl0-x241.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="co1XgLxq"; dkim-atps=neutral Received: from mail-pl0-x241.google.com (mail-pl0-x241.google.com [IPv6:2607:f8b0:400e:c01::241]) (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 40gFv026SMzF259 for ; Tue, 8 May 2018 20:23:24 +1000 (AEST) Received: by mail-pl0-x241.google.com with SMTP id t22-v6so1967636plo.7 for ; Tue, 08 May 2018 03:23:23 -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=LfCUL2MPKm1iSFHAlYqptVWPPIZqPR785PsFgtrW4uQ=; b=co1XgLxqS2YlXz4hcIzaCxz8+DP1CNTTrR2JOJcOvP1eji6xztblQLyxjLnDECANjx yCZX9wZ62O9cFeNUy6RZk9V7bBxx83aUSz+hjS/SQgdQKP1GeHc559yxiS+flIuHljBx qN0jRIFW335Bkceei9ngncquWgZfT8zqTjN7iYorV/dm4I0I86GO3ShXrvEi1eakWfd3 PiyxxWIaOaDhVM/s0pHen2iVuOlj24srB2ppovZBIkCHSI8+3onUod+gCaVkiuyVnD57 TI6B8HAS+Raye+gkFCtOtQBHoo4Dg11nOO7o4JII4Ne3oFzgmxeRwb2WsVMwbrbk9uQe Lumw== 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=LfCUL2MPKm1iSFHAlYqptVWPPIZqPR785PsFgtrW4uQ=; b=a3eM9yPElkBbbIblA6gvibZSfL92Tjg2qQ3hYRzYVFUUcxIXiu4FNlbOByh/P8rP0e IDhn4zysyrSfZKZqZ0KY7p5ppWgGI70DR9MU5ps1sAGZsQtg/cofXDoEQoeq68Nswuiq sYHimnNCQ64/dw2swPx0XKkmXR8yiwOIhBOEWnO/AmG6BW3M355CSsUgzLE2reKMZD5d GyaOHiUds6qikFDJZ4GFv4wIDeP0TUt6EFF0cAE/5mcTzPJ3SJpMXPUnoS9UGbRaNy7z zmNKInsmcUeHEqpkngpe3yHJnv+Nc0kbYLrHgmSSDaH4+drhUVAJXeCm/l++sirxIEux wr2A== X-Gm-Message-State: ALQs6tDx22YyoYeV/W0NNE7b3Gt8yxNJDrW7H8sP80uCmXIPqiixvrm+ CKwSrbyd09r46D1d6n/1L5bNX9wc X-Google-Smtp-Source: AB8JxZrg4DVXK8dhkT4HVlXXAUjgAgG0eJmH4TII3hTVxEuVGoW0TXd1JP0R70BoYnMb6QLfS8YZHw== X-Received: by 2002:a17:902:7406:: with SMTP id g6-v6mr23606180pll.237.1525775001778; Tue, 08 May 2018 03:23:21 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id g26sm51243513pfh.76.2018.05.08.03.23.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:23:21 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:15 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:52:57 +0930 Message-Id: <20180508102303.18684-2-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 1/7] opal-ci: Build qemu from Cedric's powernv-2.12 branch X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This contains the latest features. It's close to upstream, but there's enough stuff in there that it probably makes sense to continue using it for now. Signed-off-by: Joel Stanley --- opal-ci/build-qemu-powernv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opal-ci/build-qemu-powernv.sh b/opal-ci/build-qemu-powernv.sh index 3c76d8fb7d71..d852eb98a5fa 100755 --- a/opal-ci/build-qemu-powernv.sh +++ b/opal-ci/build-qemu-powernv.sh @@ -2,7 +2,7 @@ set -e set -vx -git clone --depth=1 -b qemu-powernv-for-skiboot-3 git://github.com/open-power/qemu.git +git clone --depth=1 -b powernv-2.12 git://github.com/legoater/qemu.git cd qemu git submodule update --init dtc export CC="ccache gcc" From patchwork Tue May 8 10:22:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 910096 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gFvb6Jxpz9ryk for ; Tue, 8 May 2018 20:23:55 +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="kU/gZ1ir"; 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 40gFvb4ZxWzF24c for ; Tue, 8 May 2018 20:23:55 +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="kU/gZ1ir"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::242; helo=mail-pf0-x242.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="kU/gZ1ir"; dkim-atps=neutral Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (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 40gFv71WQnzF23B for ; Tue, 8 May 2018 20:23:31 +1000 (AEST) Received: by mail-pf0-x242.google.com with SMTP id f189so23736682pfa.7 for ; Tue, 08 May 2018 03:23:30 -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=V+WkjuyW6mr9M0sXbds3i77LOaBoVeJXcFi5teu9j+Y=; b=kU/gZ1irfFfoE30g2gf7T0kAFnetKetJ/X1u1ucXb9n6auOFguaS+r8IAuEcs2AyZL KBEwDAr1QVWOPmCaRkERYzBfqjO5MNmPHE0j2y0u9bqhR7Vf3qTvIj4n60xKDpxsLps+ A6Na7ReeY1hVD9uP2R393A6BcQaCMqIBNktt9FOT9wxqZN5hSFsgs8ZsUc/hvjw4F98s wxPzuGb4HAbPxUN0LMAk3syObW+vDJTcTtWFo2bKXae/gnYYEThFoWF/g2T5WuRkVsut KxhrnE+Q9i5k7Uty0Q1RBbB85Dw3frwesZniCgGAkPVcLOG+xAI9GgiW1rgFsQSYzIZj Z4fA== 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=V+WkjuyW6mr9M0sXbds3i77LOaBoVeJXcFi5teu9j+Y=; b=B4jdWjfLhTxvRSLFCqJrHKuBK+B1uMMbb0TvOM6UK8u9/OZu97FDFxTYUDyGhQxCtg NQD78sWtrhAbBdz577mzuDjWoPMgZa4R/0TtFyn443e4Tk4vMtvcpvuI+cEjAHQ995n7 fs5Bhy4x+1MZ9o4SWY6cnmwqGgFj5X5faMyCwsSZ2927a8pCItlZEoOlijow8eM5rg1v 7bd3nEEVKhHMxcJMPLwM+5N/nE8FqIrKWySgI3IcM9tWSOzsjUQZGHwnJmkXzcGGboVb s+KQR57V7AOo664Lx0VHke4vHt52531DZQ76WEW5dxDTJ/XV0iJQpdTG5dQR6c4bDhCE Wohw== X-Gm-Message-State: ALQs6tAAjoyg9EFzlc7K3XyV49BQGcZbDo/r5EQy2Vo5rkYdGinAQ2lY /RCK7a/24/ZINrUZyGqb6iLSc9oc X-Google-Smtp-Source: AB8JxZolfN2KSCzDq/+2Rw4BBN/QDqRQKuqmKkp/7qCI8otpPPI1potLb+fxWCgyejjl3qQY4FPzQg== X-Received: by 2002:a63:6344:: with SMTP id x65-v6mr32414374pgb.34.1525775008451; Tue, 08 May 2018 03:23:28 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id j5sm58583065pfe.119.2018.05.08.03.23.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:23:27 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:22 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:52:58 +0930 Message-Id: <20180508102303.18684-3-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 2/7] opal-ci: 18.04: Go back to updating before installing packages X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Docker tries to cache stuff and it bites us. Signed-off-by: Joel Stanley --- opal-ci/Dockerfile-ubuntu-18.04 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04 index e7ba238bba0c..4c272d37c23f 100644 --- a/opal-ci/Dockerfile-ubuntu-18.04 +++ b/opal-ci/Dockerfile-ubuntu-18.04 @@ -1,8 +1,7 @@ FROM ubuntu:18.04 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -qq -RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi -RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 gcc-arm-linux-gnueabi clang qemu-system-ppc +RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 gcc-arm-linux-gnueabi clang qemu-system-ppc RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ From patchwork Tue May 8 10:22:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 910097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gFw02YWkz9ryk for ; Tue, 8 May 2018 20:24:16 +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="QKNtK7lZ"; 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 40gFw00ncDzF26F for ; Tue, 8 May 2018 20:24:16 +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="QKNtK7lZ"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::242; helo=mail-pl0-x242.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="QKNtK7lZ"; dkim-atps=neutral Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) (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 40gFvG5qJzzF22m for ; Tue, 8 May 2018 20:23:38 +1000 (AEST) Received: by mail-pl0-x242.google.com with SMTP id f7-v6so1967360plr.4 for ; Tue, 08 May 2018 03:23:38 -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=4aHbNmv660mWOmrn2Xhkwghj9rh8lOnn+qdv5B9ajRE=; b=QKNtK7lZDzRFR5qyYLxR9hQFhabPWTm7avvti1o0ZoiedHle/c/sLenoUN3qmV6deR I+ckTEcuzDNxs6KL1z8yy9dd4ykqtP5UfxmJr5K3QDmNKnvW4aO+WgKNw/LlBoFA5y7Y BRyxKNwd6PwY0nEv+20H7Rh+zqIkLNxpl/k4ujCFrPiZB5Mnmh0lvxDtx/kMHB/mthQI BKog2I5B6Ae+k3Ji9w0sQTUz0Vitk10QBwE3gOFcO/GKci2zyzc6sjEwAfcn7+1qlDT1 Atyiy6QbAQONVPIv1i9Tg/tM8njxrJV5xitpQch4oCDCTtyJ+wPV6aAHJgrhK/Q91yIy BVcQ== 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=4aHbNmv660mWOmrn2Xhkwghj9rh8lOnn+qdv5B9ajRE=; b=aN/V2IuMWXGFBhWWvVikk8YshQA3cs0TYiWX5C1LwsOlrtskvotCuj4knJyKC2H2+n 1q8zVLe9zXHwRqtOZARTbcNXI6HWrxfjkuICq7ZDQJR9UBIzD3AW3NU/SrAUquYfzyXu 2ejMjnQqu6W0UfsZ5NGxydGUtCyMHBRdX/bK1teLmLIeX4d5MMjp+kE7yeDeNziGZbH3 vQdApqLt53neWzlbjuBhxVIPkIpX9gbgepOxP1Dzdc/8A2cemztbmDSeeBnVdkHHFHrT 9emBghZakn5USjrqLBhDAG9Qr9+NBr27+gKXkYByxwt61MxZAS9VBTT1rNEnekzExaJx Cn/A== X-Gm-Message-State: ALQs6tBxZ1zbrMRr3gsehsla9Jbrzqp8L9dVHeEmTF7ES9uisRFtug6Z pBaW/hak7X+EnStI3TeqO9q8LUsn X-Google-Smtp-Source: AB8JxZpoeQwy78EKzeapEQhZa+lenM349muGdC3Ujg2LEyetlHtgaUObVM09XBsxS0cOx9Xy9hzS1A== X-Received: by 2002:a17:902:a702:: with SMTP id w2-v6mr21006926plq.8.1525775016522; Tue, 08 May 2018 03:23:36 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id q9-v6sm40233865pgs.5.2018.05.08.03.23.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:23:35 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:29 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:52:59 +0930 Message-Id: <20180508102303.18684-4-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 3/7] qemu-debian-test: Remove unusable hda option X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" When running this: qemu-system-ppc64 -m 2G -M powernv -kernel debian-jessie-vmlinux \ -initrd debian-jessie-initrd.gz -nographic \ -device ipmi-bmc-sim,id=ipmi0 -device isa-ipmi-bt,bmc=ipmi0 \ -hda /tmp/debian-jessie-install.qcow2.kDubGYDrqa We die with this error: qemu-system-ppc64: -hda /tmp/debian-jessie-install.qcow2.kDubGYDrqa: machine type does not support if=ide,bus=0,unit=0 Signed-off-by: Joel Stanley --- test/run_qemu-jessie-debian-installer_boot_test.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/run_qemu-jessie-debian-installer_boot_test.sh b/test/run_qemu-jessie-debian-installer_boot_test.sh index da946e639780..60648585aacb 100755 --- a/test/run_qemu-jessie-debian-installer_boot_test.sh +++ b/test/run_qemu-jessie-debian-installer_boot_test.sh @@ -31,16 +31,15 @@ if [ ! -f debian-jessie-initrd.gz ]; then fi T=`mktemp --tmpdir skiboot_qemu_debian-jessie-boot_test.XXXXXXXXXX` -D=`mktemp --tmpdir debian-jessie-install.qcow2.XXXXXXXXXX` +#D=`mktemp --tmpdir debian-jessie-install.qcow2.XXXXXXXXXX` # In future we should do full install: # FIXME: -append "DEBIAN_FRONTEND=text locale=en_US keymap=us hostname=OPALtest domain=unassigned-domain rescue/enable=true" - -qemu-img create -f qcow2 $D 128G 2>&1 > $T +# qemu-img create -f qcow2 $D 128G 2>&1 > $T ( cat < X-Patchwork-Id: 910098 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 40gFwL1nnRz9ryk for ; Tue, 8 May 2018 20:24:34 +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="ZQJY9UAQ"; 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 40gFwL0FtlzF2Mg for ; Tue, 8 May 2018 20:24:34 +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="ZQJY9UAQ"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::242; helo=mail-pf0-x242.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="ZQJY9UAQ"; dkim-atps=neutral Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (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 40gFvN3q57zF25M for ; Tue, 8 May 2018 20:23:44 +1000 (AEST) Received: by mail-pf0-x242.google.com with SMTP id e9so19752715pfi.4 for ; Tue, 08 May 2018 03:23:44 -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=JqZre9O6TKK79nEDTAiTiwEIIS16nKK9IHn++MS5bys=; b=ZQJY9UAQX8vWn2e7L6vJfKqTf4n8MWDGW6riTyFoxg5N+pSHl57WO+9BReh/qC4EFq 1XJq+1cb/FVH6LYIg8lxOznDqaVCtdJ/LEIghUXIsvMiQaMdKsfctoMhTIEss1no+WNl y/q/Jk+1gN6I550vdaFY8Dtc2yDjCxU0hbrzQenDywTIZD0HkGIO8oJKJkYyTwKrIzVv qL4bSad7QTDYpftdZ52bXBXaOifPUYuEBzHNi41Za1d0auMgl+eWjBj9yewV5n40OPUI 6wNy8t4cwVBmjt1AbWZdqAW7wgBEaUfcHOULS5lEGU9oX/ZYb4glEUKIC7EeT6ORD50x K7Ag== 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=JqZre9O6TKK79nEDTAiTiwEIIS16nKK9IHn++MS5bys=; b=jYlIx4WDV6Jz04ufWgN2ZPf7yVxyECVgqsKT584ePj6N+cfVBV+Oj+75UhCduro9lC GIRlDfzrYRofP7K/16naTSxWh7/ntR/bXgHDO+fdB6TEtJkq409wCKDW206NBGOaxWPq YVs0PkBoJx5MjbqmWKcQv53QLqitNZNKF2BueWYNE7jT17zNQ/bK/H+kE5jxtzvteDcj Zv0YF5hbCbavqZ29WCHGgn3toiYLTRHNxrCeAJom84MVj2oe14yVxhu9r8IyCt0mT6HB kz04wD5Fnsvc824Dykk8gQJeeWhvkuoSQVXpQeuiVI8kR6pY0H4SlRFphGC1PZF0b/zd mngQ== X-Gm-Message-State: ALQs6tArUVRwjJMxCmUQKRb8x/ZM60LJIVbik97TqwXhUxJeqqtuT2wE LUXKEIZM3a4wEHDHelIUF57meavA X-Google-Smtp-Source: AB8JxZoyL+N1RP1A/orJSx+VVB8UWldj732tFFBB5bnEMXLS4gfmXwkWx/k0mHXopjA29pfU1uzpOg== X-Received: by 2002:a63:6fc9:: with SMTP id k192-v6mr32587734pgc.143.1525775022321; Tue, 08 May 2018 03:23:42 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id i72sm29560845pfe.22.2018.05.08.03.23.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:23:41 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:37 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:53:00 +0930 Message-Id: <20180508102303.18684-5-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 4/7] test: Simplify build process for hello and sreset tests X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Link with ld instead of gcc so we can build with clang as cc. Remove the linker script and unnecessary flags. The application links just fine without them. Add cflags required by clang in order to build for the correct target. Remove the dependency file generation. The assembly files don't include any headers, so they weren't doing anything. Simplify clean rule, as the $(RM) alias does -f for us, and we no longer have .d files. Build tested on ppc64le and amd64. Booted in Qemu on both using: qemu-system-ppc64 -M powernv -nodefaults -nographic -serial stdio \ -kernel test/hello_world/hello_kernel/hello_kernel Signed-off-by: Joel Stanley --- test/hello_world/Makefile.check | 21 ++++++++------ test/hello_world/hello_kernel/hello_kernel.ld | 29 ------------------- test/sreset_world/Makefile.check | 21 ++++++++------ .../sreset_kernel/sreset_kernel.ld | 29 ------------------- 4 files changed, 24 insertions(+), 76 deletions(-) delete mode 100644 test/hello_world/hello_kernel/hello_kernel.ld delete mode 100644 test/sreset_world/sreset_kernel/sreset_kernel.ld diff --git a/test/hello_world/Makefile.check b/test/hello_world/Makefile.check index e791ea76b72b..0390cf662285 100644 --- a/test/hello_world/Makefile.check +++ b/test/hello_world/Makefile.check @@ -16,6 +16,13 @@ hello_world-tests: $(HELLO_WORLD_STB_TEST:%=%-check-stb-p9-mambo) boot-tests: hello_world-tests check: hello_world-tests +cc-name := $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) + +ifeq ($(cc-name),clang) +hello_kernel_CFLAGS = --target=powerpc64-linux-gnu +endif +hello_kernel_CFLAGS += -mbig-endian -m64 + $(HELLO_WORLD_TEST:%=%-check-smt-mambo): %-check-smt-mambo: % skiboot.lid $(call Q , BOOT TEST , THREADS=2 ./test/hello_world/run_mambo_hello_world.sh , $@) @@ -46,15 +53,11 @@ $(HELLO_WORLD_STB_TEST:%=%-check-stb-p9-mambo): %-check-stb-p9-mambo: % skiboot. $(HELLO_WORLD_TEST:%=%-check-qemu): %-check-qemu: % skiboot.lid $(call Q , BOOT TEST , ./test/hello_world/run_qemu_hello_world.sh, $@) -test/hello_world/hello_kernel/hello_kernel.o: test/hello_world/hello_kernel/hello_kernel.S test/hello_world/hello_kernel/hello_kernel.ld - $(call Q,CC, $(CC) -m64 -c -MMD -o $@ $< ,$@) - -hello_kernel_LDFLAGS=-m64 -Wl,--build-id=none -T test/hello_world/hello_kernel/hello_kernel.ld -ffreestanding -nostdlib -Ttext=0x0 -N - --include $(wildcard test/hello_world/hello_kernel/*.d) +test/hello_world/hello_kernel/hello_kernel.o: test/hello_world/hello_kernel/hello_kernel.S + $(call Q,CC, $(CC) $(hello_kernel_CFLAGS) -c -o $@ $< ,$@) test/hello_world/hello_kernel/hello_kernel: test/hello_world/hello_kernel/hello_kernel.o - $(call Q,LD, $(CC) $(hello_kernel_LDFLAGS) -o $@ $^ , $@) + $(call Q,LD, $(LD) -EB -m elf64ppc -N -o $@ $^ , $@) test/hello_world/hello_kernel/hello_kernel.stb: test/hello_world/hello_kernel/hello_kernel libstb/create-container $(call Q,STB-DEVELOPMENT-SIGNED-CONTAINER,$(SRC)/libstb/sign-with-local-keys.sh $< $@ $(SRC)/libstb/keys/,$@) @@ -62,5 +65,5 @@ test/hello_world/hello_kernel/hello_kernel.stb: test/hello_world/hello_kernel/he clean: hello_world-test-clean hello_world-test-clean: - $(RM) -f test/hello_world/hello_kernel/hello_kernel - $(RM) -f test/hello_world/hello_kernel/hello_kernel.[od] + $(RM) test/hello_world/hello_kernel/hello_kernel + $(RM) test/hello_world/hello_kernel/hello_kernel.o diff --git a/test/hello_world/hello_kernel/hello_kernel.ld b/test/hello_world/hello_kernel/hello_kernel.ld deleted file mode 100644 index d9bbc92857b2..000000000000 --- a/test/hello_world/hello_kernel/hello_kernel.ld +++ /dev/null @@ -1,29 +0,0 @@ -ENTRY(_start) -SECTIONS -{ - .text : - { - _start = .; - *(.text) - } - - . = ALIGN(4096); - .data : - { - *(.rodata*) - *(.data*) - *(.sdata*) - *(.got2) - } - - . = ALIGN(4096); - .bss : - { - _edata = .; - __bss_start = .; - *(.sbss) - *(.bss) - *(COMMON) - _end = . ; - } -} diff --git a/test/sreset_world/Makefile.check b/test/sreset_world/Makefile.check index 1bd7b4071f5e..ec9fd2747274 100644 --- a/test/sreset_world/Makefile.check +++ b/test/sreset_world/Makefile.check @@ -12,6 +12,13 @@ sreset_world-tests: $(SRESET_WORLD_STB_TEST:%=%-check-stb-smt-p9-mambo) boot-tests: sreset_world-tests check: sreset_world-tests +cc-name := $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) + +ifeq ($(cc-name),clang) +sreset_kernel_CFLAGS = --target=powerpc64-linux-gnu +endif +sreset_kernel_CFLAGS += -mbig-endian -m64 + $(SRESET_WORLD_TEST:%=%-check-smt-mambo): %-check-smt-mambo: % skiboot.lid $(call Q , BOOT TEST , THREADS=2 ./test/sreset_world/run_mambo_sreset.sh , $@) @@ -24,15 +31,11 @@ $(SRESET_WORLD_STB_TEST:%=%-check-stb-smt-mambo): %-check-stb-smt-mambo: % skibo $(SRESET_WORLD_STB_TEST:%=%-check-stb-smt-p9-mambo): %-check-stb-smt-p9-mambo: % skiboot.lid.stb $(call Q , BOOT TEST , SKIBOOT_ENABLE_MAMBO_STB=1 THREADS=2 ./test/sreset_world/run_mambo_p9_sreset.sh , $@) -test/sreset_world/sreset_kernel/sreset_kernel.o: test/sreset_world/sreset_kernel/sreset_kernel.S test/sreset_world/sreset_kernel/sreset_kernel.ld - $(call Q,CC, $(CC) -mbig-endian -m64 -c -MMD -o $@ $< ,$@) - -sreset_kernel_LDFLAGS=-m64 -Wl,--build-id=none -T test/sreset_world/sreset_kernel/sreset_kernel.ld -ffreestanding -nostdlib -Ttext=0x0 -mbig-endian -N - --include $(wildcard test/sreset_world/sreset_kernel/*.d) +test/sreset_world/sreset_kernel/sreset_kernel.o: test/sreset_world/sreset_kernel/sreset_kernel.S + $(call Q,CC, $(CC) $(sreset_kernel_CFLAGS) -c -o $@ $< ,$@) test/sreset_world/sreset_kernel/sreset_kernel: test/sreset_world/sreset_kernel/sreset_kernel.o - $(call Q,LD, $(CC) $(sreset_kernel_LDFLAGS) -o $@ $^ , $@) + $(call Q,LD, $(LD) -EB -m elf64ppc -N -o $@ $^ , $@) test/sreset_world/sreset_kernel/sreset_kernel.stb: test/sreset_world/sreset_kernel/sreset_kernel libstb/create-container $(call Q,STB-DEVELOPMENT-SIGNED-CONTAINER,$(SRC)/libstb/sign-with-local-keys.sh $< $@ $(SRC)/libstb/keys/,$@) @@ -41,5 +44,5 @@ test/sreset_world/sreset_kernel/sreset_kernel.stb: test/sreset_world/sreset_kern clean: sreset_world-test-clean sreset_world-test-clean: - $(RM) -f test/sreset_world/sreset_kernel/sreset_kernel - $(RM) -f test/sreset_world/sreset_kernel/sreset_kernel.[od] + $(RM) test/sreset_world/sreset_kernel/sreset_kernel + $(RM) test/sreset_world/sreset_kernel/sreset_kernel.o diff --git a/test/sreset_world/sreset_kernel/sreset_kernel.ld b/test/sreset_world/sreset_kernel/sreset_kernel.ld deleted file mode 100644 index d9bbc92857b2..000000000000 --- a/test/sreset_world/sreset_kernel/sreset_kernel.ld +++ /dev/null @@ -1,29 +0,0 @@ -ENTRY(_start) -SECTIONS -{ - .text : - { - _start = .; - *(.text) - } - - . = ALIGN(4096); - .data : - { - *(.rodata*) - *(.data*) - *(.sdata*) - *(.got2) - } - - . = ALIGN(4096); - .bss : - { - _edata = .; - __bss_start = .; - *(.sbss) - *(.bss) - *(COMMON) - _end = . ; - } -} From patchwork Tue May 8 10:23:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 910099 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 40gFwh1btxz9ryk for ; Tue, 8 May 2018 20:24:52 +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="Zo/RnP73"; 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 40gFwg73jfzF27h for ; Tue, 8 May 2018 20:24:51 +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="Zo/RnP73"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::241; helo=mail-pg0-x241.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="Zo/RnP73"; dkim-atps=neutral Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (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 40gFvV69BTzF22m for ; Tue, 8 May 2018 20:23:50 +1000 (AEST) Received: by mail-pg0-x241.google.com with SMTP id p9-v6so18080154pgc.9 for ; Tue, 08 May 2018 03:23:50 -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=TXTNuqLVPlC68xHbO5kyeQnEM/9dW9uYCJjMD/F6eLo=; b=Zo/RnP73KS3q7L95BeW45HNd4nzgTP2YARi4Xq1QjTiLIEgw8DkUfTVc9CiyEUeVkz cIMDhJdlTvaMYE2u8cQoLSG19PdZnl/4p6pT6QQVJctfD1kAoCljfOUwbngOkDfjDsCU Hw/2yV9Q64Zb3ey1djzt7ChHB8i0vctLD69BeMixFx2GmBoUUXoMECcnacKaFedT3jvW feBFBFu612zRMF6XwyUpBt2JAf2WFE1M/yyVcXlBFYPUnLuu3k5CV3FXKLDxXKGfHDmf a7pZVgfYXEYk/ZlaCa1PCHaoWzXtt3+H7EePwtIdFZusc7+Lz/Kv3Mh/qoOBOSb1qP55 foMw== 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=TXTNuqLVPlC68xHbO5kyeQnEM/9dW9uYCJjMD/F6eLo=; b=jNNJDnMI+/WTYz2CDIU9l42NFWCiVRJkp+pddSBJuOGk9CWctI684aKEwA9nbCI8RD fGLzuUOqK92+/df3UGZpd/y3eJy8ASFjeyhDf1kENNkpWryuSO1Qg9UJEFVqr6cH8MB0 EPYNjhcnQdRQFsB0TK7vk9F3LRxW/qzkD/qbKAyAaOjjSsb5hxKlbMCgO3JjgbSAZZu6 NwGys/suDHglpdcpYIjUu8BLfkxqukk3ZE5ausaOsWJx0D1IKJxSatf2dvCTi39KycSo 06R8PUd7E5jXnDhpsrm0gFNnf7QMR5O+b6vfkCxTujY6bVYTJVZjdBIHE6h91ZA0NcC1 AeYA== X-Gm-Message-State: ALQs6tCH9UjvLR72D5sYvssMUwLOLO5ygzWg/PoWqay+ta09sxq9nDrG C43WgAGjsKqzaRUjyrxp89D6lgAo X-Google-Smtp-Source: AB8JxZohcMSRdE3RRE7PUa/IzT31riaEsOT2vZF/q9HhmHnAmGtj2iHv1Ou6I9pxh4LGVwkaPNIRLw== X-Received: by 2002:a65:66c6:: with SMTP id c6-v6mr32090144pgw.127.1525775028572; Tue, 08 May 2018 03:23:48 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id n126-v6sm37847962pga.85.2018.05.08.03.23.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:23:47 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:42 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:53:01 +0930 Message-Id: <20180508102303.18684-6-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 5/7] Makefile: be precise about clang target X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" While CROSS can be set to a ppc64le toolchian, we don't want to build for that target. Hardcode the target to powerpc64-linux-gnu. Signed-off-by: Joel Stanley --- Makefile.main | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile.main b/Makefile.main index 92dd92b826b1..6e0e4be7cf51 100644 --- a/Makefile.main +++ b/Makefile.main @@ -146,24 +146,15 @@ AFLAGS += $(call try-cflag,$(CC),-mabi=elfv1) endif ifeq ($(cc-name),clang) -ifneq ($(CROSS),) -CLANG_TARGET := --target=$(notdir $(CROSS:%-=%)) +CLANG_TARGET := --target=powerpc64-linux-gnu -mcpu=pwr8 GCC_TOOLCHAIN := $(realpath $(dir $(shell which $(LD)))/..) -endif ifneq ($(GCC_TOOLCHAIN),) CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN) endif CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) -CFLAGS += $(call cc-option, -no-integrated-as) -AFLAGS += $(call cc-option, -no-integrated-as) - LDFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) -CFLAGS += -mcpu=pwr8 -LDFLAGS += -mcpu=pwr8 -ASFLAGS += -mcpu=pwr8 - # Workarounds # TODO: Fix the issues these hide, and remove them CFLAGS += -Wno-cast-align \ From patchwork Tue May 8 10:23:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 910100 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 40gFx14dPkz9ryk for ; Tue, 8 May 2018 20:25:09 +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="mAeZRYUX"; 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 40gFx12XkHzF2P1 for ; Tue, 8 May 2018 20:25:09 +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="mAeZRYUX"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::241; helo=mail-pf0-x241.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="mAeZRYUX"; dkim-atps=neutral Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (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 40gFvf30jtzF25c for ; Tue, 8 May 2018 20:23:58 +1000 (AEST) Received: by mail-pf0-x241.google.com with SMTP id o76so23753418pfi.5 for ; Tue, 08 May 2018 03:23:57 -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=lQQNBt04o+WxQ514hWGqfLRXjVTqAYnUblUAaxBG8ww=; b=mAeZRYUXL8X37vW5FWg1WuxRy/vnyRxWXga+r68oa8jqL1GdfU8UCXoe4ms9CoSIc1 K1J5D+ZpQ60Rj7/NaVO2nL27E6T1q61/tNXSdeOsXkp5DI5k0FA9c0V2ss0KsvUIy/Al 39mX9NjowpwDdey2c2unAxyNmJo/ArYW9oVMAFE2vNGEVqrY0f/W+ul3SdbIJvIOGXZ4 4oUS6+Z3dpmz+lSguUpMeFkkmKKScqsiKjArdfh2O9j88hfTfsr/d9WoIq/fBO1OELFe WJ6LineXf2wmssMavKYbnbDtLowaao0I+NrZkVq1R0EobnIFVkQK2dw5H7zM9rBOXA+T RWwQ== 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=lQQNBt04o+WxQ514hWGqfLRXjVTqAYnUblUAaxBG8ww=; b=e8vz1EYp9mJLn1icz9m9QXReE4Kqm+NweMScMajdarkIdQDzysSzD6Acs+zPeuLgvZ U1XOzo7e0ZSXmIo9vNMYT/0eU0cop82+X+bz0bnqIe4kbOVa6vsTCzihn/c+yvgkj73e IvPIFU/EWNZbKsEnL24sntSs4tpHQeC6dVjJL9sNlrVhHeKId6Rnob8Dj4uB6kxkAZbR GUjhFTu1Ot5xlh47MmeDhyotQwwpeeEdrSQ0NgGnMyDIcY0Qk7+5M77VgSx6DIt/XZCk aPUbQs2O0mZfVCYo3MxyMJfjnhT9t7qBUH9J51YtuFlW54Nc9FKK900xhtsTKreOB1Fm TVJw== X-Gm-Message-State: ALQs6tBzxAXL0sWoO8hDPXeoY4PKtSlCOUp2WQO2nYW6c3QyCTcgOZYM Z02XsCsQ++sAK0j6IW2PEo9v2cVh X-Google-Smtp-Source: AB8JxZqh+ofuakJDnJ8ImdwYg5w30Poz5rU3Mx4+adGYIDP7YpEoC7c/il5WzGXtWhW1PBopPgVsEA== X-Received: by 2002:a63:5ec5:: with SMTP id s188-v6mr32210599pgb.21.1525775035096; Tue, 08 May 2018 03:23:55 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id x71sm61993630pfe.47.2018.05.08.03.23.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:23:54 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:49 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:53:02 +0930 Message-Id: <20180508102303.18684-7-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 6/7] opal-ci: Remove unwanted .orig file X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" This snuck in recently. Signed-off-by: Joel Stanley --- opal-ci/Dockerfile-ubuntu-18.04.orig | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 opal-ci/Dockerfile-ubuntu-18.04.orig diff --git a/opal-ci/Dockerfile-ubuntu-18.04.orig b/opal-ci/Dockerfile-ubuntu-18.04.orig deleted file mode 100644 index e7ba238bba0c..000000000000 --- a/opal-ci/Dockerfile-ubuntu-18.04.orig +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:18.04 -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -qq -RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi -RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 gcc-arm-linux-gnueabi clang qemu-system-ppc -RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi -RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi -COPY . /build/ -WORKDIR /build -ENTRYPOINT ./opal-ci/build-ubuntu-18.04.sh From patchwork Tue May 8 10:23:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 910101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gFxQ5mYJz9ryk for ; Tue, 8 May 2018 20:25:30 +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="P2AvYlTp"; 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 40gFxQ3cxCzF25j for ; Tue, 8 May 2018 20:25:30 +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="P2AvYlTp"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c01::244; helo=mail-pl0-x244.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="P2AvYlTp"; dkim-atps=neutral Received: from mail-pl0-x244.google.com (mail-pl0-x244.google.com [IPv6:2607:f8b0:400e:c01::244]) (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 40gFvm1S70zF25v for ; Tue, 8 May 2018 20:24:04 +1000 (AEST) Received: by mail-pl0-x244.google.com with SMTP id e6-v6so1966737plt.11 for ; Tue, 08 May 2018 03:24:03 -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=9wQx53ebsLuWY8DBGCGirv6d7rKAur6A8EVZz2XjU2E=; b=P2AvYlTpZLJMfCn3m9VHEWrc//YZewDNJKBKjymvOePVdNrT/UO9o0H9j//+loDuQ+ yLg0n8eydQJyQuYGe2zXr+NnjGLnVOOcPj94XORAFTjEpJJFsWawL5CI2H11Jn5SYWD/ za2LA1QFojAIJ7EEAynu64unreTaog3Yp2lszn3VM/ZhIULwKMt06qtSJo6wPHF24M3h 1saEp/x2h8apLMXPwpn0+ysykH55J0Ii5mMnGADFIzSSRmS6PllRaMylBo03canMkd3x 5XbSEYhFjvAF7I+1+283gVGRjGMz4foMGFJjGqcHE0au0cTAKbxtnMOVuOW6w62T6GdO Rdow== 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=9wQx53ebsLuWY8DBGCGirv6d7rKAur6A8EVZz2XjU2E=; b=EIfffQWKUhE3/xKaqICD6RgwmNeUeT9Z2ueRdjqrUOHWK9YCUd6BmXBwoLVi5WBJvB 8Y8svwdjAklv6JxW3wei4IK1XsjfzzQxkAWwkwbiy2xf7WTmpPxqS7vQWKA4w4u5YV5e pH6eRGvsPzcw/G9yIzC+tCyXgZiAqf2zoNV0F0onK63BkuDI2+YlEVKU5GGNK23dNNM7 0ukngZ/z2N/sURC5S+iAhZ1x4mltJsgCkuQ6Fmge8UVJPscoA0aL0DQ40wVSNkpMpEj8 qE36iIjok0mMVfbd4yzJqEoxfn2e4ZcIsO+ouFu1KYFDdWlrGGBKk23YJ6UASO7K7scW gLaw== X-Gm-Message-State: ALQs6tA9s0pTmMhBi8JTwvDZZSjklo7sjhQL7AxaPfktaj/O8qsDJA4O 4/bH5jVZPZJHr1UB30u5Gdttl6Kr X-Google-Smtp-Source: AB8JxZoCT8ySpJI6Q6UABhyr34Tb/9UynCzBLs3lbqsGvAYgeD23jm1+bracJIfsAxa/xoMHE/ViqA== X-Received: by 2002:a17:902:6b0c:: with SMTP id o12-v6mr19504602plk.159.1525775041999; Tue, 08 May 2018 03:24:01 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id a77sm16323468pfe.70.2018.05.08.03.23.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 May 2018 03:24:01 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Tue, 08 May 2018 19:53:55 +0930 From: Joel Stanley To: skiboot@lists.ozlabs.org Date: Tue, 8 May 2018 19:53:03 +0930 Message-Id: <20180508102303.18684-8-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508102303.18684-1-joel@jms.id.au> References: <20180508102303.18684-1-joel@jms.id.au> Subject: [Skiboot] [PATCH 7/7] Makefile: Fix building natively on ppc64le X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" When on ppc64le and CROSS is not set by the environment, make assumes ppc64 and sets a default CROSS. Check for ppc64le as well, so that 'make' works out of the box on ppc64le. Signed-off-by: Joel Stanley --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b962a13fbc9..68d4dc7deac0 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,11 @@ ARCH = $(shell uname -m) ifdef CROSS_COMPILE CROSS ?= $(CROSS_COMPILE) endif -ifeq ("$(ARCH)", "ppc64") - CROSS ?= -else +ifneq ("$(ARCH)", "ppc64") +ifneq ("$(ARCH)", "ppc64le") CROSS ?= powerpc64-linux- endif +endif # # Main debug switch