diff mbox series

[v1] tools: ipxe: update for fixing build with GCC10

Message ID 20210104115223.25403-1-olaf@aepfle.de (mailing list archive)
State New, archived
Headers show
Series [v1] tools: ipxe: update for fixing build with GCC10 | expand

Commit Message

Olaf Hering Jan. 4, 2021, 11:52 a.m. UTC
Update to v1.21.1 to fix build in Tumbleweed, which has been broken
since months due to lack of new release.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 tools/firmware/etherboot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wei Liu Jan. 5, 2021, 11:57 a.m. UTC | #1
On Mon, Jan 04, 2021 at 12:52:23PM +0100, Olaf Hering wrote:
> Update to v1.21.1 to fix build in Tumbleweed, which has been broken
> since months due to lack of new release.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by: Wei Liu <wl@xen.org>

> ---
>  tools/firmware/etherboot/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
> index 0de30599bf..ed9e11305f 100644
> --- a/tools/firmware/etherboot/Makefile
> +++ b/tools/firmware/etherboot/Makefile
> @@ -10,7 +10,7 @@ else
>  IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git
>  endif
>  
> -IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6
> +IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c
>  
>  IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
>
Ian Jackson Jan. 6, 2021, 11:23 a.m. UTC | #2
Wei Liu writes ("Re: [PATCH v1] tools: ipxe: update for fixing build with GCC10"):
> On Mon, Jan 04, 2021 at 12:52:23PM +0100, Olaf Hering wrote:
> > Update to v1.21.1 to fix build in Tumbleweed, which has been broken
> > since months due to lack of new release.
> > 
> > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> Acked-by: Wei Liu <wl@xen.org>
...
> > -IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6
> > +IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c

Unfortunately this broke the build, but it's not really your fault:

osstest service owner writes ("[xen-unstable-smoke test] 158191: regressions - FAIL"):
> Tests which did not succeed and are blocking,
> including tests which could not be run:
>  build-amd64                   6 xen-build                fail REGR. vs. 158134

--2021-01-06 01:27:19--  http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz
Resolving cache (cache)... 172.16.148.6
Connecting to cache (cache)|172.16.148.6|:3128... connected.
Proxy request sent, awaiting response... 404 Not Found

We currently insist on having have a tarball.

That means someone (me, I guess) has to do a "git archive" and put the
resulting tarball in the right place on xenbits.  Unfortunately this
is still manual, but we don't update ipxe very often.

I have made the tarball now.

Ian.
Wei Liu Jan. 6, 2021, 11:25 a.m. UTC | #3
On Wed, Jan 06, 2021 at 11:23:43AM +0000, Ian Jackson wrote:
> Wei Liu writes ("Re: [PATCH v1] tools: ipxe: update for fixing build with GCC10"):
> > On Mon, Jan 04, 2021 at 12:52:23PM +0100, Olaf Hering wrote:
> > > Update to v1.21.1 to fix build in Tumbleweed, which has been broken
> > > since months due to lack of new release.
> > > 
> > > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > 
> > Acked-by: Wei Liu <wl@xen.org>
> ...
> > > -IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6
> > > +IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c
> 
> Unfortunately this broke the build, but it's not really your fault:
> 
> osstest service owner writes ("[xen-unstable-smoke test] 158191: regressions - FAIL"):
> > Tests which did not succeed and are blocking,
> > including tests which could not be run:
> >  build-amd64                   6 xen-build                fail REGR. vs. 158134
> 
> --2021-01-06 01:27:19--  http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz
> Resolving cache (cache)... 172.16.148.6
> Connecting to cache (cache)|172.16.148.6|:3128... connected.
> Proxy request sent, awaiting response... 404 Not Found
> 
> We currently insist on having have a tarball.
> 
> That means someone (me, I guess) has to do a "git archive" and put the
> resulting tarball in the right place on xenbits.  Unfortunately this
> is still manual, but we don't update ipxe very often.
> 

