From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 6795190720334397440
Date: Wed, 19 Feb 2020 08:10:29 -0800 (PST)
From: "jlacvdr L." <jlacvdr@gmail.com>
To: isar-users <isar-users@googlegroups.com>
Message-Id: <c4f35e14-4604-47d2-8303-12e40d3d52a9@googlegroups.com>
Subject: cannot patch upstream debian package
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_5412_1402367814.1582128629017"
X-Google-Token: EPW7tfIFsDcN1DwjOm80
X-Google-IP: 217.111.150.164
X-TUID: JTdRP5+xp7wQ

------=_Part_5412_1402367814.1582128629017
Content-Type: multipart/alternative; 
	boundary="----=_Part_5413_1119666840.1582128629017"

------=_Part_5413_1119666840.1582128629017
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit


Hi,

I'm trying apply patch to an upstream debian package

recipe looks like:

inherit dpkg

SRC_URI = "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 
/tmp/nano_2.9.3-1.diff.rSd68A
dpkg-source: info: you can integrate the local changes with dpkg-source 
--commit
dpkg-buildpackage: error: dpkg-source -I -b nano-2.9.3 subprocess returned 
exit status 2
WARNING: exit code 2 from a shell command.



How fix it ? 
Can you confirm that patching an upstream package is supported ?

Regards,





------=_Part_5413_1119666840.1582128629017
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div><div><br></div><div>Hi,</div><div><br></div><div>I&#3=
9;m trying apply patch to an upstream debian package</div><div><br></div><d=
iv>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, s=
ans-serif">inherit dpkg</font></div></div><div><div><font face=3D"arial, sa=
ns-serif"><br></font></div></div><div><div><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-space:pre">=09</span>file://files/m=
ypatch.patch \</font></div></div><div><div><font face=3D"arial, sans-serif"=
><span style=3D"white-space: pre;">=09</span>&quot;</font></div></div></blo=
ckquote><div><div><br></div><div>during=C2=A0 do_dpkg_build, I&#39;ve got t=
he error:</div><div><br></div></div><blockquote style=3D"margin: 0 0 0 40px=
; border: none; padding: 0px;"><div><div>=C2=A0dpkg-source -I --before-buil=
d nano-2.9.3</div></div><div><div>dpkg-buildpackage: info: host architectur=
e amd64</div></div><div><div>=C2=A0fakeroot debian/rules clean</div></div><=
div><div>dh clean --parallel</div></div><div><div>=C2=A0 =C2=A0dh_clean -O-=
-parallel</div></div><div><div>=C2=A0dpkg-source -I -b nano-2.9.3</div></di=
v><div><div>dpkg-source: info: using source format &#39;3.0 (quilt)&#39;</d=
iv></div><div><div>dpkg-source: info: building nano using existing ./nano_2=
.9.3.orig.tar.bz2</div></div><div><div>dpkg-source: info: local changes det=
ected, the modified files are:</div></div><div><div>=C2=A0nano-2.9.3/.appli=
ed_patches/.patch-commands</div></div><div><div>=C2=A0nano-2.9.3/.applied_p=
atches/files/mypatch.patch</div></div><div><div>=C2=A0nano-2.9.3/src/utils.=
c</div></div><div><div>dpkg-source: error: aborting due to unexpected upstr=
eam changes, see /tmp/nano_2.9.3-1.diff.rSd68A</div></div><div><div>dpkg-so=
urce: info: you can integrate the local 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></blockquote><div><br></div><div><br></di=
v><div>How fix it ?=C2=A0</div><div>Can you confirm that patching an upstre=
am package is supported ?</div><div><br></div><div>Regards,</div><div><br><=
/div><div><br></div><div><br></div><div><br></div></div>
------=_Part_5413_1119666840.1582128629017--

------=_Part_5412_1402367814.1582128629017--