From patchwork Sun Jan 10 20:25:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1424307 X-Patchwork-Delegate: ynezz@true.cz 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.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=HDNwAt1V; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDT1Z6n8Xz9sWL for ; Mon, 11 Jan 2021 07:28:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=erWqd1KjQxV+5Ro42fYXs0meg9FJcq1Op8JBvvnzlWA=; b=HDNwAt1V8bfIriHNXjhmxmwahc BTFQB9rZ9hw1s4XNcK8d27x2fqFLSRqwBDFQJ1KHOB5pKYITCiFI1tauXp/GXacgrNOw+cDkEtHEq oCIbJ04zUhBfUs3cbaPovA1go3DY6YiP4GWywLuLCgkOB0Ink3q6tcypW+1X2hgAGi+jRGBLKdZG0 XcAeBWws61X0nVyLotBreT7IKV0/OkM7EDEdc77XQkCPzmbrWQPyadHqcMfwEJO75WtbocJ6dGqUJ k3EEGc/RYAfz4ju49os7NfoGwt616uHGx+HyOKO5jSsH3wotiUqtL/pttg63r3+JGRSemxQ4H3q8O OrHZqvWQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyhHs-0003oP-1X; Sun, 10 Jan 2021 20:26:08 +0000 Received: from relay5-d.mail.gandi.net ([217.70.183.197]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyhHl-0003ks-Ux for openwrt-devel@lists.openwrt.org; Sun, 10 Jan 2021 20:26:03 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPA id 4A1B41C0003; Sun, 10 Jan 2021 20:25:53 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH buildbot 1/3] docker,worker: alphabetically sort packages Date: Sun, 10 Jan 2021 10:25:37 -1000 Message-Id: <20210110202539.1047929-1-mail@aparcar.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210110_152602_136885_E1E09BB7 X-CRM114-Status: UNSURE ( 8.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.197 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.197 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jo@mein.io, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Improve readability of installed packages in the worker container. Signed-off-by: Paul Spooren --- docker/buildslave/Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/buildslave/Dockerfile b/docker/buildslave/Dockerfile index 9ee3ae4..20ec53f 100644 --- a/docker/buildslave/Dockerfile +++ b/docker/buildslave/Dockerfile @@ -13,22 +13,22 @@ RUN echo 'deb http://deb.debian.org/debian testing main' \ > /etc/apt/sources.list.d/testing.list && \ apt-get update && \ apt-get install -t buster -y \ - pwgen \ - locales \ build-essential \ + ccache \ + curl \ + gawk \ git-core \ - subversion \ + gosu \ libncurses5-dev \ - gawk \ - unzip \ + locales \ pv \ - gosu \ - signify-openbsd \ + pwgen \ python3 \ - wget \ - curl \ - ccache \ - rsync && \ + rsync \ + signify-openbsd \ + subversion \ + unzip \ + wget && \ apt-get install -t testing -y \ buildbot-worker && \ apt-get clean && \ From patchwork Sun Jan 10 20:25:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1424308 X-Patchwork-Delegate: ynezz@true.cz 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.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=TQ9LAjuG; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDT1b19M3z9sWP for ; Mon, 11 Jan 2021 07:28:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fnm58GfCZWSltLLJDQbpHpe78spWbje3EZme8HcTDUg=; b=TQ9LAjuG3IPqEMXyCyGFFTY+5 e+MrSEw821nJ0S2t1Fy7ePRJNzu2OOVDlyCDV3/yRFZvMlGpoeKzF/Z4hOvb6QfHv5XDbSaod4/Jv aMI2Z3gyo3ybOfbTsMR1GLdZ+2Sm+TGBS7uo0S7j+TTBR70aqmnN7oKMkYcz05vzZT34OIWlcOX5e 1zcg30ptcZkYWo98Echx9icuPJhUqgQXFfkgTJpKEyzMw5XB0GIJ0JuUq205OcnDrOzckmEHTTiIy uq/CjuV884Qm67wFogos0QXaHLi+Ap7me69vV52nkMPdfF2h93nnQSks0Q5mG1G8vaxYYkK1AeiLI ptiHXM2ug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyhHo-0003nF-Fc; Sun, 10 Jan 2021 20:26:04 +0000 Received: from relay5-d.mail.gandi.net ([217.70.183.197]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyhHk-0003l6-Ty for openwrt-devel@lists.openwrt.org; Sun, 10 Jan 2021 20:26:02 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPA id 32C571C0004; Sun, 10 Jan 2021 20:25:56 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH buildbot 2/3] docker,worker: install gcc-mulitlib Date: Sun, 10 Jan 2021 10:25:38 -1000 Message-Id: <20210110202539.1047929-2-mail@aparcar.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210110202539.1047929-1-mail@aparcar.org> References: <20210110202539.1047929-1-mail@aparcar.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210110_152601_649137_6B48748D X-CRM114-Status: GOOD ( 10.23 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.197 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.197 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jo@mein.io, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From openwrt/docker[1]: This is required for luajit, which is in packages feed. While it works fine for ARMv8 (tested by using Github Actions: aarch64_cortex-a53) and x84_x64 (tested inside Docker container, it does not work for 32-bits target and because of that we need to install gcc-multilib. Luajit fails with the following output: (tested against target: arm_cortex-a9+vfpv3-d16_musl_eabi inside Docker SDK image) /usr/include/limits.h:26:10: fatal error: bits/libc-header-start.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~~~~~~~ [1]: https://github.com/openwrt/docker/pull/74/commits/f9da188d53fd9809ca4911089611e1f42422d049 Signed-off-by: Paul Spooren --- docker/buildslave/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/buildslave/Dockerfile b/docker/buildslave/Dockerfile index 20ec53f..408db3f 100644 --- a/docker/buildslave/Dockerfile +++ b/docker/buildslave/Dockerfile @@ -17,6 +17,7 @@ RUN echo 'deb http://deb.debian.org/debian testing main' \ ccache \ curl \ gawk \ + gcc-multilib \ git-core \ gosu \ libncurses5-dev \ From patchwork Sun Jan 10 20:25:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1424306 X-Patchwork-Delegate: mail@aparcar.org 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.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=aparcar.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=d5wPCFVE; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDT1Z5x3vz9sVy for ; Mon, 11 Jan 2021 07:28:18 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IKMx38rEoy9gzk10PKFV0SVuU1FTnOcCtgSk9gPXYWk=; b=d5wPCFVEIzoSHAYA5frX3bzRK 1urwmmn7DPrDChjIl2J04dONxDGdQq5kOgsjNx+QjDsk/EN/eeTsNr/43RBRiTj+cK7NgAui/R/fP mUacfDf9FFAqeZ/L9xqlI3aLldx0YSSzT9gBnnra94OuCaGRakG2TXA8zwCqMyjLC8JUfYpLg4Q6i u3WocXBY5y4E8unLDgNGzvmy6d8NcWsZLH89FZjRNktmA7KKWbHQ4y6fUySeYj+Jpj34c/+9JNH9T gnFNnDdpbiTnN8lA+SFGfFldTZhX4tuyAbnA/RflKXUCablUX5ntFpG8G14vE0Q9yhDWwojy47WX9 RarawRGvA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyhHu-0003pC-5Q; Sun, 10 Jan 2021 20:26:10 +0000 Received: from relay5-d.mail.gandi.net ([217.70.183.197]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyhHm-0003li-5I for openwrt-devel@lists.openwrt.org; Sun, 10 Jan 2021 20:26:03 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPA id 960C91C0005; Sun, 10 Jan 2021 20:25:59 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH buildbot 3/3] docker,worker: install qemu-utils Date: Sun, 10 Jan 2021 10:25:39 -1000 Message-Id: <20210110202539.1047929-3-mail@aparcar.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210110202539.1047929-1-mail@aparcar.org> References: <20210110202539.1047929-1-mail@aparcar.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210110_152602_337430_3B5A500D X-CRM114-Status: UNSURE ( 8.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.197 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.197 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jo@mein.io, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org To convert x86 images to VDI/VMDK the `qemu-img` tools is required, which is part of Debians `qemu-utils` package. The goal is to remove the ancient in-tree `qemu-img` version and replace it with a recent host installed package. Related: https://github.com/openwrt/openwrt/pull/3739/ Signed-off-by: Paul Spooren --- docker/buildslave/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/buildslave/Dockerfile b/docker/buildslave/Dockerfile index 408db3f..9cee882 100644 --- a/docker/buildslave/Dockerfile +++ b/docker/buildslave/Dockerfile @@ -25,6 +25,7 @@ RUN echo 'deb http://deb.debian.org/debian testing main' \ pv \ pwgen \ python3 \ + qemu-utils \ rsync \ signify-openbsd \ subversion \