From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6795190720334397440 X-Received: by 2002:a05:651c:120d:: with SMTP id i13mr16308428lja.173.1582129263492; Wed, 19 Feb 2020 08:21:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:518f:: with SMTP id u15ls2468355lfi.3.gmail; Wed, 19 Feb 2020 08:21:02 -0800 (PST) X-Google-Smtp-Source: APXvYqwdOUemQrs2OGYJHv/IcTMSvqSQarMKH/4IinT3HesWGCmdCGM9uKO4BAilBRGGFEzscFzi X-Received: by 2002:ac2:5596:: with SMTP id v22mr13887055lfg.200.1582129262725; Wed, 19 Feb 2020 08:21:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582129262; cv=none; d=google.com; s=arc-20160816; b=O4raALaSKdgzq96yx8yTw6+XCEWWdmyNmEmdfm7+QabBo2YnnYYjBL4JrccEg/P1CO mr0xh9EwhHqOHx+3Me2Cx0zp7y7soYmigo+DGoNT2VW4VKy1hMTMyiXll5DQkKm1Nk6Z uHitHkATCT7r37yIzx1wwuYzNIPces7PSAOkRWcXeA/J8F2fhKml7KwCS11ur6OenzeF Q/+HbbB1BiSwQFtH02Le2Mhp2N3lbnacYZztDnXY/CvbeR28gO3BBwYEWH8+z/1cF+Lp Ur+tjAE3JtBxkFm+RTpcqglXN/adt6cDHgOnay1wglgU8Z+1+tv5wX+XW4AnIgLUmJ2y goEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=TdkMymooESob0TPIEFKc8iACzIVebIDu1jb7otkn2wY=; b=OpaWQxcwqT5Wc5M5VDkH/E8icZH5iBUk5YVeq9mqC3WwTS5sVY3QdD2Xi2gLbu2OVa Lr0CrXf988eA2TFnFbW3ecZ45BjgOoRRGA3gcn0r/aLjlNr604dDqMq61jrvaaShCZKJ DOlI8MH+asAEhQ8L3DwJzLgf5YVGJqWvrs62GvhJSaoyBDZJt2e/H5xAJzWJJGWHdkpw SCWP+CjfUOuNJb1mRD8awnZv0/N/NJxHdgdFuAnDq4wshRycS71QUuJhQUay0H8nWHo5 aSkefQrqBMPWwEV8s48CSti53aEclCOcCOOWEr8NQIfSM2NN5ZHjFZpHxTd3JG4p8zKR tI4w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id e3si12760ljg.2.2020.02.19.08.21.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Feb 2020 08:21:02 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 01JGL18G023280 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 19 Feb 2020 17:21:01 +0100 Received: from [139.25.68.37] ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 01JGL1ma024066; Wed, 19 Feb 2020 17:21:01 +0100 Subject: Re: cannot patch upstream debian package To: "jlacvdr L." , isar-users References: From: Jan Kiszka Message-ID: <48c33b74-e85c-b6cd-81e1-e35aaa8c5625@siemens.com> Date: Wed, 19 Feb 2020 17:21:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: xh4bUvbbnt37 On 19.02.20 17:10, jlacvdr L. wrote: > > 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 ? > Yes. The trick (which we should probably share via meta-isar) is to do this: ... SRC_URI += "file://my.patch;apply=no" CHANGELOG_V = "${PV}+patch1" do_prepare_build() { deb_add_changelog cd ${S} quilt import ${WORKDIR}/*.patch quilt push -a } Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux