Re: advice on a patch set
martin f krafft wrote: I am trying to package the swsusp2 kernel patch, which comes in hundred little files. My thought was to simply concat these files into one large patch for use with kpatches... however, this does not work because some files are created by early patches and later modified. Since kpatches first tests the patch with --dry-run, it will fail when the later patches do not find a file to patch. Have you considered just using Bernard's apply script that is included with the upstream swsusp package? I'm pretty sure it takes care of testing with --dry-run and backing out previous patches if one of them fails. Cameron. signature.asc Description: Digital signature
Re: advice on a patch set
also sprach Cameron Patrick [EMAIL PROTECTED] [2005.01.27.1045 +0100]: Have you considered just using Bernard's apply script that is included with the upstream swsusp package? I'm pretty sure it takes care of testing with --dry-run and backing out previous patches if one of them fails. Good idea, I will try this. Right now, my custom solution works. But you are right, stupid me not to have thought of this before... -- Please do not send copies of list mail to me; I read the list! .''`. martin f. krafft [EMAIL PROTECTED] : :' :proud Debian developer, admin, user, and author `. `'` `- Debian - when you have better things to do than fixing a system Invalid/expired PGP subkeys? Use subkeys.pgp.net as keyserver! signature.asc Description: Digital signature
Re: advice on a patch set
martin f krafft [EMAIL PROTECTED] writes: I am trying to package the swsusp2 kernel patch, which comes in hundred little files. My thought was to simply concat these files into one large patch for use with kpatches... however, this does not work because some files are created by early patches and later modified. Since kpatches first tests the patch with --dry-run, it will fail when the later patches do not find a file to patch. What can I do? Is there a tool that can merge multiple patches into a single patch in a recursive manner (i.e. to produce the smallest patch that has the same result)? Any reason you can't just make a copy of the unpatched source, apply all the patches, and then diff -urN the original with the patched version to create a fresh patch? Test by applying the newly created patch with the original to make sure that your patch and the original patch set produce the same result. -- Jay Berkenbilt [EMAIL PROTECTED] http://www.ql.org/q/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: advice on a patch set
Il giorno mer, 26-01-2005 alle 17:17 +0100, martin f krafft ha scritto: Hi all, I am trying to package the swsusp2 kernel patch, which comes in hundred little files. Hi Martin, why don't you apply all the patches to a clean kernel source tree, and then diff that source tree from the original one? -- Fabio Tranchitella http://www.kobold.it Studio Tranchitella Assoc. Professionale http://www.tranchitella.it _ 1024D/7F961564, fpr 5465 6E69 E559 6466 BF3D 9F01 2BF8 EE2B 7F96 1564 signature.asc Description: Questa parte del messaggio =?ISO-8859-1?Q?=E8?= firmata
Re: advice on a patch set
also sprach Jay Berkenbilt [EMAIL PROTECTED] [2005.01.26.1724 +0100]: Any reason you can't just make a copy of the unpatched source, apply all the patches, and then diff -urN the original with the patched version to create a fresh patch? Test by applying the newly created patch with the original to make sure that your patch and the original patch set produce the same result. also sprach Fabio Tranchitella [EMAIL PROTECTED] [2005.01.26.1730 +0100]: Hi Martin, why don't you apply all the patches to a clean kernel source tree, and then diff that source tree from the original one? Obviously this is an option. However, I would prefer to ship the original patch within the source package, rather than a patch I created specifically for Debian. Also, it's much less work in the future if I can just drop in new versions of the patch without having to go through the process of patching and diffing the kernel source. -- Please do not send copies of list mail to me; I read the list! .''`. martin f. krafft [EMAIL PROTECTED] : :' :proud Debian developer, admin, user, and author `. `'` `- Debian - when you have better things to do than fixing a system Invalid/expired PGP subkeys? Use subkeys.pgp.net as keyserver! signature.asc Description: Digital signature
Re: advice on a patch set
martin f krafft [EMAIL PROTECTED] writes: Hi all, I am trying to package the swsusp2 kernel patch, which comes in hundred little files. My thought was to simply concat these files into one large patch for use with kpatches... however, this does not work because some files are created by early patches and later modified. Since kpatches first tests the patch with --dry-run, it will fail when the later patches do not find a file to patch. What can I do? Is there a tool that can merge multiple patches into a single patch in a recursive manner (i.e. to produce the smallest patch that has the same result)? combinediff looks promising, but the approach I tried... 1 + 2 - A A + 3 - B B + 4 - C ... did not work (it can only merge pairs). Thanks for any help. Why not just put all the patches into /usr/src/kernel-patches/swsusp2 and apply them in order? Nothing wrong with having many files. MfG Goswin -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: advice on a patch set
also sprach Goswin von Brederlow [EMAIL PROTECTED] [2005.01.26.1754 +0100]: Why not just put all the patches into /usr/src/kernel-patches/swsusp2 and apply them in order? Because I like reusing wheels (as in: dh-kpatches) and it does not really allow multiple patches, surely not one hundred of them. Sure, I can make a custom kernel patch package without kpatches, but then I'd have to write apply and unapply scripts too. Why bother when kpatches does so already? -- Please do not send copies of list mail to me; I read the list! .''`. martin f. krafft [EMAIL PROTECTED] : :' :proud Debian developer, admin, user, and author `. `'` `- Debian - when you have better things to do than fixing a system Invalid/expired PGP subkeys? Use subkeys.pgp.net as keyserver! signature.asc Description: Digital signature
Re: advice on a patch set
martin f krafft [EMAIL PROTECTED] writes: also sprach Goswin von Brederlow [EMAIL PROTECTED] [2005.01.26.1754 +0100]: Why not just put all the patches into /usr/src/kernel-patches/swsusp2 and apply them in order? Because I like reusing wheels (as in: dh-kpatches) and it does not really allow multiple patches, surely not one hundred of them. Sure, I can make a custom kernel patch package without kpatches, but then I'd have to write apply and unapply scripts too. Why bother when kpatches does so already? Improve kpatches to cope with multiple patches. Just think of the hassle you have on updates when one of the hundred files change and you have to remake the full patchfile each time. It's a lot easier to follow if you have the original upstream sources to work with directly. MfG Goswin -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: advice on a patch set
also sprach Goswin von Brederlow [EMAIL PROTECTED] [2005.01.26.2054 +0100]: Improve kpatches to cope with multiple patches. Uh, yeah. When I get a free minute. Just think of the hassle you have on updates when one of the hundred files change and you have to remake the full patchfile each time. cat does so for me automatically as part of the package's build target. It's a lot easier to follow if you have the original upstream sources to work with directly. Right, which is what I am trying to do. -- Please do not send copies of list mail to me; I read the list! .''`. martin f. krafft [EMAIL PROTECTED] : :' :proud Debian developer, admin, user, and author `. `'` `- Debian - when you have better things to do than fixing a system Invalid/expired PGP subkeys? Use subkeys.pgp.net as keyserver! signature.asc Description: Digital signature
