From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 6795190720334397440
Date: Wed, 19 Feb 2020 08:30:11 -0800 (PST)
From: "jlacvdr L." <jlacvdr@gmail.com>
To: isar-users <isar-users@googlegroups.com>
Message-Id: <13eb2b0d-f61c-47ad-b2c0-39d5e75427dc@googlegroups.com>
In-Reply-To: <c4f35e14-4604-47d2-8303-12e40d3d52a9@googlegroups.com>
References: <c4f35e14-4604-47d2-8303-12e40d3d52a9@googlegroups.com>
Subject: Re: cannot patch upstream debian package
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_5376_1019214429.1582129811592"
X-Google-Token: EJPFtfIFidZgrfdaWnU0
X-Google-IP: 217.111.150.164
X-TUID: SRHAQMLkRv/q

------=_Part_5376_1019214429.1582129811592
Content-Type: multipart/alternative; 
	boundary="----=_Part_5377_856885812.1582129811592"

------=_Part_5377_856885812.1582129811592
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

thanks

it works fine

Le mercredi 19 f=C3=A9vrier 2020 17:10:29 UTC+1, jlacvdr L. a =C3=A9crit :
>
>
> Hi,
>
> I'm trying apply patch to an upstream debian package
>
> recipe looks like:
>
> inherit dpkg
>
> SRC_URI =3D "apt://${PN} \
> file://files/mypatch.patch \
> "
>
>
> during  do_dpkg_build, I've got the error:
>
>  dpkg-source -I --before-build nano-2.9.3
> dpkg-buildpackage: info: host architecture amd64
>  fakeroot debian/rules clean
> dh clean --parallel
>    dh_clean -O--parallel
>  dpkg-source -I -b nano-2.9.3
> dpkg-source: info: using source format '3.0 (quilt)'
> dpkg-source: info: building nano using existing ./nano_2.9.3.orig.tar.bz2
> dpkg-source: info: local changes detected, the modified files are:
>  nano-2.9.3/.applied_patches/.patch-commands
>  nano-2.9.3/.applied_patches/files/mypatch.patch
>  nano-2.9.3/src/utils.c
> dpkg-source: error: aborting due to unexpected upstream changes, see=20
> /tmp/nano_2.9.3-1.diff.rSd68A
> dpkg-source: info: you can integrate the local changes with dpkg-source=
=20
> --commit
> dpkg-buildpackage: error: dpkg-source -I -b nano-2.9.3 subprocess returne=
d=20
> exit status 2
> WARNING: exit code 2 from a shell command.
>
>
>
> How fix it ?=20
> Can you confirm that patching an upstream package is supported ?
>
> Regards,
>
>
>
>
>
------=_Part_5377_856885812.1582129811592
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">thanks<div><br></div><div>it works fine</div><br>Le mercre=
di 19 f=C3=A9vrier 2020 17:10:29 UTC+1, jlacvdr L. a =C3=A9crit=C2=A0:<bloc=
kquote class=3D"gmail_quote" style=3D"margin: 0;margin-left: 0.8ex;border-l=
eft: 1px #ccc solid;padding-left: 1ex;"><div dir=3D"ltr"><div><div><br></di=
v><div>Hi,</div><div><br></div><div>I&#39;m trying apply patch to an upstre=
am debian package</div><div><br></div><div>recipe looks like:</div><div><br=
></div></div><blockquote style=3D"margin:0 0 0 40px;border:none;padding:0px=
"><div><div><font face=3D"arial, sans-serif">inherit dpkg</font></div></div=
><div><div><font face=3D"arial, sans-serif"><br></font></div></div><div><di=
v><font face=3D"arial, sans-serif">SRC_URI =3D &quot;apt://${PN} \</font></=
div></div><div><div><font face=3D"arial, sans-serif"><span style=3D"white-s=
pace:pre">=09</span>file://files/mypatch.patch \</font></div></div><div><di=
v><font face=3D"arial, sans-serif"><span style=3D"white-space:pre">=09</spa=
n>&quot;</font></div></div></blockquote><div><div><br></div><div>during=C2=
=A0 do_dpkg_build, I&#39;ve got the error:</div><div><br></div></div><block=
quote style=3D"margin:0 0 0 40px;border:none;padding:0px"><div><div>=C2=A0d=
pkg-source -I --before-build nano-2.9.3</div></div><div><div>dpkg-buildpack=
age: info: host architecture amd64</div></div><div><div>=C2=A0fakeroot debi=
an/rules clean</div></div><div><div>dh clean --parallel</div></div><div><di=
v>=C2=A0 =C2=A0dh_clean -O--parallel</div></div><div><div>=C2=A0dpkg-source=
 -I -b nano-2.9.3</div></div><div><div>dpkg-source: info: using source form=
at &#39;3.0 (quilt)&#39;</div></div><div><div>dpkg-source: info: building n=
ano using existing ./nano_2.9.3.orig.tar.bz2</div></div><div><div>dpkg-sour=
ce: info: local changes detected, the modified files are:</div></div><div><=
div>=C2=A0nano-2.9.3/.applied_patches/.<wbr>patch-commands</div></div><div>=
<div>=C2=A0nano-2.9.3/.applied_patches/<wbr>files/mypatch.patch</div></div>=
<div><div>=C2=A0nano-2.9.3/src/utils.c</div></div><div><div>dpkg-source: er=
ror: aborting due to unexpected upstream changes, see /tmp/nano_2.9.3-1.dif=
f.rSd68A</div></div><div><div>dpkg-source: info: you can integrate the loca=
l changes with dpkg-source --commit</div></div><div><div>dpkg-buildpackage:=
 error: dpkg-source -I -b nano-2.9.3 subprocess returned exit status 2</div=
></div><div><div>WARNING: exit code 2 from a shell command.</div></div></bl=
ockquote><div><br></div><div><br></div><div>How fix it ?=C2=A0</div><div>Ca=
n you confirm that patching an upstream package is supported ?</div><div><b=
r></div><div>Regards,</div><div><br></div><div><br></div><div><br></div><di=
v><br></div></div></blockquote></div>
------=_Part_5377_856885812.1582129811592--

------=_Part_5376_1019214429.1582129811592--