Hi All, The ipxe git commit version changed, but its release version should still stay at v1.0.0 Signed-off-by: Yongjie Ren <yongjie.ren@intel.com<mailto:yongjie.ren@intel.com>> ------ diff -r 4086e4811547 tools/firmware/etherboot/Makefile --- a/tools/firmware/etherboot/Makefile Thu Jan 05 17:25:23 2012 +0000 +++ b/tools/firmware/etherboot/Makefile Fri Jan 06 14:30:54 2012 +0800 @@ -12,7 +12,9 @@ IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e -IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz +IPXE_VERSION := v1.0.0 + +IPXE_TARBALL_URL := $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_VERSION).tar.gz D=ipxe T=ipxe.tar.gz Best Regards, Yongjie Ren (Jay) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Fri, 2012-01-06 at 07:44 +0000, Ren, Yongjie wrote:> Hi All, > > The ipxe git commit version changed, but its release version should > still stay at v1.0.0Doesn''t this effectively undo the change in 24455:94180a5a0c7c since the $T rules first tries to wget $(IPXE_TARBALL_URL) before cloning the git tree? Therefore with this change it is going to find and clone v1.0 instead of using the git tag.> > > > Signed-off-by: Yongjie Ren <yongjie.ren@intel.com> > > ------ > > > > diff -r 4086e4811547 tools/firmware/etherboot/Makefile > > --- a/tools/firmware/etherboot/Makefile Thu Jan 05 17:25:23 2012 +0000 > > +++ b/tools/firmware/etherboot/Makefile Fri Jan 06 14:30:54 2012 +0800 > > @@ -12,7 +12,9 @@ > > > > IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e > > > > -IPXE_TARBALL_URL :> $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz > > +IPXE_VERSION := v1.0.0 > > + > > +IPXE_TARBALL_URL :> $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_VERSION).tar.gz > > > > D=ipxe > > T=ipxe.tar.gz > > > > Best Regards, > > Yongjie Ren (Jay) > > > >
> -----Original Message----- > From: Ian Campbell [mailto:Ian.Campbell@citrix.com] > Sent: Friday, January 06, 2012 4:46 PM > To: Ren, Yongjie > Cc: xen-devel@lists.xensource.com; Ian Jackson > Subject: Re: [Xen-devel] [PATCH] tools: fix ipxe version issue in Makefile > > On Fri, 2012-01-06 at 07:44 +0000, Ren, Yongjie wrote: > > Hi All, > > > > The ipxe git commit version changed, but its release version should > > still stay at v1.0.0 > > Doesn''t this effectively undo the change in 24455:94180a5a0c7c since the > $T rules first tries to wget $(IPXE_TARBALL_URL) before cloning the git > tree? Therefore with this change it is going to find and clone v1.0 > instead of using the git tag. >No, I don''t want to undo the change in CS #24455. I just want to fix an obvious issue. Before my patch, we''ll get "IPXE_TARBALL_URL= http://xenbits.xensource.com/xen-extfiles/ipxe-git- 9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz". So the tarball file in this URL cannot be found. To wget the URL should always fail. I just change it use ipxe-git-v1.0.0.tar.gz which is an available file as before. And I know there is still a problem. If using ipxe tarball, we can''t add the patches in ''patches/series'' successfully after CS #24455 because that change set made these patches dedicated for ipxe.git upstream. I''m not familiar with the iPXE, so I have two questions? 1. Should we support both tarball and ipxe.git upstream in xen tools? 2. Are patches in ''patches/series'' important? If we support both and patches are import, we can prepare two kinds of patch-series. One is born for tarball, the other is for ipxe.git upstream. If these patches are not important, we can only do patching logic when we using ipxe upstream not tarball.> > > > > > > > Signed-off-by: Yongjie Ren <yongjie.ren@intel.com> > > > > ------ > > > > > > > > diff -r 4086e4811547 tools/firmware/etherboot/Makefile > > > > --- a/tools/firmware/etherboot/Makefile Thu Jan 05 17:25:23 2012 +0000 > > > > +++ b/tools/firmware/etherboot/Makefile Fri Jan 06 14:30:54 2012 +0800 > > > > @@ -12,7 +12,9 @@ > > > > > > > > IPXE_GIT_TAG := 9a93db3f0947484e30e753bbd61a10b17336e20e > > > > > > > > -IPXE_TARBALL_URL :> > $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz > > > > +IPXE_VERSION := v1.0.0 > > > > + > > > > +IPXE_TARBALL_URL :> > $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_VERSION).tar.gz > > > > > > > > D=ipxe > > > > T=ipxe.tar.gz > > > > > > > > Best Regards, > > > > Yongjie Ren (Jay) > > > > > > > > >
>>> On 06.01.12 at 16:28, "Ren, Yongjie" <yongjie.ren@intel.com> wrote: >> -----Original Message----- >> From: Ian Campbell [mailto:Ian.Campbell@citrix.com] >> Sent: Friday, January 06, 2012 4:46 PM >> To: Ren, Yongjie >> Cc: xen-devel@lists.xensource.com; Ian Jackson >> Subject: Re: [Xen-devel] [PATCH] tools: fix ipxe version issue in Makefile >> >> On Fri, 2012-01-06 at 07:44 +0000, Ren, Yongjie wrote: >> > Hi All, >> > >> > The ipxe git commit version changed, but its release version should >> > still stay at v1.0.0 >> >> Doesn''t this effectively undo the change in 24455:94180a5a0c7c since the >> $T rules first tries to wget $(IPXE_TARBALL_URL) before cloning the git >> tree? Therefore with this change it is going to find and clone v1.0 >> instead of using the git tag. >> > No, I don''t want to undo the change in CS #24455. > I just want to fix an obvious issue. Before my patch, we''ll get > "IPXE_TARBALL_URL= http://xenbits.xensource.com/xen-extfiles/ipxe-git- > 9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz". So the tarball file in this > URL cannot be found. To wget the URL should always fail. I just change it use > ipxe-git-v1.0.0.tar.gz which is an available file as before.But that would get you the unfixed version, and purpose of the change really was to get a fixed (albeit unreleased) version of ipxe into Xen. If anything, a tarball with the new name should be made available at xenbits. Jan> And I know there is still a problem. If using ipxe tarball, we can''t add the > patches in ''patches/series'' successfully after CS #24455 because that change > set made these patches dedicated for ipxe.git upstream. > I''m not familiar with the iPXE, so I have two questions? > 1. Should we support both tarball and ipxe.git upstream in xen tools? > 2. Are patches in ''patches/series'' important? > If we support both and patches are import, we can prepare two kinds of > patch-series. One is born for tarball, the other is for ipxe.git upstream. > If these patches are not important, we can only do patching logic when we > using ipxe upstream not tarball.