ports/188711: sysutils/hal: ===> Applying FreeBSD patches for hal-0.5.14_24 File to patch: NO FILE
Christopher Kenna
cjkenna at gmail.com
Thu Apr 17 05:50:02 UTC 2014
The following reply was made to PR ports/188711; it has been noted by GNATS.
From: Christopher Kenna <cjkenna at gmail.com>
To: bug-followup <bug-followup at freebsd.org>, ohartman <ohartman at zedat.fu-berlin.de>
Cc:
Subject: Re: ports/188711: sysutils/hal: ===> Applying FreeBSD patches for
hal-0.5.14_24 File to patch: NO FILE
Date: Wed, 16 Apr 2014 22:44:44 -0700
--001a1133e4caf1c93f04f736887a
Content-Type: text/plain; charset=UTF-8
I dug into this further and realized that the problem is that the submitted
patch file in [1] is actually the patch file for the FreeBSD patch file (a
meta-patchfile?). If you apply the new, bad patch file to the old patch
file [2], then the port will build!
The correct patch file can be generated using the above method.
[1]
http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?sortby=date&r1=351423&r2=351422&pathrev=351423
[2]
http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?revision=351422&view=markup&sortby=date&pathrev=351423
On Wed, Apr 16, 2014 at 10:23 PM, Christopher Kenna <cjkenna at gmail.com>wrote:
> I dug into this more. The problem is that change 351423 has a bad patch.
>
> Change:
> http://svnweb.freebsd.org/ports?view=revision&sortby=date&revision=351423
>
> Bad patch introduced:
>
> http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?sortby=date&r1=351423&r2=351422&pathrev=351423
>
> ===> Patching for hal-0.5.14_24
>
> ===> Applying FreeBSD patches for hal-0.5.14_24
>
> File to patch: ^C
>
> root at localhost:/usr/ports/sysutils/hal # => Patch patch-hald_hf-storage.c
> failed to apply cleanly.
>
> => Patch(es) patch-Makefile.in patch-doc_Makefile.in
> patch-fdi_policy_10osvendor_10-power-mgmt-policy.fdi
> patch-fdi_policy_10osvendor_10-x11-input.fdi patch-hald-runner_runner.c
> patch-hald_freebsd_Makefile.in patch-hald_freebsd_addons_addon-storage.c
> patch-hald_freebsd_hf-devd.c patch-hald_freebsd_hf-devtree.c
> patch-hald_freebsd_hf-drm.c patch-hald_freebsd_hf-memcard.c
> patch-hald_freebsd_hf-memcard.h patch-hald_freebsd_hf-scsi.c
> patch-hald_freebsd_hf-usb.c patch-hald_freebsd_hf-usb2.c
> patch-hald_freebsd_hf-volume.c patch-hald_freebsd_probe-usb2-device.c
> patch-hald_freebsd_probing_Makefile.am
> patch-hald_freebsd_probing_Makefile.in
> patch-hald_freebsd_probing_probe-storage.c
> patch-hald_freebsd_probing_probe-usb2-interface.c
> patch-hald_freebsd_probing_probe-video4linux.c
> patch-hald_freebsd_probing_probe-volume.c applied cleanly.
>
--001a1133e4caf1c93f04f736887a
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr">I dug into this further and realized that the problem is t=
hat the submitted patch file in [1] is actually the patch file for the Free=
BSD patch file (a meta-patchfile?). If you apply the new, bad patch file to=
the old patch file [2], then the port will build!<div>
<br></div><div>The correct patch file can be generated using the above meth=
od.<br><div><br></div><div>[1]=C2=A0<a href=3D"http://svnweb.freebsd.org/po=
rts/head/sysutils/hal/files/patch-hald_hf-storage.c?sortby=3Ddate&r1=3D=
351423&r2=3D351422&pathrev=3D351423">http://svnweb.freebsd.org/port=
s/head/sysutils/hal/files/patch-hald_hf-storage.c?sortby=3Ddate&r1=3D35=
1423&r2=3D351422&pathrev=3D351423</a></div>
<div>[2]=C2=A0<a href=3D"http://svnweb.freebsd.org/ports/head/sysutils/hal/=
files/patch-hald_hf-storage.c?revision=3D351422&view=3Dmarkup&sortb=
y=3Ddate&pathrev=3D351423">http://svnweb.freebsd.org/ports/head/sysutil=
s/hal/files/patch-hald_hf-storage.c?revision=3D351422&view=3Dmarkup&=
;sortby=3Ddate&pathrev=3D351423</a></div>
</div></div><div class=3D"gmail_extra"><br><br><div class=3D"gmail_quote">O=
n Wed, Apr 16, 2014 at 10:23 PM, Christopher Kenna <span dir=3D"ltr"><<a=
href=3D"mailto:cjkenna at gmail.com" target=3D"_blank">cjkenna at gmail.com</a>&=
gt;</span> wrote:<br>
<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
x #ccc solid;padding-left:1ex"><div dir=3D"ltr">I dug into this more. The p=
roblem is that change=C2=A0351423 has a bad patch.<div><br></div><div>Chang=
e:</div>
<div><a href=3D"http://svnweb.freebsd.org/ports?view=3Drevision&sortby=
=3Ddate&revision=3D351423" target=3D"_blank">http://svnweb.freebsd.org/=
ports?view=3Drevision&sortby=3Ddate&revision=3D351423</a><br>
</div><div><br></div><div>Bad patch introduced:</div><div><a href=3D"http:/=
/svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-hald_hf-storage.c?s=
ortby=3Ddate&r1=3D351423&r2=3D351422&pathrev=3D351423" target=
=3D"_blank">http://svnweb.freebsd.org/ports/head/sysutils/hal/files/patch-h=
ald_hf-storage.c?sortby=3Ddate&r1=3D351423&r2=3D351422&pathrev=
=3D351423</a><br>
</div><div><br></div><div>
<p>=3D=3D=3D>=C2=A0 Patching for hal-0.5.14_24</p>
<p>=3D=3D=3D>=C2=A0 Applying FreeBSD patches for hal-0.5.14_24</p>
<p>File to patch: ^C</p>
<p>root at localhost:/usr/ports/sysutils/hal # =3D> Patch patch-hald_hf-sto=
rage.c failed to apply cleanly.</p>
<p>=3D> Patch(es) patch-Makefile.in patch-doc_Makefile.in patch-fdi_poli=
cy_10osvendor_10-power-mgmt-policy.fdi patch-fdi_policy_10osvendor_10-x11-i=
nput.fdi patch-hald-runner_runner.c patch-hald_freebsd_Makefile.in patch-ha=
ld_freebsd_addons_addon-storage.c patch-hald_freebsd_hf-devd.c patch-hald_f=
reebsd_hf-devtree.c patch-hald_freebsd_hf-drm.c patch-hald_freebsd_hf-memca=
rd.c patch-hald_freebsd_hf-memcard.h patch-hald_freebsd_hf-scsi.c patch-hal=
d_freebsd_hf-usb.c patch-hald_freebsd_hf-usb2.c patch-hald_freebsd_hf-volum=
e.c patch-hald_freebsd_probe-usb2-device.c patch-hald_freebsd_probing_Makef=
ile.am patch-hald_freebsd_probing_Makefile.in patch-hald_freebsd_probing_pr=
obe-storage.c patch-hald_freebsd_probing_probe-usb2-interface.c patch-hald_=
freebsd_probing_probe-video4linux.c patch-hald_freebsd_probing_probe-volume=
.c applied cleanly.</p>
</div></div>
</blockquote></div><br></div>
--001a1133e4caf1c93f04f736887a--
More information about the freebsd-gnome
mailing list