| Message ID | 20210506194616.2972714-2-holger.sunke@posteo.de |
|---|---|
| State | Superseded |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FbkcC74ngz44RY for <patchwork@web04.haj.ipfire.org>; Thu, 6 May 2021 19:46:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Fbkc951vHz2RX; Thu, 6 May 2021 19:46:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Fbkc913vTz2ylN; Thu, 6 May 2021 19:46:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Fbkc832hMz2xCN for <development@lists.ipfire.org>; Thu, 6 May 2021 19:46:48 +0000 (UTC) Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Fbkc80wCzzjb for <development@lists.ipfire.org>; Thu, 6 May 2021 19:46:48 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C3FFC24002B for <development@lists.ipfire.org>; Thu, 6 May 2021 21:46:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1620330407; bh=LzGY56HLEAZU63iqd2VEDZjd5fsQetQ09v40Px5dn2E=; h=From:To:Cc:Subject:Date:From; b=qY6SlmnFyPiplddYhDYUuLus3PXBFqA/wHGSH94vUtVfp4gVLwu0/7Jt/CLbdxDv8 jHynHBmo6fRffsx40a2NxHzYL1Lek/uFQlUBP7a0+HgGwfH44upYjbgyE6jWdxX85s tU6OP9wCcuMjIEDbmB3vxqK3ERUKRUnrIg+zCXpRzATv9RzOQBVmr1LnZZPDnL0lGf rIGkI9W+UZ1z2WENjRuxQJVOtFUkrAtiFXNRTCUjCjy7udBdfNXrjFo71ZotqFwbtz DpY2YXTYRrkNvFdm8L0PpMuESbmnFTeHlPzNxurb8oboM9Hroa+ITR+aTXTrT83FoI 5D5NhyShh8+gg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fbkc73p5rz9rxG; Thu, 6 May 2021 21:46:47 +0200 (CEST) From: Holger Sunke <holger.sunke@posteo.de> To: development@lists.ipfire.org Subject: [PATCH 1/2] Added i586/386 support for GO language required for node_exporter. Date: Thu, 6 May 2021 19:46:15 +0000 Message-Id: <20210506194616.2972714-2-holger.sunke@posteo.de> In-Reply-To: <20210506194616.2972714-1-holger.sunke@posteo.de> References: <20210506194616.2972714-1-holger.sunke@posteo.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=posteo.de header.s=2017 header.b=qY6SlmnF; dmarc=pass (policy=none) header.from=posteo.de; spf=pass (mail01.ipfire.org: domain of holger.sunke@posteo.de designates 185.67.36.65 as permitted sender) smtp.mailfrom=holger.sunke@posteo.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1620330408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MkXIMnom0K78v4NtDlmzGAhm1kOPBcCVbrNVvGBJXEw=; b=HZNW2VpBZ0lEdnSfgzvtMGOGsNC+G7zl6+vdLw5g4f0zYwRaP0TUVYExWq1r32PqJAMIP0 a3P3hww27DZXiJyJW8Y3SwoBk8HcoygqfFWsouyHQw6aoreBAf0ZpftckeZx6gRkIuzu5W NaMvLKaf9cJaIb7DIRe9H/S/5TMIlUDmehyeqHzOS9OpPs2OSiCwFtFo726hwTdsOL6EHR uMAMtKwDtj5lzuDXx0/JUuJuC45xQdIwena8tBsVT2KDTVu0Xc1Jbks/uKq/QuBJHaGZqK XiG6t9IM0gdXoudhPc68BOZ7IlIbaHVcmYt1I2IUTNNfxGf0vh9jzVy6+gs2jw== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1620330408; a=rsa-sha256; cv=none; b=hLDWhrDvjFKwt3mulCfJR2Yr2YzInQ9VztJTercFXIebi7xw9rz4lpa9FEdwnXDTxXYph8 37NQXxJxlW+NpjmFpPgseWiQ5Ivhng+yj+y257gpUuJ1DDIZFM/6NxBXeekQAXD0uFronB h9MFwnfrkGzvb7YP+9EpPv1KMNfeOworZ/eKlVjq6/9iXCQw/PAQ+Z4V02KApA6QedFNW1 fvVmMyrp9SumVLlAdF1qApWzI54KNMTSc9Ap0cs2zs93UfetLirEGPa8B29ouiyoVw6+27 f7ACc2gvYyfJsMA6umnu1ez50Gs/5e4G/8mU7RTRVz8dVqGrmf+MCzgZduI3Aw== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=posteo.de header.s=2017 header.b=qY6SlmnF; dmarc=pass (policy=none) header.from=posteo.de; spf=pass (mail01.ipfire.org: domain of holger.sunke@posteo.de designates 185.67.36.65 as permitted sender) smtp.mailfrom=holger.sunke@posteo.de X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-0.72 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:185.67.36.0/23:c]; R_MISSING_CHARSET(2.50)[]; RWL_MAILSPIKE_GOOD(0.00)[185.67.36.65:from]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; IP_REPUTATION_HAM(-0.01)[asn: 8495(0.00), country: DE(-0.01), ip: 185.67.36.65(0.00)]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[posteo.de:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[posteo.de,none]; RCVD_IN_DNSWL_MED(-0.20)[185.67.36.65:from]; MX_GOOD(-0.01)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8495, ipnet:185.67.36.0/23, country:DE]; BAYES_HAM(-3.00)[99.99%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[posteo.de:s=2017]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; DWL_DNSWL_LOW(-1.00)[posteo.de:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Fbkc80wCzzjb X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
Added new Package node_exporter
|
|
Commit Message
Holger Sunke
May 6, 2021, 7:46 p.m. UTC
--- lfs/Config | 4 ++++ lfs/go | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)
Comments
Hi Holger, On 06/05/2021 21:46, Holger Sunke wrote: > --- > lfs/Config | 4 ++++ > lfs/go | 6 +++--- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/lfs/Config b/lfs/Config > index eadbbc408..4d0f2f00b 100644 > --- a/lfs/Config > +++ b/lfs/Config > @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" > GOARCH = arm64 > endif > > +ifeq "$(BUILD_ARCH)" "i586" > + GOARCH = 386 > +endif > + A question I would have here is if creating this package in i586 architecture makes sense when in 7 months the i586 version of IPFire will have reached End Of Life and will no longer be updated. Regards, Adolf > ############################################################################### > # Common Macro Definitions > ############################################################################### > diff --git a/lfs/go b/lfs/go > index 6ebb37080..97effcb84 100644 > --- a/lfs/go > +++ b/lfs/go > @@ -28,10 +28,9 @@ VER = 1.15.4 > > THISAPP = go-$(VER) > DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz > -DL_FROM = $(URL_IPFIRE) > +DL_FROM = https://golang.org/dl/ > DIR_APP = $(DIR_SRC)/go > TARGET = $(DIR_INFO)/$(THISAPP) > -SUP_ARCH = x86_64 > > ############################################################################### > # Top-level Rules > @@ -41,7 +40,8 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d > +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d > +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c > > install : $(TARGET) >
Hello Holger, Thanks for this patch, but I am afraid it doesn’t do exactly what you intend to do. > On 6 May 2021, at 20:46, Holger Sunke <holger.sunke@posteo.de> wrote: > > --- > lfs/Config | 4 ++++ > lfs/go | 6 +++--- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/lfs/Config b/lfs/Config > index eadbbc408..4d0f2f00b 100644 > --- a/lfs/Config > +++ b/lfs/Config > @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" > GOARCH = arm64 > endif > > +ifeq "$(BUILD_ARCH)" "i586" > + GOARCH = 386 > +endif This is fine. > + > ############################################################################### > # Common Macro Definitions > ############################################################################### > diff --git a/lfs/go b/lfs/go > index 6ebb37080..97effcb84 100644 > --- a/lfs/go > +++ b/lfs/go > @@ -28,10 +28,9 @@ VER = 1.15.4 > > THISAPP = go-$(VER) > DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz > -DL_FROM = $(URL_IPFIRE) > +DL_FROM = https://golang.org/dl/ > DIR_APP = $(DIR_SRC)/go > TARGET = $(DIR_INFO)/$(THISAPP) > -SUP_ARCH = x86_64 This however enables Go for all architectures including aarch64 and armv5tel which is not what you intend. The correct solution would be to add i586 to the list of supported architectures. However, I would object to only add Go for i586 because you personally use IPFire on this architecture (please not Adolf’s remarks on our schedule to discontinue i586). We only build Go for x86_64 because the only package that uses it is the Amazon SSM agent which is not relevant on any other architecture. node_exporter seems to be a package that could in theory run on any architecture and I feel that we should not discriminate by only building something for one architecture because we do not want to test it on any of the others. -Michael > > ############################################################################### > # Top-level Rules > @@ -41,7 +40,8 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d > +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d > +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c > > install : $(TARGET) > > -- > 2.30.2 >
Hello Michael, Am 07.05.21 um 13:28 schrieb Michael Tremer: > Hello Holger, > > Thanks for this patch, but I am afraid it doesn’t do exactly what you intend to do. > >> On 6 May 2021, at 20:46, Holger Sunke <holger.sunke@posteo.de> wrote: >> >> --- >> lfs/Config | 4 ++++ >> lfs/go | 6 +++--- >> 2 files changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/lfs/Config b/lfs/Config >> index eadbbc408..4d0f2f00b 100644 >> --- a/lfs/Config >> +++ b/lfs/Config >> @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" >> GOARCH = arm64 >> endif >> >> +ifeq "$(BUILD_ARCH)" "i586" >> + GOARCH = 386 >> +endif > > This is fine. > >> + >> ############################################################################### >> # Common Macro Definitions >> ############################################################################### >> diff --git a/lfs/go b/lfs/go >> index 6ebb37080..97effcb84 100644 >> --- a/lfs/go >> +++ b/lfs/go >> @@ -28,10 +28,9 @@ VER = 1.15.4 >> >> THISAPP = go-$(VER) >> DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz >> -DL_FROM = $(URL_IPFIRE) >> +DL_FROM = https://golang.org/dl/ >> DIR_APP = $(DIR_SRC)/go >> TARGET = $(DIR_INFO)/$(THISAPP) >> -SUP_ARCH = x86_64 > > This however enables Go for all architectures including aarch64 and armv5tel which is not what you intend. > > The correct solution would be to add i586 to the list of supported architectures. > > However, I would object to only add Go for i586 because you personally use IPFire on this architecture (please not Adolf’s remarks on our schedule to discontinue i586). We only build Go for x86_64 because the only package that uses it is the Amazon SSM agent which is not relevant on any other architecture. node_exporter seems to be a package that could in theory run on any architecture and I feel that we should not discriminate by only building something for one architecture because we do not want to test it on any of the others. Not sure if I get you right, but finally I think I should change the Config to make "go" compile for _all_ architectures supported by ipfire as node_exporter depends on it. Kind regards Holger > > -Michael > >> >> ############################################################################### >> # Top-level Rules >> @@ -41,7 +40,8 @@ objects = $(DL_FILE) >> >> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >> +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >> +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c >> >> install : $(TARGET) >> >> -- >> 2.30.2 >> >
Hello, > On 7 May 2021, at 19:19, Holger Sunke <holger.sunke@posteo.de> wrote: > > Hello Michael, > > > Am 07.05.21 um 13:28 schrieb Michael Tremer: >> Hello Holger, >> Thanks for this patch, but I am afraid it doesn’t do exactly what you intend to do. >>> On 6 May 2021, at 20:46, Holger Sunke <holger.sunke@posteo.de> wrote: >>> >>> --- >>> lfs/Config | 4 ++++ >>> lfs/go | 6 +++--- >>> 2 files changed, 7 insertions(+), 3 deletions(-) >>> >>> diff --git a/lfs/Config b/lfs/Config >>> index eadbbc408..4d0f2f00b 100644 >>> --- a/lfs/Config >>> +++ b/lfs/Config >>> @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" >>> GOARCH = arm64 >>> endif >>> >>> +ifeq "$(BUILD_ARCH)" "i586" >>> + GOARCH = 386 >>> +endif >> This is fine. >>> + >>> ############################################################################### >>> # Common Macro Definitions >>> ############################################################################### >>> diff --git a/lfs/go b/lfs/go >>> index 6ebb37080..97effcb84 100644 >>> --- a/lfs/go >>> +++ b/lfs/go >>> @@ -28,10 +28,9 @@ VER = 1.15.4 >>> >>> THISAPP = go-$(VER) >>> DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz >>> -DL_FROM = $(URL_IPFIRE) >>> +DL_FROM = https://golang.org/dl/ >>> DIR_APP = $(DIR_SRC)/go >>> TARGET = $(DIR_INFO)/$(THISAPP) >>> -SUP_ARCH = x86_64 >> This however enables Go for all architectures including aarch64 and armv5tel which is not what you intend. >> The correct solution would be to add i586 to the list of supported architectures. >> However, I would object to only add Go for i586 because you personally use IPFire on this architecture (please not Adolf’s remarks on our schedule to discontinue i586). We only build Go for x86_64 because the only package that uses it is the Amazon SSM agent which is not relevant on any other architecture. node_exporter seems to be a package that could in theory run on any architecture and I feel that we should not discriminate by only building something for one architecture because we do not want to test it on any of the others. > > Not sure if I get you right, but finally I think I should change the Config to make "go" compile for _all_ architectures supported by ipfire as node_exporter depends on it. Yes, that is correct. We aim to treat all architectures the same. Sometimes that isn’t possible, but that isn’t the case here. Best, -Michael > > Kind regards > > Holger > >> -Michael >>> >>> ############################################################################### >>> # Top-level Rules >>> @@ -41,7 +40,8 @@ objects = $(DL_FILE) >>> >>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>> >>> -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >>> +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >>> +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c >>> >>> install : $(TARGET) >>> >>> -- >>> 2.30.2
Hello Michael, Am 11.05.21 um 11:53 schrieb Michael Tremer: > Hello, > >> On 7 May 2021, at 19:19, Holger Sunke <holger.sunke@posteo.de> wrote: >> >> Hello Michael, >> >> >> Am 07.05.21 um 13:28 schrieb Michael Tremer: >>> Hello Holger, >>> Thanks for this patch, but I am afraid it doesn’t do exactly what you intend to do. >>>> On 6 May 2021, at 20:46, Holger Sunke <holger.sunke@posteo.de> wrote: >>>> >>>> --- >>>> lfs/Config | 4 ++++ >>>> lfs/go | 6 +++--- >>>> 2 files changed, 7 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/lfs/Config b/lfs/Config >>>> index eadbbc408..4d0f2f00b 100644 >>>> --- a/lfs/Config >>>> +++ b/lfs/Config >>>> @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" >>>> GOARCH = arm64 >>>> endif >>>> >>>> +ifeq "$(BUILD_ARCH)" "i586" >>>> + GOARCH = 386 >>>> +endif >>> This is fine. >>>> + >>>> ############################################################################### >>>> # Common Macro Definitions >>>> ############################################################################### >>>> diff --git a/lfs/go b/lfs/go >>>> index 6ebb37080..97effcb84 100644 >>>> --- a/lfs/go >>>> +++ b/lfs/go >>>> @@ -28,10 +28,9 @@ VER = 1.15.4 >>>> >>>> THISAPP = go-$(VER) >>>> DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz >>>> -DL_FROM = $(URL_IPFIRE) >>>> +DL_FROM = https://golang.org/dl/ >>>> DIR_APP = $(DIR_SRC)/go >>>> TARGET = $(DIR_INFO)/$(THISAPP) >>>> -SUP_ARCH = x86_64 >>> This however enables Go for all architectures including aarch64 and armv5tel which is not what you intend. >>> The correct solution would be to add i586 to the list of supported architectures. >>> However, I would object to only add Go for i586 because you personally use IPFire on this architecture (please not Adolf’s remarks on our schedule to discontinue i586). We only build Go for x86_64 because the only package that uses it is the Amazon SSM agent which is not relevant on any other architecture. node_exporter seems to be a package that could in theory run on any architecture and I feel that we should not discriminate by only building something for one architecture because we do not want to test it on any of the others. >> >> Not sure if I get you right, but finally I think I should change the Config to make "go" compile for _all_ architectures supported by ipfire as node_exporter depends on it. > > Yes, that is correct. We aim to treat all architectures the same. Sometimes that isn’t possible, but that isn’t the case here. > > Best, > -Michael > Dou you have a list of all architectures supported by IPFire beyond i586(legacy), aarch64(=arm64?), x86_64 and arm? Kind regards Holger >> >>> -Michael >>>> >>>> ############################################################################### >>>> # Top-level Rules >>>> @@ -41,7 +40,8 @@ objects = $(DL_FILE) >>>> >>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>> >>>> -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >>>> +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >>>> +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c >>>> >>>> install : $(TARGET) >>>> >>>> -- >>>> 2.30.2 >
Hello Holger, > On 21 May 2021, at 09:56, Holger Sunke <holger.sunke@posteo.de> wrote: > > Hello Michael, > > > Am 11.05.21 um 11:53 schrieb Michael Tremer: >> Hello, >>> On 7 May 2021, at 19:19, Holger Sunke <holger.sunke@posteo.de> wrote: >>> >>> Hello Michael, >>> >>> >>> Am 07.05.21 um 13:28 schrieb Michael Tremer: >>>> Hello Holger, >>>> Thanks for this patch, but I am afraid it doesn’t do exactly what you intend to do. >>>>> On 6 May 2021, at 20:46, Holger Sunke <holger.sunke@posteo.de> wrote: >>>>> >>>>> --- >>>>> lfs/Config | 4 ++++ >>>>> lfs/go | 6 +++--- >>>>> 2 files changed, 7 insertions(+), 3 deletions(-) >>>>> >>>>> diff --git a/lfs/Config b/lfs/Config >>>>> index eadbbc408..4d0f2f00b 100644 >>>>> --- a/lfs/Config >>>>> +++ b/lfs/Config >>>>> @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" >>>>> GOARCH = arm64 >>>>> endif >>>>> >>>>> +ifeq "$(BUILD_ARCH)" "i586" >>>>> + GOARCH = 386 >>>>> +endif >>>> This is fine. >>>>> + >>>>> ############################################################################### >>>>> # Common Macro Definitions >>>>> ############################################################################### >>>>> diff --git a/lfs/go b/lfs/go >>>>> index 6ebb37080..97effcb84 100644 >>>>> --- a/lfs/go >>>>> +++ b/lfs/go >>>>> @@ -28,10 +28,9 @@ VER = 1.15.4 >>>>> >>>>> THISAPP = go-$(VER) >>>>> DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz >>>>> -DL_FROM = $(URL_IPFIRE) >>>>> +DL_FROM = https://golang.org/dl/ >>>>> DIR_APP = $(DIR_SRC)/go >>>>> TARGET = $(DIR_INFO)/$(THISAPP) >>>>> -SUP_ARCH = x86_64 >>>> This however enables Go for all architectures including aarch64 and armv5tel which is not what you intend. >>>> The correct solution would be to add i586 to the list of supported architectures. >>>> However, I would object to only add Go for i586 because you personally use IPFire on this architecture (please not Adolf’s remarks on our schedule to discontinue i586). We only build Go for x86_64 because the only package that uses it is the Amazon SSM agent which is not relevant on any other architecture. node_exporter seems to be a package that could in theory run on any architecture and I feel that we should not discriminate by only building something for one architecture because we do not want to test it on any of the others. >>> >>> Not sure if I get you right, but finally I think I should change the Config to make "go" compile for _all_ architectures supported by ipfire as node_exporter depends on it. >> Yes, that is correct. We aim to treat all architectures the same. Sometimes that isn’t possible, but that isn’t the case here. >> Best, >> -Michael > > Dou you have a list of all architectures supported by IPFire beyond i586(legacy), aarch64(=arm64?), x86_64 and arm? We currently support these architectures: * x86_64 which is our primary architecture with by far the most users on it * aarch64 * i586 which is currently deprecated and will be dropped soon (https://blog.ipfire.org/post/new-year-more-bits) * armv5tel - this might be tricky because we do not have any floating-point support. However, the kernel requires that which means that you will at least need an armv6l processor in order to run on this. Depending on what Go provides upstream, armv6l might be fine. Best, -Michael > > Kind regards > > Holger >>> >>>> -Michael >>>>> >>>>> ############################################################################### >>>>> # Top-level Rules >>>>> @@ -41,7 +40,8 @@ objects = $(DL_FILE) >>>>> >>>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE) >>>>> >>>>> -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >>>>> +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d >>>>> +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c >>>>> >>>>> install : $(TARGET) >>>>> >>>>> -- >>>>> 2.30.2
diff --git a/lfs/Config b/lfs/Config index eadbbc408..4d0f2f00b 100644 --- a/lfs/Config +++ b/lfs/Config @@ -138,6 +138,10 @@ ifeq "$(BUILD_ARCH)" "aarch64" GOARCH = arm64 endif +ifeq "$(BUILD_ARCH)" "i586" + GOARCH = 386 +endif + ############################################################################### # Common Macro Definitions ############################################################################### diff --git a/lfs/go b/lfs/go index 6ebb37080..97effcb84 100644 --- a/lfs/go +++ b/lfs/go @@ -28,10 +28,9 @@ VER = 1.15.4 THISAPP = go-$(VER) DL_FILE = go$(VER).$(GOOS)-$(GOARCH).tar.gz -DL_FROM = $(URL_IPFIRE) +DL_FROM = https://golang.org/dl/ DIR_APP = $(DIR_SRC)/go TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = x86_64 ############################################################################### # Top-level Rules @@ -41,7 +40,8 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8e9d11a16f03372c82c5134278a0bd7d +go$(VER).$(GOOS)-amd64.tar.gz_MD5 = 8e9d11a16f03372c82c5134278a0bd7d +go$(VER).$(GOOS)-386.tar.gz_MD5 = 8d1c3539c88710273f61b0c810b7448c install : $(TARGET)