From patchwork Mon Jun 15 07:49:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1309285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VYiLY/A5; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49lk5M519hz9sRf for ; Mon, 15 Jun 2020 17:50:15 +1000 (AEST) Received: from localhost ([::1]:58314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkjsj-0001NN-04 for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2020 03:50:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkjrz-00014i-3t; Mon, 15 Jun 2020 03:49:27 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkjrw-0008P3-0t; Mon, 15 Jun 2020 03:49:26 -0400 Received: by mail-wr1-x443.google.com with SMTP id p5so15972312wrw.9; Mon, 15 Jun 2020 00:49:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=d2z0H2KquWx3HT1eYgUtC8NXl28vDPDmrrtiULiYSXk=; b=VYiLY/A5nJPg9qqwYZJI3LuIHz1krNcBUN7cn9Dsd0EJl7vGLu3SdZvAeJgwOcGezN 5BmQZWs68nv3RT/UHQC+fg86E0Hgn2ywjGUpNzO5nxqKaDoUoB9dEsv7LCwwfV3MT5lt knsEQE2VDGwLfFRXVsyciAl9eUFagNXbKMGYRhQzXppQaqrWuXnMAQT9aAyo+e8DjS6q Jm89n7/3r9H8VjFzjA66mCmX3QoINCqshbRoxoms5rhx+UIkuUnX6IUeu7Rfj/66n2Gb YgLRBQtff5DR/ADvWTaGCmdtHEVtCdcwjfnt8MNi5knOHYBoL9MlapAEbdtIwVgmRy2l ElNA== 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:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=d2z0H2KquWx3HT1eYgUtC8NXl28vDPDmrrtiULiYSXk=; b=VlKYd1tAie5yfVp6To49krBPZLYXdg4YrxuAMYQvuck2pcYmpoOMiqdGzpE9iHrHtY MOsjsnoVwSFi+5RZwWcUlZEhKC1dnOPJMDJu3TYeJ6pX7oXcLz5RMU+6Z0ccwFrfZjFs JiwMy6OZSSAKgizvuzyiKxXNIm6DK4QFtF878i8sdu07Zl2c7cJbCuO3i/0U7AfCCbff BhC2H7M+lA9Hindcri8QMArL1ZQJx0mg59d104M0+yGJZOm21iVb7gS6/MjlYx5cXkse gHChIvRX5xk06LCzk3tJjFzUbdQ4b7vQFs9kwRInLSU4shbgSLGgLVS1solgguM+RcNC bN6Q== X-Gm-Message-State: AOAM533J/NCMQmyvPkkxFGNZ1CXZkGlm6bE51uWcFNhQgllNZsvl3OF1 J7JUNbPO4TgouvoQlo3uUCbFdhba X-Google-Smtp-Source: ABdhPJwDywemJ/V40LqaQdLHWbPUYNYr+v1t3DjUyPyVMLAp0uXakf4rfrWplHty4ayPofzz2XufLw== X-Received: by 2002:adf:e588:: with SMTP id l8mr29200771wrm.255.1592207361717; Mon, 15 Jun 2020 00:49:21 -0700 (PDT) Received: from localhost.localdomain (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id y14sm20833121wma.25.2020.06.15.00.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 00:49:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3] configure: Let SLOF be initialized by ./scripts/git-submodule.sh Date: Mon, 15 Jun 2020 09:49:19 +0200 Message-Id: <20200615074919.12552-1-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Cornelia Huck , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , qemu-s390x@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The git-submodule.sh script is called by make and initialize the submodules listed in the GIT_SUBMODULES variable generated by ./configure. SLOF is required for building the s390-ccw firmware on s390x, since it is using the libnet code from SLOF for network booting. Add it to the GIT_SUBMODULES when buildint the s390-ccw firmware, to fix: $ ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path 'roms/SLOF' Cloning into '/home/travis/build/user/qemu/roms/SLOF'... fatal: unable to access 'https://git.qemu.org/git/SLOF.git/': Could not resolve host: git.qemu.org fatal: clone of 'https://git.qemu.org/git/SLOF.git' into submodule path '/home/travis/build/user/qemu/roms/SLOF' failed Failed to clone 'roms/SLOF'. Retry scheduled Cloning into '/home/travis/build/user/qemu/roms/SLOF'... fatal: unable to access 'https://git.qemu.org/git/SLOF.git/': Could not resolve host: git.qemu.org fatal: clone of 'https://git.qemu.org/git/SLOF.git' into submodule path '/home/travis/build/user/qemu/roms/SLOF' failed Failed to clone 'roms/SLOF' a second time, aborting The command "( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )" exited with 1. Reported-by: Mark Cave-Ayland Suggested-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- configure | 5 +++++ .travis.yml | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index bb7fd12612..927e4a3d06 100755 --- a/configure +++ b/configure @@ -6533,6 +6533,11 @@ if test "$cpu" = "s390x" ; then write_c_skeleton if compile_prog "-march=z900" ""; then roms="$roms s390-ccw" + # SLOF is required for building the s390-ccw firmware on s390x, + # since it is using the libnet code from SLOF for network booting. + if test -e "${source_path}/.git" ; then + git_submodules="${git_submodules} roms/SLOF" + fi fi fi diff --git a/.travis.yml b/.travis.yml index ec6367af1f..220855c1f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -496,7 +496,6 @@ jobs: - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" - UNRELIABLE=true script: - - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF ) - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? - | if [ "$BUILD_RC" -eq 0 ] ; then