| Message ID | 1465556565-26403-1-git-send-email-ross.lagerwall@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 10, 2016 at 12:02 PM, Ross Lagerwall <ross.lagerwall@citrix.com> wrote: > When testing and applying patches, set fuzz=0 so that patches must apply > exactly. Also set "-f" to avoid interactive questions, and reorder so > that patches are tested before the output directory is created. > > Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> > --- > livepatch-build | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/livepatch-build b/livepatch-build I take it this is in the "livepatch" repo, not the core Xen repo? I think unless / until livepatch has its own mailing list, all patches sent to xen-devel to the livepatch should be prefixed with "livepatch:", so that people can filter them properly. I realize this is a bit annoying as then when doing "git log" inside of livepatch.git, you see "livepatch:" at the beginning of every line; but I think it's worth it. That's what raisin does, FWIW. -George
On 13/06/16 11:08, George Dunlap wrote: > On Fri, Jun 10, 2016 at 12:02 PM, Ross Lagerwall > <ross.lagerwall@citrix.com> wrote: >> When testing and applying patches, set fuzz=0 so that patches must apply >> exactly. Also set "-f" to avoid interactive questions, and reorder so >> that patches are tested before the output directory is created. >> >> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> >> --- >> livepatch-build | 11 +++++------ >> 1 file changed, 5 insertions(+), 6 deletions(-) >> >> diff --git a/livepatch-build b/livepatch-build > I take it this is in the "livepatch" repo, not the core Xen repo? > > I think unless / until livepatch has its own mailing list, all patches > sent to xen-devel to the livepatch should be prefixed with > "livepatch:", so that people can filter them properly. I realize > this is a bit annoying as then when doing "git log" inside of > livepatch.git, you see "livepatch:" at the beginning of every line; > but I think it's worth it. That's what raisin does, FWIW. An alternative is to use git format-patch --subject-prefix="PATCH livepatch" This puts livepatch into the email subjects, but gets stripped when applying the patch. I personally go out of my way to avoid things like "livepatch: " prefixes getting committed into the repo. ~Andrew
On 06/13/2016 11:08 AM, George Dunlap wrote: > On Fri, Jun 10, 2016 at 12:02 PM, Ross Lagerwall > <ross.lagerwall@citrix.com> wrote: >> When testing and applying patches, set fuzz=0 so that patches must apply >> exactly. Also set "-f" to avoid interactive questions, and reorder so >> that patches are tested before the output directory is created. >> >> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> >> --- >> livepatch-build | 11 +++++------ >> 1 file changed, 5 insertions(+), 6 deletions(-) >> >> diff --git a/livepatch-build b/livepatch-build > > I take it this is in the "livepatch" repo, not the core Xen repo? > > I think unless / until livepatch has its own mailing list, all patches > sent to xen-devel to the livepatch should be prefixed with > "livepatch:", so that people can filter them properly. I realize > this is a bit annoying as then when doing "git log" inside of > livepatch.git, you see "livepatch:" at the beginning of every line; > but I think it's worth it. That's what raisin does, FWIW. > OK sure, I can do that. I'll take Andrew's suggestion and use a subject prefix. Thanks,
On Mon, Jun 13, 2016 at 11:16 AM, Andrew Cooper <andrew.cooper3@citrix.com> wrote: > On 13/06/16 11:08, George Dunlap wrote: >> On Fri, Jun 10, 2016 at 12:02 PM, Ross Lagerwall >> <ross.lagerwall@citrix.com> wrote: >>> When testing and applying patches, set fuzz=0 so that patches must apply >>> exactly. Also set "-f" to avoid interactive questions, and reorder so >>> that patches are tested before the output directory is created. >>> >>> Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> >>> --- >>> livepatch-build | 11 +++++------ >>> 1 file changed, 5 insertions(+), 6 deletions(-) >>> >>> diff --git a/livepatch-build b/livepatch-build >> I take it this is in the "livepatch" repo, not the core Xen repo? >> >> I think unless / until livepatch has its own mailing list, all patches >> sent to xen-devel to the livepatch should be prefixed with >> "livepatch:", so that people can filter them properly. I realize >> this is a bit annoying as then when doing "git log" inside of >> livepatch.git, you see "livepatch:" at the beginning of every line; >> but I think it's worth it. That's what raisin does, FWIW. > > An alternative is to use git format-patch --subject-prefix="PATCH livepatch" > > This puts livepatch into the email subjects, but gets stripped when > applying the patch. Yes, this is a better idea, thanks. -George
On Fri, Jun 10, 2016 at 12:02:43PM +0100, Ross Lagerwall wrote: > When testing and applying patches, set fuzz=0 so that patches must apply > exactly. Also set "-f" to avoid interactive questions, and reorder so > that patches are tested before the output directory is created. > > Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > --- > livepatch-build | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/livepatch-build b/livepatch-build > index a49e0d4..8dc8889 100755 > --- a/livepatch-build > +++ b/livepatch-build > @@ -257,23 +257,22 @@ echo > > if [ "${SKIP}" != "build" ]; then > [ -e "${OUTPUT}" ] && die "Output directory exists" > - mkdir -p "${OUTPUT}" || die > - > - echo "Testing patch file..." > cd "$SRCDIR" || die > - patch -s -N -p1 --dry-run < "$PATCHFILE" || die "source patch file failed to apply" > + patch -s -N -p1 -f --fuzz=0 --dry-run < "$PATCHFILE" || die "Source patch file failed to apply" > + > + mkdir -p "${OUTPUT}" || die > > echo "Perform full initial build with ${CPUS} CPU(s)..." > build_full > > echo "Apply patch and build with ${CPUS} CPU(s)..." > cd "$SRCDIR" || die > - patch -s -N -p1 < "$PATCHFILE" || die > + patch -s -N -p1 -f --fuzz=0 < "$PATCHFILE" || die > build_special patched > > echo "Unapply patch and build with ${CPUS} CPU(s)..." > cd "$SRCDIR" || die > - patch -s -R -p1 < "$PATCHFILE" || die > + patch -s -R -p1 -f --fuzz=0 < "$PATCHFILE" || die > build_special original > fi > > -- > 2.4.11 >
diff --git a/livepatch-build b/livepatch-build index a49e0d4..8dc8889 100755 --- a/livepatch-build +++ b/livepatch-build @@ -257,23 +257,22 @@ echo if [ "${SKIP}" != "build" ]; then [ -e "${OUTPUT}" ] && die "Output directory exists" - mkdir -p "${OUTPUT}" || die - - echo "Testing patch file..." cd "$SRCDIR" || die - patch -s -N -p1 --dry-run < "$PATCHFILE" || die "source patch file failed to apply" + patch -s -N -p1 -f --fuzz=0 --dry-run < "$PATCHFILE" || die "Source patch file failed to apply" + + mkdir -p "${OUTPUT}" || die echo "Perform full initial build with ${CPUS} CPU(s)..." build_full echo "Apply patch and build with ${CPUS} CPU(s)..." cd "$SRCDIR" || die - patch -s -N -p1 < "$PATCHFILE" || die + patch -s -N -p1 -f --fuzz=0 < "$PATCHFILE" || die build_special patched echo "Unapply patch and build with ${CPUS} CPU(s)..." cd "$SRCDIR" || die - patch -s -R -p1 < "$PATCHFILE" || die + patch -s -R -p1 -f --fuzz=0 < "$PATCHFILE" || die build_special original fi
When testing and applying patches, set fuzz=0 so that patches must apply exactly. Also set "-f" to avoid interactive questions, and reorder so that patches are tested before the output directory is created. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> --- livepatch-build | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)