Bruce Edge
2010-Jul-28 17:28 UTC
[Xen-devel] Request integration of unstable changes into testing to enable gdbsx.
Ian, These changes have been in unstable for a while now I was hoping that they could be pulled into the testing branch. I think these are all the changes needed to enable gdbsx in the default build. Tools/Makefile: 21752 (29e545151078) tools/debugger/gdbsx: build enabled by default 21788 (8429a8a23241) tools/debugger/gdbsx: enabled by only x86 21830 (6279786d48f2) gdbsx: Implement missing Makefile rules. tools/debugger/gdbsx 20319 (de04fe4e472c) gdbsx: a gdbserver stub for xen. 20333 (24dd0e4261a8) gdbsx: malloc extra bye for null char 21806 (bb3b28cb7208) gdbsx: update README and remove space in q packet #ifdef XEN_GDBSX_CONFIG changes 21702 (2846fd19945c) gdbsx: Always build -- remove build-time config option. Note, I have not tested a actual build with these changes. I''m new at hg and haven''t figured out how to pull changes from another branch into my workspace. I know this is not the place for it, but if someone could give me a hint, I''ll verify that the above works. Thanks -Bruce _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jul-29 15:33 UTC
Re: [Xen-devel] Request integration of unstable changes into testing to enable gdbsx.
Bruce Edge writes ("[Xen-devel] Request integration of unstable changes
into testing to enable gdbsx."):> These changes have been in unstable for a while now I was hoping that they
> could be pulled into the testing branch.
> I think these are all the changes needed to enable gdbsx in the default
> build.
>
> [list of patches]
...> Note, I have not tested a actual build with these changes. I''m new
at hg and
> haven''t figured out how to pull changes from another branch into
my
> workspace.
The way I would do it is like this:
cd xen-4.0-testing.hg
(cd ../xen-unstable.hg && hg export -r 29e545151078) | patch -Up1
> I know this is not the place for it, but if someone could give me a hint,
> I''ll verify that the above works.
That would be great. If it doesn''t break the build then I would be
happy to have these changes in 4.0-testing.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Bruce Edge
2010-Jul-29 17:01 UTC
Re: [Xen-devel] Request integration of unstable changes into testing to enable gdbsx.
On Thu, Jul 29, 2010 at 8:33 AM, Ian Jackson <Ian.Jackson@eu.citrix.com>wrote:> Bruce Edge writes ("[Xen-devel] Request integration of unstable changes > into testing to enable gdbsx."): > > These changes have been in unstable for a while now I was hoping that > they > > could be pulled into the testing branch. > > I think these are all the changes needed to enable gdbsx in the default > > build. > > > > [list of patches] > ... > > Note, I have not tested a actual build with these changes. I''m new at hg > and > > haven''t figured out how to pull changes from another branch into my > > workspace. > > The way I would do it is like this: > cd xen-4.0-testing.hg > (cd ../xen-unstable.hg && hg export -r 29e545151078) | patch -Up1 >My hg has no -r opt. Is this an extension? I assume I can apply them one at a time instead?> > > I know this is not the place for it, but if someone could give me a hint, > > I''ll verify that the above works. > > That would be great. If it doesn''t break the build then I would be > happy to have these changes in 4.0-testing. > >29e545151078 doesn''t apply cleanly, there are other changes in xen-4.0-testing.hg/tools/Makefile. I can easily fix the patch rejects, but how does one resubmit these to hg? Again, sorry, this is not an hg support forum, I know. If someone could direct me to the applicable docs I''d be happy to rtfm. (there''s just a _lot_ of info on hg) -Bruce> Ian. >_______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2010-Jul-29 17:34 UTC
Re: [Xen-devel] Request integration of unstable changes into testing to enable gdbsx.
Bruce Edge writes ("Re: [Xen-devel] Request integration of unstable changes
into testing to enable gdbsx."):> On Thu, Jul 29, 2010 at 8:33 AM, Ian Jackson
<Ian.Jackson@eu.citrix.com<mailto:Ian.Jackson@eu.citrix.com>> wrote:
> > The way I would do it is like this:
> > cd xen-4.0-testing.hg
> > (cd ../xen-unstable.hg && hg export -r 29e545151078) | patch
-Up1
>
> My hg has no -r opt. Is this an extension?
I misremembered the syntax; mine doesn''t either. I meant:
cd xen-4.0-testing.hg
(cd ../xen-unstable.hg && hg export 29e545151078) | patch -Up1
> I assume I can apply them one at a time instead?
The rune above applies one patch at a time. You run it once for each
patch, and then do your build test. If they don''t apply cleanly
you''ll need to do something more complicated as we''d
appreciate a
ready, rebased, patch series to test and apply.
> 29e545151078 doesn''t apply cleanly, there are other changes in
xen-4.0-testing.hg/tools/Makefile.
Urgh.
> I can easily fix the patch rejects, but how does one resubmit these to hg?
When it gets like this, I use git. I juse "hg-fast-export.sh" to
convert xen-unstable.hg to xen-unstable.git and then do my work with
git.
> Again, sorry, this is not an hg support forum, I know.
That''s OK. Perhaps someone else has a better answer.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel