sed -i -e '[EMAIL PROTECTED] @&a/@' -e '[EMAIL PROTECTED] @&b/@' my-file.patch
David Kerr wrote: > Philip, > Other than manually editing the patch file, how can I do this > automatically? I am creating the patch file using "svn diff > >../../xxx.patch" in the asterisk-gui-yyyy directory. Is there a > parameter to svn diff? I can't find one and everywhere I look on the > web says us -p0. > > Thanks > David > > On Tue, Nov 4, 2008 at 12:25 AM, Philip Prindeville > <[EMAIL PROTECTED] > <mailto:[EMAIL PROTECTED]>> wrote: > > Try this: change the '---' file name by prefixing it with "a/", > and change the '+++' file name by prefixing with "b/" for the > entire patch. > > See if that works. > > Normally, the patch_kernel.sh tool (or whatever) uses -p1, which > means that the first component of the path gets chucked. > > -Philip > > > David Kerr wrote: > > Philip. > I tried this and it sort-of works. The patch is found and the > make file attempts to apply it. However I get the following > message... > > Applying asterisk-gui13497-v3.patch using plaintext: can't > find file to patch at input line 5 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |Index: config/trunks_voip.html > |=================================================================== > |--- config/trunks_voip.html (revision 4045) > |+++ config/trunks_voip.html (working copy) > -------------------------- > File to patch: > > If I type in the file to patch, in this case > "config/trunks_voip.html" then it works and continues (to fail > on the next file). I have the same problem if I try and > patch manually using the "patch" command, but the problem is > solved there by using the -p0 (zero) option flag. But the > asterisk-gui.mk <http://asterisk-gui.mk> > <http://asterisk-gui.mk> file in astlinux is not using the > standard system patch command, and didn't like it when I tried > to add -p0. > > Any suggestions? > > Thanks > David > > > On Mon, Oct 27, 2008 at 10:52 AM, David Kerr <[EMAIL PROTECTED] > <mailto:[EMAIL PROTECTED]> <mailto:[EMAIL PROTECTED] > <mailto:[EMAIL PROTECTED]>>> wrote: > > Philip, > Sorry I have not had a chance to test this out yet, I've been > busy with other things. Once I try it I'll let you know how > it works. > > Thanks for your help > > David > > > On Mon, Oct 20, 2008 at 3:35 PM, Philip Prindeville > <[EMAIL PROTECTED] > <mailto:[EMAIL PROTECTED]> > <mailto:[EMAIL PROTECTED] > <mailto:[EMAIL PROTECTED]>>> wrote: > > It's easiest if you download the patch by hand, and put it > into package/asterisk-gui/asterisk-guiXXX.patch where > XXX is > of your choosing. > > Otherwise... you can add the wget into the section > that begins: > > $(DL_DIR)/$(ASTERISK-GUI_SOURCE): > svn co -r $(ASTERISK-GUI_SVN_VER) > $(ASTERISK-GUI_SITE) > $(DL_DIR)/asterisk-gui-$(ASTERISK-GUI_VERSION) > (cd $(DL_DIR); tar czf $(ASTERISK-GUI_SOURCE) > asterisk-gui-$(ASTERISK-GUI_VERSION)) > ... right here ... > > > besides being simpler, the advantages of adding the patch > statically are: > > (1) you can build an image even if your network is down > (yup, > been there where I had to build and install a new > version to > get the network back up); > (2) you know for sure which version of the patch you > have (in > case it's subject to change); > > Let me know if that works for you. > > -Philip > > > > David Kerr wrote: > > I'm building my own astlinux 0.6 from the source. > During > the build process source code is downloaded from > various > svn systems. Now I am trying to figure out how to > apply a > patch to the source after the download but before the > compile/build process kicks in. Specifically I am > messing > around with the asterisk-gui. > > So I can see in the package .mk file where the svn > download takes place. But I am not sure how I would > modify > that make file to do a wget to pull a patch and > then run > the patch command to apply it. > > I'm sort-of hoping that this capability has been > designed > into the AstLinux build process and all I really > need is a > pointer to an example that I can copy? > > Any help appreciated. > > Thanks > David > > > > > > > > ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Astlinux-users mailing list Astlinux-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/astlinux-users Donations to support AstLinux are graciously accepted via PayPal to [EMAIL PROTECTED]
