From patchwork Mon Oct 2 12:47:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Perale X-Patchwork-Id: 1842095 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rzgjr3bhrz1yng for ; Mon, 2 Oct 2023 23:48:32 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3F5AA41E5E; Mon, 2 Oct 2023 12:48:30 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3F5AA41E5E X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7wej1tLLPX5L; Mon, 2 Oct 2023 12:48:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 14FC141E6E; Mon, 2 Oct 2023 12:48:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 14FC141E6E X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id D227C1BF94D for ; Mon, 2 Oct 2023 12:48:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B8C2E4016F for ; Mon, 2 Oct 2023 12:48:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B8C2E4016F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SNVC5PKuRqDf for ; Mon, 2 Oct 2023 12:48:11 +0000 (UTC) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2C8BE40120 for ; Mon, 2 Oct 2023 12:48:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2C8BE40120 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-98377c5d53eso2217464766b.0 for ; Mon, 02 Oct 2023 05:48:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250889; x=1696855689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7gVo9U24z28RJQSja+zKvy6LUQaAMFxiy6OdgFDVe1Y=; b=RfHf/vNc29ci8iCiZicNQIQ93WO8xBMADXqDC4b8OKf7HFeJ7IeEb/ZYL9EtQLUUZ5 RDdhHSz9DwYIxnILAGD3AGi0aLBKnwly7PNj02YKylGqpcpgmG7ti5HMN93Zv/c45ZKk ixUbe12B/9+pNnJOTgBJGoHxAjciT1/HipDKXzd+W0pHd4Xo0Lx66wF2WkqZqgkvU5u2 uhGsZRzC2NWJYyGDl7pDFtwlMlYWbQ4TLtP5I43Kqqg8tokgWRN5YIkrtCCC58gi0NPj /FZeREFCWjgoJyKs4Q8VH5HOPRc3f0UuuBYl3JOkJ7+rY//q8QpEkooYFzx0HWcM21eO Ez5A== X-Gm-Message-State: AOJu0Yx7bhk9cgnIL+aS8uIHR9UOOybm6mElTTaFh969SjEgZl96ptrF 5j5Rc1sxuggfmFntxCuWPD4yyAlpp1G+QhyYrRm+jUVS X-Google-Smtp-Source: AGHT+IEsbHZ6i+DFt78Kn2KfcdmyfVElDc83VcaETo0rgYWBjRxso9vktIQZ25lTmIFKpsXzs1pneA== X-Received: by 2002:a17:906:cc17:b0:9b2:b691:9b5f with SMTP id ml23-20020a170906cc1700b009b2b6919b5fmr8832488ejb.41.1696250888868; Mon, 02 Oct 2023 05:48:08 -0700 (PDT) Received: from localhost.localdomain ([79.132.253.132]) by smtp.gmail.com with ESMTPSA id p3-20020a17090635c300b0098951bb4dc3sm16688189ejb.184.2023.10.02.05.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:48:08 -0700 (PDT) To: buildroot@buildroot.org Date: Mon, 2 Oct 2023 14:47:23 +0200 Message-ID: <20231002124736.179251-2-thomas.perale@essensium.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231002124736.179251-1-thomas.perale@essensium.com> References: <20231002124736.179251-1-thomas.perale@essensium.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; t=1696250889; x=1696855689; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7gVo9U24z28RJQSja+zKvy6LUQaAMFxiy6OdgFDVe1Y=; b=ExH9WmC5Ul2xhDMA2/c7Q5QrYPQzpAo6Fntk5TZxXxPB9p45wQUjJd5+PM4okUscFP WI9CIVISuxE0OK41G8g/395d/ffpm1AAA7g5Dfbi0sj191wUinwX6DTs8EDjAl2Ktpf6 nZlDKZEKxjUgJ8CbT06kWXStoGvJXBXs25nsYru2i87csFUh4za9dG5U9nsjHHLZdMD1 A5uboVMlDKfJQLyKfoH0PYWFyI/A4+7Y01MiMVo5vAgT00VbqSQ8YebOooAZGzYIujLt rmbvP9kinZoDSXN2++IhTBvHMGl/V1j2cIONZYL/NxBEsobUR7NO74CXhwhk6u2UjiLM xmBA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=ExH9WmC5 Subject: [Buildroot] [PATCH 1/6] DEVELOPERS: add Thomas Perale for 'go' X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Perale via buildroot From: Thomas Perale Reply-To: Thomas Perale Cc: Thomas Petazzoni , Geoff Levand , Fabio Estevam , Anisse Astier , "Yann E . MORIN" , Angelo Compagnucci , Marcin Niestroj , Christian Stewart , Romain Naour , Thomas Perale Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Perale Signed-off-by: Thomas Perale --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c45e7315da..4681b2a21f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2898,6 +2898,9 @@ F: package/frotz/ F: package/kvm-unit-tests/ F: package/xorcurses/ +N: Thomas Perale +F: package/go/ + N: Thomas Petazzoni F: arch/Config.in.arm F: board/beaglev/ From patchwork Mon Oct 2 12:47:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Perale X-Patchwork-Id: 1842096 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rzgk60Lppz1yng for ; Mon, 2 Oct 2023 23:48:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E5CFA41E7A; Mon, 2 Oct 2023 12:48:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E5CFA41E7A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nl6ZzhIaPdbm; Mon, 2 Oct 2023 12:48:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 5DC0241E7B; Mon, 2 Oct 2023 12:48:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5DC0241E7B X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0333B1BF589 for ; Mon, 2 Oct 2023 12:48:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DCEBB41E37 for ; Mon, 2 Oct 2023 12:48:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org DCEBB41E37 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w4LSPnkCuPAB for ; Mon, 2 Oct 2023 12:48:12 +0000 (UTC) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by smtp4.osuosl.org (Postfix) with ESMTPS id BFCBB401D9 for ; Mon, 2 Oct 2023 12:48:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BFCBB401D9 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso2332428566b.1 for ; Mon, 02 Oct 2023 05:48:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250889; x=1696855689; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QNv8kYmhAuMX3kHqzWLMdBbziQqYGvzBiZJf/suay1M=; b=R7WzwvGzUNzl3bcFRm4qMpprzdGrdp8Ltovrxv51xm5kWsKTR2peUHzB3ODIc78qcS uvVAU+M0og7To/HVPPyweL5DZGV1RAuisKtqUUuEx0xqSu4lGpz44dnHIjNBVP33ecqA RAug7MHBmIxbBY6sNcLp35FL138Rm4q6T6H3j/TinDi1vdlEQjfc0d3SDaE1Zu6mqOXV 0FfOdkhaabSGfvSoo+Ojtlr7ue30HlQNYpBQb69066BgeIW/VFLN2JdYmIk26ug2mMQX /PGaQb0pN1K4Kyp9M+sYIwT0zcIaQUytrZoXqV1uqkCQxj9wLD+8wYKROUiA2jhTnfwS aB8Q== X-Gm-Message-State: AOJu0YzOij3ZkNhScmHdxQzEsC7SatGeRW33aYSX9Km/wpCpHXNtqdog mOdVJ2wa36WzVB2Vlik9dyB5EvRIzAe9E9TTmnvAhQ== X-Google-Smtp-Source: AGHT+IHVZJ+9vbduL5WfyGrGbtSe2D79keNSmaf4MN/vSyPxWG0VyN3VmR2ySymJhOhNeX0i5xTb4g== X-Received: by 2002:a17:907:2711:b0:9b2:6b4f:d5ab with SMTP id w17-20020a170907271100b009b26b4fd5abmr10051216ejk.29.1696250889559; Mon, 02 Oct 2023 05:48:09 -0700 (PDT) Received: from localhost.localdomain ([79.132.253.132]) by smtp.gmail.com with ESMTPSA id p3-20020a17090635c300b0098951bb4dc3sm16688189ejb.184.2023.10.02.05.48.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:48:09 -0700 (PDT) To: buildroot@buildroot.org Date: Mon, 2 Oct 2023 14:47:24 +0200 Message-ID: <20231002124736.179251-3-thomas.perale@essensium.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231002124736.179251-1-thomas.perale@essensium.com> References: <20231002124736.179251-1-thomas.perale@essensium.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; t=1696250889; x=1696855689; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QNv8kYmhAuMX3kHqzWLMdBbziQqYGvzBiZJf/suay1M=; b=C5LSy7KViclQed2MW97YxAmU9Nx+pcWTFYqL5/b5zwvlglc517xNFMeLqkNpXX3YMC HnIHABWWiFzml3NjyXUNddNRCPIPcjXtvLpo5Y2G/3TeZOOyrTfpXiavfTc44QJu4aA2 fB6rpf6Dsiee5j91/CpGcl6xSIFkJeOMN17G4AaoSEBmWnc0M9tA8bWJiKNmd+AAX+fg y6KVXaLWPeNmdl+/07rmUvCDsT12uR0ZXzr5Atq8sdFuSthE8clgqw84rTwZ0zryNT/s p8hS+Zlm2GLy5rz678vPCjvx3I6ot8UE9WNSPcgGXSUZwBOQWN4kj8RjTDXhnuYKAHbj /GXA== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=C5LSy7KV Subject: [Buildroot] [PATCH 2/6] package/go: new subdirectory for go variants X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Perale via buildroot From: Thomas Perale Reply-To: Thomas Perale Cc: Thomas Petazzoni , Geoff Levand , Fabio Estevam , Anisse Astier , "Yann E . MORIN" , Angelo Compagnucci , Marcin Niestroj , Christian Stewart , Romain Naour , Thomas Perale Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Perale Move every go compiler-related packages into a newly created package/go/ subdirectory. All the common variables are kept in package/go/go.mk and package/go/Config.in.host. This subdirectory structure move the GO_VERSION variable in common in the package/go/go.mk file. In the next commits host-go will be turned into a virtual-package and the common GO_VERSION force the providers to use the same Go compiler version. Also, the subdirectory structure force the evaluation of the common GO_VERSION before the providers access it. Signed-off-by: Thomas Perale --- .checkpackageignore | 2 +- DEVELOPERS | 2 - package/Config.in.host | 2 - package/go/Config.in.host | 3 ++ .../go-bootstrap-stage1/Config.in.host | 0 .../go-bootstrap-stage1.hash | 0 .../go-bootstrap-stage1.mk | 0 .../go-bootstrap-stage2/Config.in.host | 0 .../go-bootstrap-stage2.hash | 0 .../go-bootstrap-stage2.mk | 0 package/go/go.mk | 40 +------------- ...explicit-option-for-crosscompilation.patch | 0 ...ldvcs-false-when-building-go-bootstr.patch | 0 package/go/{ => go}/go.hash | 0 package/go/go/go.mk | 53 +++++++++++++++++++ 15 files changed, 59 insertions(+), 43 deletions(-) rename package/{ => go}/go-bootstrap-stage1/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage1/go-bootstrap-stage1.hash (100%) rename package/{ => go}/go-bootstrap-stage1/go-bootstrap-stage1.mk (100%) rename package/{ => go}/go-bootstrap-stage2/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage2/go-bootstrap-stage2.hash (100%) rename package/{ => go}/go-bootstrap-stage2/go-bootstrap-stage2.mk (100%) rename package/go/{ => go}/0001-build.go-explicit-option-for-crosscompilation.patch (100%) rename package/go/{ => go}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) rename package/go/{ => go}/go.hash (100%) create mode 100644 package/go/go/go.mk diff --git a/.checkpackageignore b/.checkpackageignore index 28de1745e4..becaf6a9fc 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -514,7 +514,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream package/gnuplot/0001-configure-add-without-demo-option.patch Upstream -package/go/0001-build.go-explicit-option-for-crosscompilation.patch Upstream +package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch Upstream package/gob2/0001-dont-include-from-prefix.patch Upstream package/gobject-introspection/0001-disable-tests.patch Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch Upstream diff --git a/DEVELOPERS b/DEVELOPERS index 4681b2a21f..b9c7b4f1a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -586,8 +586,6 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ -F: package/go-bootstrap-stage1/ -F: package/go-bootstrap-stage2/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index c80842c33a..3a8e613fa3 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -44,8 +44,6 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap-stage1/Config.in.host" - source "package/go-bootstrap-stage2/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec..277d75e2b6 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -31,3 +31,6 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + +source "package/go/go-bootstrap-stage1/Config.in.host" +source "package/go/go-bootstrap-stage2/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go/go-bootstrap-stage1/Config.in.host similarity index 100% rename from package/go-bootstrap-stage1/Config.in.host rename to package/go/go-bootstrap-stage1/Config.in.host diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.hash b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap-stage1/go-bootstrap-stage1.hash rename to package/go/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk similarity index 100% rename from package/go-bootstrap-stage1/go-bootstrap-stage1.mk rename to package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go/go-bootstrap-stage2/Config.in.host similarity index 100% rename from package/go-bootstrap-stage2/Config.in.host rename to package/go/go-bootstrap-stage2/Config.in.host diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.hash similarity index 100% rename from package/go-bootstrap-stage2/go-bootstrap-stage2.hash rename to package/go/go-bootstrap-stage2/go-bootstrap-stage2.hash diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk similarity index 100% rename from package/go-bootstrap-stage2/go-bootstrap-stage2.mk rename to package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk diff --git a/package/go/go.mk b/package/go/go.mk index 6f080be5c0..21051a2050 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -5,14 +5,7 @@ ################################################################################ GO_VERSION = 1.21.1 -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz -GO_LICENSE = BSD-3-Clause -GO_LICENSE_FILES = LICENSE -GO_CPE_ID_VENDOR = golang - -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -96,15 +89,6 @@ else HOST_GO_CGO_ENABLED = 0 endif -HOST_GO_CROSS_ENV = \ - CC_FOR_TARGET="$(TARGET_CC)" \ - CXX_FOR_TARGET="$(TARGET_CXX)" \ - GOOS="linux" \ - GOARCH=$(GO_GOARCH) \ - $(if $(GO_GO386),GO386=$(GO_GO386)) \ - $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ - GO_ASSUME_CROSSCOMPILING=1 - else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go can still be used to build packages for the host. No need to set all # the arch stuff since we will not be cross-compiling. @@ -123,27 +107,7 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ - GO111MODULE=off \ - GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ - GOROOT_FINAL=$(HOST_GO_ROOT) \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - GOOS=linux \ - CC=$(HOSTCC_NOCCACHE) \ - CXX=$(HOSTCXX_NOCCACHE) \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - $(HOST_GO_CROSS_ENV) - -define HOST_GO_BUILD_CMDS - cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) -endef - -define HOST_GO_INSTALL_CMDS +define GO_BINARIES_INSTALL $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_ROOT)/bin/go $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt @@ -165,4 +129,4 @@ define HOST_GO_INSTALL_CMDS find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef -$(eval $(host-generic-package)) +include $(sort $(wildcard package/go/*/*.mk)) diff --git a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch similarity index 100% rename from package/go/0001-build.go-explicit-option-for-crosscompilation.patch rename to package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch diff --git a/package/go/go.hash b/package/go/go/go.hash similarity index 100% rename from package/go/go.hash rename to package/go/go/go.hash diff --git a/package/go/go/go.mk b/package/go/go/go.mk new file mode 100644 index 0000000000..8e3780eb29 --- /dev/null +++ b/package/go/go/go.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# go +# +################################################################################ + +GO_SITE = https://storage.googleapis.com/golang +GO_SOURCE = go$(GO_VERSION).src.tar.gz + +GO_LICENSE = BSD-3-Clause +GO_LICENSE_FILES = LICENSE +GO_CPE_ID_VENDOR = golang + +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 + +ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) + +HOST_GO_CROSS_ENV = \ + CC_FOR_TARGET="$(TARGET_CC)" \ + CXX_FOR_TARGET="$(TARGET_CXX)" \ + GOOS="linux" \ + GOARCH=$(GO_GOARCH) \ + $(if $(GO_GO386),GO386=$(GO_GO386)) \ + $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ + GO_ASSUME_CROSSCOMPILING=1 + +endif + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_MAKE_ENV = \ + GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT_FINAL=$(HOST_GO_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ + $(HOST_GO_CROSS_ENV) + +define HOST_GO_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_INSTALL_CMDS + $(GO_BINARIES_INSTALL) +endef + +$(eval $(host-generic-package)) From patchwork Mon Oct 2 12:47:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Perale X-Patchwork-Id: 1842098 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rzgkd1QBLz1yng for ; Mon, 2 Oct 2023 23:49:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6000541E19; Mon, 2 Oct 2023 12:49:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6000541E19 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 79V2vC2c1E9c; Mon, 2 Oct 2023 12:49:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id B2EE141E8E; Mon, 2 Oct 2023 12:49:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B2EE141E8E X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8B1E41BF589 for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3A83F401D9 for ; Mon, 2 Oct 2023 12:48:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3A83F401D9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3bnAHhIB8GFX for ; Mon, 2 Oct 2023 12:48:12 +0000 (UTC) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by smtp4.osuosl.org (Postfix) with ESMTPS id 8402B41E19 for ; Mon, 2 Oct 2023 12:48:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8402B41E19 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-99357737980so2302810466b.2 for ; Mon, 02 Oct 2023 05:48:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250890; x=1696855690; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZcC7nIlIuy5yp6RRQOU46wRgqrmeC85w75pUj7J1qKw=; b=R9AhUDaF9I/Vr4pDtcRYtHlaAq40aNxzY+Y42Lw3WNrFlDo6C9/rPIbG5qr114LuzV kX3v6yr30mPybFc4V3KAb6GnXAH/mwsbuxh7gOfQB9Pcb3dVvsMqG4zp3EZ1p2Fx5m7o DiBhWlSRDXsJaxqsVQ/fYspFMUK5Q4TJPOzRXIHh3XwcSSMlFiS39D4pnhQmSj0O5qXq kApe5WrGn9prQSoxn843/6jBZ9dWOL4TE0VanB1OUzv9Vi0yx8KO6Kob34sImUNX8USo /8zNqdA+P6N5WCxTomtosWQOTVejWECt68i+fx/tYtbO2xhhtwgsD8T5zutK2yfcqwUK vu+w== X-Gm-Message-State: AOJu0YwQyK31EyhmvElfJA9fthDMtSkgyTuunOUAXc/3i/S6a2jvc5Dn WXyxra0Pdo8UxWuugxTqd2dZPEm6ZQRE5duzFf+z7g== X-Google-Smtp-Source: AGHT+IFERil5vaRuCYyxhSUdf8cRaLyoGlNPnNlQDFBEm1uQOlp4O717PLndNUOXz4WYTT8zrm8uDQ== X-Received: by 2002:a17:907:1dcc:b0:9ae:406c:3425 with SMTP id og12-20020a1709071dcc00b009ae406c3425mr11214632ejc.0.1696250890404; Mon, 02 Oct 2023 05:48:10 -0700 (PDT) Received: from localhost.localdomain ([79.132.253.132]) by smtp.gmail.com with ESMTPSA id p3-20020a17090635c300b0098951bb4dc3sm16688189ejb.184.2023.10.02.05.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:48:10 -0700 (PDT) To: buildroot@buildroot.org Date: Mon, 2 Oct 2023 14:47:25 +0200 Message-ID: <20231002124736.179251-4-thomas.perale@essensium.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231002124736.179251-1-thomas.perale@essensium.com> References: <20231002124736.179251-1-thomas.perale@essensium.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; t=1696250890; x=1696855690; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZcC7nIlIuy5yp6RRQOU46wRgqrmeC85w75pUj7J1qKw=; b=QrXXK6gPK3xiCKbWPCSsmyTpkM3aPAqlBQ3C/15cg7pSNpyHeBzTJlr1TQyGct9Gwk zDNrgqt7jnLFrYG/WubHPJ9n8ujo46xbLHGo/2Tvfeo40RBkDO4ZZWL6HSlIIauYvcZa JvoTc0CR5mmqW/qrSMiWp7Ls8I938MF9NQub3NikUdtoPHj2Gt1cTuQ+bwEAMKXSg2Cf XT8t/hOfJyaQJYeoYWCIEMnMgVBYFoGlUhAo9xVfNdZw8jj9RVnGoPTBB1+vu5nqOQQQ STtk4ucH8dn4IhIbtvz9qhlSMZh44GDw5/7UlmaaanmFnoXOA9Jgj4Jfmontr/H1unSI 68AQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=QrXXK6gP Subject: [Buildroot] [PATCH 3/6] package/go: make host package a virtual package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Perale via buildroot From: Thomas Perale Reply-To: Thomas Perale Cc: Thomas Petazzoni , Geoff Levand , Fabio Estevam , Anisse Astier , "Yann E . MORIN" , Angelo Compagnucci , Marcin Niestroj , Christian Stewart , Romain Naour , Thomas Perale Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Perale Turn host-go into a virtual package, which has two providers: - host-go-src, which build host-go from source based on the same logic that was previously used in package/go/go/go.mk, now moved in package/go/go-src/go-src.mk to remove any ambiguity on the role of the package. - host-go-bin, which will be introduced in the next commit and installs a pre-built Go compiler. The usage of a virtual package enables the support for pre-built Go compiler which reduce the build time for of host-go. A similar solution is proposed for host-rust. By default, host-go is built from sources to keep the same behaviour as the former version. Signed-off-by: Thomas Perale --- .checkpackageignore | 2 +- package/go/Config.in.host | 32 +++++++++++++++++++ ...explicit-option-for-crosscompilation.patch | 0 ...ldvcs-false-when-building-go-bootstr.patch | 0 package/go/{go/go.hash => go-src/go-src.hash} | 0 package/go/{go/go.mk => go-src/go-src.mk} | 25 ++++++++------- package/go/go.mk | 2 ++ 7 files changed, 48 insertions(+), 13 deletions(-) rename package/go/{go => go-src}/0001-build.go-explicit-option-for-crosscompilation.patch (100%) rename package/go/{go => go-src}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) rename package/go/{go/go.hash => go-src/go-src.hash} (100%) rename package/go/{go/go.mk => go-src/go-src.mk} (68%) diff --git a/.checkpackageignore b/.checkpackageignore index becaf6a9fc..ca4b2a8afb 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -514,7 +514,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch Upstream package/gnuplot/0001-configure-add-without-demo-option.patch Upstream -package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch Upstream +package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch Upstream package/gob2/0001-dont-include-from-prefix.patch Upstream package/gobject-introspection/0001-disable-tests.patch Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch Upstream diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 277d75e2b6..742d484420 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -32,5 +32,37 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS default y depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS +config BR2_PACKAGE_HOST_GO + bool "host go compiler" + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + help + Compiler for the Go language + + https://go.dev + +if BR2_PACKAGE_HOST_GO + +choice + prompt "Go compiler variant" + default BR2_PACKAGE_HOST_GO_SRC + help + Select a Go compiler variant. + + Default to 'host-go-src'. + +config BR2_PACKAGE_HOST_GO_SRC + bool "host go (source)" + help + This package will build the go compiler for the host. + +endchoice + +config BR2_PACKAGE_PROVIDES_HOST_GO + string + # Default to host-go-src + default "host-go-src" if BR2_PACKAGE_HOST_GO_SRC + +endif + source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" diff --git a/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch similarity index 100% rename from package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch rename to package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch diff --git a/package/go/go/go.hash b/package/go/go-src/go-src.hash similarity index 100% rename from package/go/go/go.hash rename to package/go/go-src/go-src.hash diff --git a/package/go/go/go.mk b/package/go/go-src/go-src.mk similarity index 68% rename from package/go/go/go.mk rename to package/go/go-src/go-src.mk index 8e3780eb29..07809ecb3e 100644 --- a/package/go/go/go.mk +++ b/package/go/go-src/go-src.mk @@ -1,21 +1,22 @@ ################################################################################ # -# go +# go-src # ################################################################################ -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz +GO_SRC_SITE = https://storage.googleapis.com/golang +GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz -GO_LICENSE = BSD-3-Clause -GO_LICENSE_FILES = LICENSE -GO_CPE_ID_VENDOR = golang +GO_SRC_LICENSE = BSD-3-Clause +GO_SRC_LICENSE_FILES = LICENSE +GO_SRC_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 +HOST_GO_SRC_PROVIDES = host-go +HOST_GO_SRC_DEPENDENCIES = host-go-bootstrap-stage2 ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) -HOST_GO_CROSS_ENV = \ +HOST_GO_SRC_CROSS_ENV = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" \ GOOS="linux" \ @@ -28,7 +29,7 @@ endif # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ +HOST_GO_SRC_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ @@ -41,12 +42,12 @@ HOST_GO_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_CROSS_ENV) -define HOST_GO_BUILD_CMDS +define HOST_GO_SRC_BUILD_CMDS cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) + $(HOST_GO_SRC_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) endef -define HOST_GO_INSTALL_CMDS +define HOST_GO_SRC_INSTALL_CMDS $(GO_BINARIES_INSTALL) endef diff --git a/package/go/go.mk b/package/go/go.mk index 21051a2050..42ea218e6c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -129,4 +129,6 @@ define GO_BINARIES_INSTALL find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef +$(eval $(host-virtual-package)) + include $(sort $(wildcard package/go/*/*.mk)) From patchwork Mon Oct 2 12:47:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Perale X-Patchwork-Id: 1842097 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RzgkM3fszz1yng for ; Mon, 2 Oct 2023 23:48:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A4DB5401D9; Mon, 2 Oct 2023 12:48:57 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A4DB5401D9 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6gYnvgiOvuNI; Mon, 2 Oct 2023 12:48:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id D3D0641E86; Mon, 2 Oct 2023 12:48:54 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D3D0641E86 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2DCD81BF589 for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 07A2C6101F for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 07A2C6101F X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zsI-BxrvT3Y4 for ; Mon, 2 Oct 2023 12:48:13 +0000 (UTC) Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9726461014 for ; Mon, 2 Oct 2023 12:48:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9726461014 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-99c1c66876aso2334060066b.2 for ; Mon, 02 Oct 2023 05:48:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250891; x=1696855691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xsw9F3NoHCqGqmjxUInNe+v7G1lDncfSJBIigZd+xr4=; b=tfle5ooSfJ/2Y3l3ZsObhRgom+xD7lEPwJ4teWKPGtDt2sEJ/hY7k82CWc/F0HBxxN BCJzqlfid5J+EYtodrqzMrqmd/j1DrO6FmKP7Urg3Y+fX4Buvj0hEKC43neiy8EGvnUK zgCfgBO6KJnB/ZYVFl9n9fMnDpfZuDht2ZnCaVx0tAChh/dZX5m+Oq0MK/yvwI7epGyK paKfs5yu3v7wOxSH1iBAguypNTysR37P8f/uRCgoeOGZrcAl/h60cbjOStM0vL7RPWf0 0GgwGaPiS0jes8vZyTgM8cd77ijUHE4m/VizJbLNJ4Oxq/spIYpb8mfGqVYoG/f9Z2G8 e4aQ== X-Gm-Message-State: AOJu0YzDDp8h+ztuJpgPWZxW/gXJlrF7vMu2VuNvQ5jPUJAIoZpZ1G3K USp72jCC3ebfC0x6zgLE0IkqY6VYDHWFARWfjMXCaA== X-Google-Smtp-Source: AGHT+IFQbRgSQFAOf3AjvRwoef/Go0ZbArC2bA7+ZO/JeywVfzMgEUCJ4hLrVjRvvTTro1Vzs+bT+w== X-Received: by 2002:a17:907:7804:b0:9ae:519f:8276 with SMTP id la4-20020a170907780400b009ae519f8276mr9004823ejc.73.1696250891194; Mon, 02 Oct 2023 05:48:11 -0700 (PDT) Received: from localhost.localdomain ([79.132.253.132]) by smtp.gmail.com with ESMTPSA id p3-20020a17090635c300b0098951bb4dc3sm16688189ejb.184.2023.10.02.05.48.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:48:10 -0700 (PDT) To: buildroot@buildroot.org Date: Mon, 2 Oct 2023 14:47:26 +0200 Message-ID: <20231002124736.179251-5-thomas.perale@essensium.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231002124736.179251-1-thomas.perale@essensium.com> References: <20231002124736.179251-1-thomas.perale@essensium.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; t=1696250891; x=1696855691; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xsw9F3NoHCqGqmjxUInNe+v7G1lDncfSJBIigZd+xr4=; b=DSWJ3oaGN2vcZV9R4WvkV9WsTGOzKtBFqmQfyXxtUoD2gPtPsiqH2Q5ZWhg/emk35p odtgpF+SIevVr/LIvgDyLUyMXUuLF5YpHQ0XjWGPejWMiwfXlJ9MWitfMNniMWYQtwVz AWxjXkk5rpskb1FSxXHcoPRvhbV1VIBTOs2lyPuTLPbKOBKbBKEKN1/GYUzZFtaZfCDI JhlGKMpW9w6HpgcwCTv55Ec0i38UEeAH4ek+amzorbBLtFqnSOW0qIDuR4O+USrD5O0F gWUaUSos2IP3dllnvfGInA2Tgt/1daKHY2DiBhhzk5DtPtrKfSu+TwEjH+pQ7JftyzNb spNQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=DSWJ3oaG Subject: [Buildroot] [PATCH 4/6] package/pkg-golang: select go compiler X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Perale via buildroot From: Thomas Perale Reply-To: Thomas Perale Cc: Thomas Petazzoni , Geoff Levand , Fabio Estevam , Anisse Astier , "Yann E . MORIN" , Angelo Compagnucci , Marcin Niestroj , Christian Stewart , Romain Naour , Thomas Perale Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Perale Select the 'go' virtual package in every package built by the Go compiler. This maintains the correct dependencies in 'menuconfig'. The same pattern is currently used for Rust packages. Signed-off-by: Thomas Perale --- package/balena-engine/Config.in | 1 + package/cni-plugins/Config.in | 1 + package/containerd/Config.in | 1 + package/crucible/Config.in | 1 + package/delve/Config.in | 1 + package/delve/Config.in.host | 1 + package/docker-cli/Config.in | 1 + package/docker-compose/Config.in | 1 + package/docker-engine/Config.in | 1 + package/embiggen-disk/Config.in | 1 + package/flannel/Config.in | 1 + package/gitlab-runner/Config.in | 1 + package/gocryptfs/Config.in | 1 + package/mender-artifact/Config.in.host | 1 + package/mender-connect/Config.in | 1 + package/mender/Config.in | 1 + package/moby-buildkit/Config.in | 1 + package/moby-buildkit/Config.in.host | 1 + package/nerdctl/Config.in | 1 + package/runc/Config.in | 1 + package/runc/Config.in.host | 1 + package/tinifier/Config.in | 1 + package/wtfutil/Config.in | 1 + 23 files changed, 23 insertions(+) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index 02f694515e..5966b33f58 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_BALENA_ENGINE depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime diff --git a/package/cni-plugins/Config.in b/package/cni-plugins/Config.in index 25e6ff534d..6d4ca0a5b4 100644 --- a/package/cni-plugins/Config.in +++ b/package/cni-plugins/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CNI_PLUGINS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU + select BR2_PACKAGE_HOST_GO help Container Networking Interface plugins. diff --git a/package/containerd/Config.in b/package/containerd/Config.in index e69dd6768a..e92764f304 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES diff --git a/package/crucible/Config.in b/package/crucible/Config.in index b27eb31ae5..1e1b29c3df 100644 --- a/package/crucible/Config.in +++ b/package/crucible/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRUCIBLE bool "crucible" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help Crucible is a One-Time-Programmable (OTP) fusing tool for the i.MX family. diff --git a/package/delve/Config.in b/package/delve/Config.in index 9428e4016a..288dc1ea15 100644 --- a/package/delve/Config.in +++ b/package/delve/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_DELVE_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + select BR2_PACKAGE_HOST_GO config BR2_PACKAGE_DELVE bool "delve" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host index dab5ca8914..0938ab0659 100644 --- a/package/delve/Config.in.host +++ b/package/delve/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_DELVE bool "host delve" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help Delve is a debugger for the Go programming language. diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in index 6f187c9d22..52e7f7c871 100644 --- a/package/docker-cli/Config.in +++ b/package/docker-cli/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_CLI depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Docker is a platform to build, ship, and run applications as lightweight containers. diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 59128f7a19..f3560e402b 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_DOCKER_CLI + select BR2_PACKAGE_HOST_GO help Multi-container applications with the Docker CLI. diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 570b2ff681..a6d8f64a1c 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_LIBSECCOMP help diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in index 667d71c86e..c323fb1b6d 100644 --- a/package/embiggen-disk/Config.in +++ b/package/embiggen-disk/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_EMBIGGEN_DISK depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_UTIL_LINUX # sfdisk select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk help diff --git a/package/flannel/Config.in b/package/flannel/Config.in index eb8d798f48..f37cfaa9cc 100644 --- a/package/flannel/Config.in +++ b/package/flannel/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_FLANNEL depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Flannel is a virtual network that gives a subnet to each host for use with container runtimes. diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 4289613ab9..cfe8c941bc 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_CA_CERTIFICATES # runtime select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in index 2630cafdcf..2c70b9b21b 100644 --- a/package/gocryptfs/Config.in +++ b/package/gocryptfs/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GOCRYPTFS bool "gocryptfs" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help gocryptfs is an encrypted FUSE overlay filesystem. diff --git a/package/mender-artifact/Config.in.host b/package/mender-artifact/Config.in.host index c7be0ed261..39353b23e7 100644 --- a/package/mender-artifact/Config.in.host +++ b/package/mender-artifact/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MENDER_ARTIFACT bool "host mender-artifact" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help The mender-artifact tool is a CLI implementation of the Mender artifacts library. diff --git a/package/mender-connect/Config.in b/package/mender-connect/Config.in index 0845910880..d478e468c2 100644 --- a/package/mender-connect/Config.in +++ b/package/mender-connect/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MENDER_CONNECT depends on BR2_USE_WCHAR # libglib2 -> gettext depends on BR2_USE_MMU # dbus -> fork() select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_MENDER # runtime select BR2_PACKAGE_OPENSSL diff --git a/package/mender/Config.in b/package/mender/Config.in index 7d768cebec..4831548f76 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in index 93c852bcdb..1a0b599097 100644 --- a/package/moby-buildkit/Config.in +++ b/package/moby-buildkit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MOBY_BUILDKIT depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_USE_MMU select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build artifacts in an efficient, expressive and repeatable manner. diff --git a/package/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host index a3b18548f8..d4eb0d74c3 100644 --- a/package/moby-buildkit/Config.in.host +++ b/package/moby-buildkit/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MOBY_BUILDKIT bool "host moby-buildkit" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build artifacts in an efficient expressive and repeatable manner. diff --git a/package/nerdctl/Config.in b/package/nerdctl/Config.in index 969b9bb40e..062b36ab85 100644 --- a/package/nerdctl/Config.in +++ b/package/nerdctl/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_NERDCTL depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CONTAINERD # runtime + select BR2_PACKAGE_HOST_GO help Docker-compatible CLI for containerd, controlling runc. diff --git a/package/runc/Config.in b/package/runc/Config.in index fe527b1954..73eac72527 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RUNC depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers according to the OCI specification. diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host index 4b2555e029..78193cb499 100644 --- a/package/runc/Config.in.host +++ b/package/runc/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_RUNC bool "host runc" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers according to the OCI specification. diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in index fbadfe6bd9..eae8b8f499 100644 --- a/package/tinifier/Config.in +++ b/package/tinifier/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TINIFIER bool "tinifier" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help CLI tool for images compressing diff --git a/package/wtfutil/Config.in b/package/wtfutil/Config.in index 8c3efcea5d..3fd8c41bab 100644 --- a/package/wtfutil/Config.in +++ b/package/wtfutil/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_WTFUTIL bool "wtfutil" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help WTF is the personal information dashboard for your terminal. From patchwork Mon Oct 2 12:47:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Perale X-Patchwork-Id: 1842099 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rzgkt6kWnz1yng for ; Mon, 2 Oct 2023 23:49:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 26E9641E5D; Mon, 2 Oct 2023 12:49:25 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 26E9641E5D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vic1H7EUu-6y; Mon, 2 Oct 2023 12:49:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 8C54D41E86; Mon, 2 Oct 2023 12:49:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8C54D41E86 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A1F171BF94D for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7ABA24056B for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 7ABA24056B X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zwn5CVRXMRWE for ; Mon, 2 Oct 2023 12:48:14 +0000 (UTC) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by smtp2.osuosl.org (Postfix) with ESMTPS id 1CC6640120 for ; Mon, 2 Oct 2023 12:48:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1CC6640120 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-32483535e51so4486996f8f.0 for ; Mon, 02 Oct 2023 05:48:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250892; x=1696855692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I1OL0V21Ch14FWuztAcXzz/7NLtXoO8OzqD8siWpFhM=; b=hbxvSWG31IJtxbbz9/cvsUloFk7RfqxjBP+2fjQzGcLrfZmiNQZMl6C+exRBBC9Ok5 Atgf+7jGbTGrGrVOKGM/4FrB+xqNVO6CgwFWTw8sB8So0j/B1Th9R1iO4op2IEG3296S 7ltMZkOTt2EslQJ6NtIckZ59wj5B636nM4RXJTj9Go1eCOKfS8qHaYn8WN6c3qPOD35Q NP5T60AQWYckIW7Ob12xNL1pdt56tU+SbvZQ0GL02KZPlhnj3Dm9SWJpNmew79tcVD2s L/7JverhYSUVa/c0tiXVKylyBIkTSXGWSu0YMsqeoetCPu6gnVnykx/xjVEgm3MYUJ2/ 2T6g== X-Gm-Message-State: AOJu0Yze56YtuSB3CfeiQcEYAN/pMusCtWPinuKPZL+iTxRdnEyqnhX3 tfm1xqpIZhx/TAM40PdsxwsyM5jM+O+/t9jbvIwE+g== X-Google-Smtp-Source: AGHT+IFGKWkm8jPpb8FTy3mODMrkTYiv72NU/Xe3o3b3jyafMqdtcAyj7r4qT4UVW/g3hOFx8e2cgw== X-Received: by 2002:a5d:68ce:0:b0:321:7844:de44 with SMTP id p14-20020a5d68ce000000b003217844de44mr8630237wrw.45.1696250891968; Mon, 02 Oct 2023 05:48:11 -0700 (PDT) Received: from localhost.localdomain ([79.132.253.132]) by smtp.gmail.com with ESMTPSA id p3-20020a17090635c300b0098951bb4dc3sm16688189ejb.184.2023.10.02.05.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:48:11 -0700 (PDT) To: buildroot@buildroot.org Date: Mon, 2 Oct 2023 14:47:27 +0200 Message-ID: <20231002124736.179251-6-thomas.perale@essensium.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231002124736.179251-1-thomas.perale@essensium.com> References: <20231002124736.179251-1-thomas.perale@essensium.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; t=1696250892; x=1696855692; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I1OL0V21Ch14FWuztAcXzz/7NLtXoO8OzqD8siWpFhM=; b=c3kRVVtD5Os4gny/VGo/HX7FZbOvMxfYFUwgKla51ms1R3aGMGzxD2WHIP5LCFcWx6 Ex9m4GbCV8FLWlM5q8R6zJ1mT9i20ySZIU39pTyMWrlO0mvdQBdvKy4+5iQx6Aauvn+I mGtEKbU3J6hlJ0serMow3e/qww7JqaDaewOW4jf9YS7o1sKaeZN3fnl2UMLU9HQGjhek xomW4gSMz1Qf1Op2HvqH1BHI+P1ptk2I2OrDSxCTqfQEpvGVcwY6XZcN2jU08f2E4dBv kf6eqgcMOQPQ/mWQt7aXi7Cl+ueiKjOelvx1qwLZ3LfL2msUPnq76TPTKKr+3aKQkZIo Gv4Q== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=c3kRVVtD Subject: [Buildroot] [PATCH 5/6] package/go/go-bin: new go provider X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Perale via buildroot From: Thomas Perale Reply-To: Thomas Perale Cc: Thomas Petazzoni , Geoff Levand , Fabio Estevam , Anisse Astier , "Yann E . MORIN" , Angelo Compagnucci , Marcin Niestroj , Christian Stewart , Romain Naour , Thomas Perale Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Perale This package provides a pre-built version for the host-go virtual package introduced in the previous commits. host-go-bin install a pre-built version of the Go compiler. The menuconfig entry for host-go is updated to expose the host-go-bin provider. The dependencies are set as such as if host-go-bin does not support the host architecture it will automatically fall back to host-go-src and vice-versa. Signed-off-by: Thomas Perale --- package/go/Config.in.host | 15 ++++++++++++--- package/go/go-bin/Config.in.host | 14 ++++++++++++++ package/go/go-bin/go-bin.hash | 8 ++++++++ package/go/go-bin/go-bin.mk | 19 +++++++++++++++++++ 4 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 package/go/go-bin/Config.in.host create mode 100644 package/go/go-bin/go-bin.hash create mode 100644 package/go/go-bin/go-bin.mk diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 742d484420..b3906fbae5 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -30,11 +30,11 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS || BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS config BR2_PACKAGE_HOST_GO bool "host go compiler" - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS help Compiler for the Go language @@ -44,7 +44,8 @@ if BR2_PACKAGE_HOST_GO choice prompt "Go compiler variant" - default BR2_PACKAGE_HOST_GO_SRC + default BR2_PACKAGE_HOST_GO_SRC if BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + default BR2_PACKAGE_HOST_GO_BIN if BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS help Select a Go compiler variant. @@ -52,9 +53,16 @@ choice config BR2_PACKAGE_HOST_GO_SRC bool "host go (source)" + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS help This package will build the go compiler for the host. +config BR2_PACKAGE_HOST_GO_BIN + bool "host go (pre-built)" + depends on BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS + help + This package will install pre-built versions of the compiler + endchoice config BR2_PACKAGE_PROVIDES_HOST_GO @@ -64,5 +72,6 @@ config BR2_PACKAGE_PROVIDES_HOST_GO endif +source "package/go/go-bin/Config.in.host" source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" diff --git a/package/go/go-bin/Config.in.host b/package/go/go-bin/Config.in.host new file mode 100644 index 0000000000..b259afa197 --- /dev/null +++ b/package/go/go-bin/Config.in.host @@ -0,0 +1,14 @@ +config BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH + string "Translate the HOSTARCH into the architecture name used by the Go compiler" + default armv6l if BR2_HOSTARCH = "arm" + default arm64 if BR2_HOSTARCH = "aarch64" + default ppc64le if BR2_HOSTARCH = "powerpc64le" + default s390x if BR2_HOSTARCH = "s390x" + default 386 if BR2_HOSTARCH = "x86" + default amd64 if BR2_HOSTARCH = "x86_64" + default "" + +config BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH != "" diff --git a/package/go/go-bin/go-bin.hash b/package/go/go-bin/go-bin.hash new file mode 100644 index 0000000000..3952014f44 --- /dev/null +++ b/package/go/go-bin/go-bin.hash @@ -0,0 +1,8 @@ +# sha256 checksum from https://go.dev/dl/ +sha256 b93850666cdadbd696a986cf7b03111fe99db8c34a9aaa113d7c96d0081e1901 go1.21.1.linux-386.tar.gz +sha256 b3075ae1ce5dab85f89bc7905d1632de23ca196bd8336afd93fa97434cfa55ae go1.21.1.linux-amd64.tar.gz +sha256 7da1a3936a928fd0b2602ed4f3ef535b8cd1990f1503b8d3e1acc0fa0759c967 go1.21.1.linux-arm64.tar.gz +sha256 f3716a43f59ae69999841d6007b42c9e286e8d8ce470656fb3e70d7be2d7ca85 go1.21.1.linux-armv6l.tar.gz +sha256 eddf018206f8a5589bda75252b72716d26611efebabdca5d0083ec15e9e41ab7 go1.21.1.linux-ppc64le.tar.gz +sha256 a83b3e8eb4dbf76294e773055eb51397510ff4d612a247bad9903560267bba6d go1.21.1.linux-s390x.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go-bin/go-bin.mk b/package/go/go-bin/go-bin.mk new file mode 100644 index 0000000000..6c5c1b6485 --- /dev/null +++ b/package/go/go-bin/go-bin.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# go-bin +# +################################################################################ + +GO_BIN_SITE = https://go.dev/dl +GO_BIN_LICENSE = BSD-3-Clause +GO_BIN_LICENSE_FILES = LICENSE + +HOST_GO_BIN_PROVIDES = host-go + +HOST_GO_BIN_SOURCE = go$(GO_VERSION).linux-$(call qstrip, $(BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH)).tar.gz + +define HOST_GO_BIN_INSTALL_CMDS + $(GO_BINARIES_INSTALL) +endef + +$(eval $(host-generic-package)) From patchwork Mon Oct 2 12:47:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Perale X-Patchwork-Id: 1842100 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rzgl84FNlz1yng for ; Mon, 2 Oct 2023 23:49:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A335841EA0; Mon, 2 Oct 2023 12:49:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A335841EA0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8c2Um1YSZkLv; Mon, 2 Oct 2023 12:49:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 3515141E64; Mon, 2 Oct 2023 12:49:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 3515141E64 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BF5591BF589 for ; Mon, 2 Oct 2023 12:48:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A3EBC40120 for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A3EBC40120 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HSJkKuz2uCPL for ; Mon, 2 Oct 2023 12:48:15 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by smtp2.osuosl.org (Postfix) with ESMTPS id CC8904016F for ; Mon, 2 Oct 2023 12:48:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org CC8904016F Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso2332438466b.1 for ; Mon, 02 Oct 2023 05:48:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250892; x=1696855692; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F2lLNETdj5DhQEbxg09TIzGAYvx6sG9g7WcvAKlaYOE=; b=bM4LZ4ER6+Cqs1FVCgRpqdiBIsV6JYjbEXEpR48fKekB9WllmPZcYv6k6R02rfpP+v Ri+V8qRNk/ilJxl+l1Ilgrc4d0MV7OQfs7ytgmhBFCD4rO3Aa9On1Qh3Nkj3uLXyx4FT 3nlWLLMkbXK/OQAeS0IJ8DgyaCv6ZhUjNEx4jWMUTk8Vl68DQkrmzkcNnHMMZN/CeTRc /IZeLHSwEnFyFKftLKTmCkvModmKRg5PcfoM9nAE7t7UQ/mkAd5cSPHYgPfA+PgRVuEY iW52m0kwrv7Reh6OkGQP1WN3pMj8++t3sjNNfyZBZpvl3kdChXXX5MNSPSk/XXk6yclp im/Q== X-Gm-Message-State: AOJu0YyXQAZzgCKYztwRUvMEzKspNgVOOjGgvXZs/hmwnISM+Rqf+aKZ 6t3MONALm2dULtNHQx8PUqHu0OHuufDQR0Pd/eKLDw== X-Google-Smtp-Source: AGHT+IHWkUiDl6K2k5sM12ICZC7KbrrBQUtrn7cnPRv5KnJ02/im0BKzbd0nBWcv9dXPgQFlp7XHiw== X-Received: by 2002:a17:906:5185:b0:9ae:6da8:1819 with SMTP id y5-20020a170906518500b009ae6da81819mr11166797ejk.48.1696250892695; Mon, 02 Oct 2023 05:48:12 -0700 (PDT) Received: from localhost.localdomain ([79.132.253.132]) by smtp.gmail.com with ESMTPSA id p3-20020a17090635c300b0098951bb4dc3sm16688189ejb.184.2023.10.02.05.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:48:12 -0700 (PDT) To: buildroot@buildroot.org Date: Mon, 2 Oct 2023 14:47:28 +0200 Message-ID: <20231002124736.179251-7-thomas.perale@essensium.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231002124736.179251-1-thomas.perale@essensium.com> References: <20231002124736.179251-1-thomas.perale@essensium.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=essensium.com; s=google; t=1696250892; x=1696855692; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F2lLNETdj5DhQEbxg09TIzGAYvx6sG9g7WcvAKlaYOE=; b=D8PYbnzA1jgwiplmwi2J6vQJ+b11iycPId9MEe/xtJ2XyC10tZ4nNZV5YwcnUk6C94 JVTaWHR7ZGjL/MEpQ55TN3HP9GcEvJn7/hjTkiWWG4sl5PzkTUMQQCYfwjxzkMcp9wLr ev3PFnrnppbyTDT3pm1Z6IkAD54OtXE+siw3A8HsOtrRQiNLgUp2XYHryHYJ5S/7Ov2X VR75gO0tCofp6usKoU2rTxYgvDrxqFFBXQHeHmWc2v95640HsvPV+MltdX/FQq10e00x ZdD5CE+v6k/9M8vVrKWZwh1xlrLkeeYCm7p+7e7wi7H+JKcQnDUhExlzvUl7avQ0LvsK bYUA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=essensium.com header.i=@essensium.com header.a=rsa-sha256 header.s=google header.b=D8PYbnzA Subject: [Buildroot] [PATCH 6/6] support/testing: add tests for Go providers X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Thomas Perale via buildroot From: Thomas Perale Reply-To: Thomas Perale Cc: Thomas Petazzoni , Geoff Levand , Fabio Estevam , Anisse Astier , "Yann E . MORIN" , Angelo Compagnucci , Marcin Niestroj , Christian Stewart , Romain Naour , Thomas Perale Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Perale Test the two providers of host-go to build a Go package. - TestGoBin tests host-go-bin - TestGoSource tests host-go-src The tests consist of building and installing a Go package in the root file system of a ARM vexpress QEMU system. The tests pass if the program can be ran correctly on the target. Signed-off-by: Thomas Perale --- support/testing/tests/package/test_go.py | 41 ++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 support/testing/tests/package/test_go.py diff --git a/support/testing/tests/package/test_go.py b/support/testing/tests/package/test_go.py new file mode 100644 index 0000000000..9beb66d0d9 --- /dev/null +++ b/support/testing/tests/package/test_go.py @@ -0,0 +1,41 @@ +import os + +import infra.basetest + + +class TestGoBase(infra.basetest.BRTest): + + def login(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + +class TestGoBin(TestGoBase): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_HOST_GO=y + BR2_PACKAGE_HOST_GO_SRC=y + BR2_PACKAGE_TINIFIER=y + """ + + def test_run(self): + self.login() + self.assertRunOk("tinifier -h") + + +class TestGoSource(TestGoBase): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_HOST_GO=y + BR2_PACKAGE_HOST_GO_BIN=y + BR2_PACKAGE_TINIFIER=y + """ + + def test_run(self): + self.login() + self.assertRunOk("tinifier -h")