From patchwork Thu Dec 19 12:30:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1213289 X-Patchwork-Delegate: trini@ti.com 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=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="k8/DlseN"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47drnx6LSCz9sPc for ; Thu, 19 Dec 2019 23:31:01 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3305B814C4; Thu, 19 Dec 2019 13:30:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="k8/DlseN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE35C81486; Thu, 19 Dec 2019 13:30:48 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, FREEMAIL_FROM,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E5B1181486 for ; Thu, 19 Dec 2019 13:30:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1576758641; bh=knaxNjX1PJpDuQFOC1z9hbjAIxqbmRpcAen5ED7E6xo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=k8/DlseNo2FxG5OwXGR0OmHUjOcmCbJUWSdMjpRp2wkm6b1G6di910nPvgTif/Bcx i5LVJSqA+MVhFGYIKkFYSm5Yc+EX35/e3s6YBrcFHSJTaGCiAsfLTA0o5mWncZ1Yvb GLFgNAdJTHiE3jq215HD1cS32xAM6R7oBLEN+YEE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([89.204.153.214]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MG9g4-1iTaX714kG-00GXPf; Thu, 19 Dec 2019 13:30:41 +0100 From: Heinrich Schuchardt To: Tom Rini Subject: [PATCH 1/1] gitlab: use our own GRUB Date: Thu, 19 Dec 2019 13:30:32 +0100 Message-Id: <20191219123032.138680-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:SPKRZpNlNBeHBe/s6XkHh8m2559IgQcSsgfZu+hI88+1m+KhQOb XgfbOX5HAKCyHpoayWQxz/gfFT4TSYtoifkDAauXhsiKJHax7+b/7ThxDFY3giAKmIGIQP4 /BJHarBcp5BWRE7Z512eyZ3pzn1zFJira+1InW9M+l/pzINQPRwfh7OUEqZwMBZWqNQcwSW Yr0qrhK1im3E/+kCTCvMQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:YdMQi7ouE24=:zcUbxRfqXLzsLQPtEVe5+4 lzGT6xve/NnvIJRVnaqC6RhbvTKe5Xu+B4l/XsaJfGObOteHqYYJPFXqqPX6s+NQZ8KMsczE5 XhbyTQ+5/Ht1MQr4ERqwaxXSAUiiN6W+cqBbVgZu8ZNGjR+kAX4SW+vogXKiIzIzkxtYCHav9 Nmd61UkxzBarsVv+PlmyZmjGZIUJvb7fNeGxCVh4zc6U01VFo77BRLQ1f5g5JsKis6vGp7/sE 5Yyi7+1zAX+D7UQvi44IHwRnHa/G1EbN0LOt+6rysSGNRiOONSShM0lxfEXQp0GZW0jte2sjh H7+cWG+poMOuw6q6lKvKW4hvsHnGK4QE5+8yKl9tgg5XMB17mpdhpgl68TRfSct6/3cpFFe9n ucOSPdCIGLJa0IM1ZrGTexWs3xKFMnF9WNRPS+N9hVmc2rVmuWFglV5ohMYWeLTWerGl6J3Cl UOruM17W3UI9TU5JYMEN+VoXNDz/n8kjPhzKHwsy3qMK+cyc7IqdgZcTAppbTDJV6il7l3Mci OVQpHqek134f1qYHzFMX1Au0PEV9DZwu7QIKRwm/0z56F34NirHiQvnZ4AmvN9RhFtSBDnzTd Zch2xhw+FPSA7O+sKwoRK9qpImr+g+vtZsWPAQYApX7dpGSVvVxwbNDtdxEsgC1S+OnPj3YQ8 zQ473DrKHeAIw8bdNn1IbXk+l5AsMwPS6T499ZKUd/xRkpAql0aLtkULJzWwR6If0dgiRPBDb Wc6XeRdx3LGBAfGW3d1Od5MTa1H64+RYyhcjJGE0tUW1CsfmqEFIHU4eK+JmPyHpddMtlGB/F Psq6WEqjJub5z2FHw7HiDJr8S3U1Z1dkcxK3NXmckGGzP9p1CNXkQ0esrgN8m6ykp9VBHPn+x f9PXU1z1LsoHZTqRQGS5gHwYozwQFLgXQpowuX7KcFWhEpJWfGcD8F48zQomXmDZoGAIzt3iw 85Q54M6PRXbx1md+kelNg6cynre1m/z4k/f7SrMqJRHm0tPr4YgrWWXFfMC7t8xP++zEYsnEf iiazrLw7oL2nxPd0Xd+XB40IOyP/h2Ert1k3r/eijsEJ/1gDD1za52XYT6SJjUUU0CFHOPYHh pxMWgtIgoJUVYsphYjY07HgNhbQyMncTxBOS7mVlDskoInBjDwDuoFB+mDJvISf+UH2kSev06 2iAzfrGjS8bQOlB2q08SL0WmANjViqNkKFy9ZVxTq02m/NAMrvLKQ/RZeX+tx8Jpy9S3MBWy/ AADy5E2BG+astgKrcqaupzc25MuV6Sfg4sk7/k1d4/A3xuNrJZFETXXKvnNU= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: u-boot@lists.denx.de, Stephen Warren , Heinrich Schuchardt Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Up to now we have been relying on openSUSE repositories for GRUB on arm and arm64 though we have included GRUB in our Docker image. Use the GRUB included in our Docker image. Signed-off-by: Heinrich Schuchardt --- .gitlab-ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.24.0 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f5271dcd3..7b3b7117f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,13 +20,12 @@ stages: - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - grub-mkimage --prefix="" -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - - mkdir ~/grub2-arm - - ( cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm | rpm2cpio | cpio -di ) - - mkdir ~/grub2-arm64 - - ( cd ~/grub2-arm64; wget -O - http://download.opensuse.org/ports/aarch64/distribution/leap/42.2/repo/oss/suse/aarch64/grub2-arm64-efi-2.02~beta2-87.1.aarch64.rpm | rpm2cpio | cpio -di ) + - cp /opt/grub/grubriscv64.efi ~/grub_riscv64.efi + - cp /opt/grub/grubaa64.efi ~/grub_arm64.efi + - cp /opt/grub/grubarm.efi ~/grub_arm.efi after_script: - - rm -rf ~/grub2* /tmp/uboot-test-hooks /tmp/venv + - rm -rf /tmp/uboot-test-hooks /tmp/venv script: # From buildman, exit code 129 means warnings only. If we've been asked to # use clang only do one configuration.