Wouldn't the build host just fetch from the upstream git tree? That's
why I didn't ask you to make a tarball -- I was waiting to see if this
could pass osstest before asking.

> I have made the tarball now.

Thanks.

Wei.

> 
> Ian.
Wei Liu Jan. 6, 2021, 11:26 a.m. UTC | #4
On Wed, Jan 06, 2021 at 11:25:34AM +0000, Wei Liu wrote:
> On Wed, Jan 06, 2021 at 11:23:43AM +0000, Ian Jackson wrote:
> > Wei Liu writes ("Re: [PATCH v1] tools: ipxe: update for fixing build with GCC10"):
> > > On Mon, Jan 04, 2021 at 12:52:23PM +0100, Olaf Hering wrote:
> > > > Update to v1.21.1 to fix build in Tumbleweed, which has been broken
> > > > since months due to lack of new release.
> > > > 
> > > > Signed-off-by: Olaf Hering <olaf@aepfle.de>
> > > 
> > > Acked-by: Wei Liu <wl@xen.org>
> > ...
> > > > -IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6
> > > > +IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c
> > 
> > Unfortunately this broke the build, but it's not really your fault:
> > 
> > osstest service owner writes ("[xen-unstable-smoke test] 158191: regressions - FAIL"):
> > > Tests which did not succeed and are blocking,
> > > including tests which could not be run:
> > >  build-amd64                   6 xen-build                fail REGR. vs. 158134
> > 
> > --2021-01-06 01:27:19--  http://xenbits.xen.org/xen-extfiles/ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz
> > Resolving cache (cache)... 172.16.148.6
> > Connecting to cache (cache)|172.16.148.6|:3128... connected.
> > Proxy request sent, awaiting response... 404 Not Found
> > 
> > We currently insist on having have a tarball.
> > 
> > That means someone (me, I guess) has to do a "git archive" and put the
> > resulting tarball in the right place on xenbits.  Unfortunately this
> > is still manual, but we don't update ipxe very often.
> > 
> 
> Wouldn't the build host just fetch from the upstream git tree? That's
> why I didn't ask you to make a tarball -- I was waiting to see if this
> could pass osstest before asking.
> 

Never mind. It seems that I have missed the change of requirement...

Wei.
Ian Jackson Jan. 6, 2021, 11:35 a.m. UTC | #5
Wei Liu writes ("Re: [PATCH v1] tools: ipxe: update for fixing build with GCC10 [and 1 more messages]"):
> On Wed, Jan 06, 2021 at 11:25:34AM +0000, Wei Liu wrote:
> > Wouldn't the build host just fetch from the upstream git tree? That's
> > why I didn't ask you to make a tarball -- I was waiting to see if this
> > could pass osstest before asking.

The build system's ability to do that has been nobbled in osstest for
a very long time.

> Never mind. It seems that I have missed the change of requirement...

I don't think there has been a change.  But it's been a long time
since we did an ipxe update.

Ian.
Olaf Hering Jan. 7, 2021, 8:20 a.m. UTC | #6
Am Wed, 6 Jan 2021 11:23:43 +0000
schrieb Ian Jackson <iwj@xenproject.org>:

> We currently insist on having have a tarball.

Maybe add a comment to IPXE_GIT_TAG which lists the required extra steps.

Olaf
diff mbox series

Patch

diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
index 0de30599bf..ed9e11305f 100644
--- a/tools/firmware/etherboot/Makefile
+++ b/tools/firmware/etherboot/Makefile
@@ -10,7 +10,7 @@  else
 IPXE_GIT_URL ?= git://git.ipxe.org/ipxe.git
 endif
 
-IPXE_GIT_TAG := 1dd56dbd11082fb622c2ed21cfaced4f47d798a6
+IPXE_GIT_TAG := 988d2c13cdf0f0b4140685af35ced70ac5b3283c
 
 IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz