From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a1c:2984:: with SMTP id p126mr28875300wmp.58.1628705698649; Wed, 11 Aug 2021 11:14:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6251:: with SMTP id m17ls1857935wrv.1.gmail; Wed, 11 Aug 2021 11:14:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHSTLcYndq0FJvRL6PYXdzipVMgje1ELzY5mdQmakyTqG4DrhbySLvZ6X8lsvcBZwjlQOT X-Received: by 2002:adf:de83:: with SMTP id w3mr20262052wrl.342.1628705697521; Wed, 11 Aug 2021 11:14:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628705697; cv=none; d=google.com; s=arc-20160816; b=hGYA8P/KN9beMJsO8BXxHL6Xldp2MpLdg5LXGTQ4zAOrXaz07znL6VbXcR2xSlWdTm hXkpJ96EL0YCDZEgDVrSw7D4n1Kyc5ViEd/u+cRbZpA5rxjXL3k3EAzJ48QEwFv6qgVY QXhq0jJxgZtcbTbJb0hX8q3cig0yaDiqXsO+WEXbXIu1UCGlKEUAMT87ZLpAzQJuunj4 JtyS4I1kX8GRIrgaqvR42nURwhjmxYYevJ9Gf6TNT4cn4HPqqM89caDIHU5APiJZd4Ai IKW1y1Ex0pCWnMUluJ+eCV/bOAkyUrca/KbPmn2U6crvBlGtW9uNxHbReI6E6AyAE0oK 4otA== 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:references:to:from:subject; bh=9TsBFjwQNRmK6YwnftO8RL42EAoyMdSk9D787p23Wwg=; b=rkbIKx7vUdMPVnHhKlS8f/rLaKyXfBnEOTGiFRFIGvDqi5SDP1+ykopB4Hr8obAhZX NhNNlU6mQxaH7Fpr+JXnUMq1fITggv1pJ6vRlDGk69G0T75/kjieRj1RAH7SnAraENDM xw8ddiPOOhdAr87IRcRkqt+TUnbx22WC9w+mbe91wo+red7ZAFO8w6ZeiS46gDuxUtYC FX0hXtMEzJPd+Uj0FSU8+41r0adPwOTaQblMMdn8V+DeBPdCABmp9BketImzA2mYQhms 9aWeyNdVVKv85r5ih+cPJ4+HKL3jEE/kTq9SPWBx4rVPmcFVoV8Sln43u8opvL6NDSDw GELg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id s12si371177wmh.3.2021.08.11.11.14.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Aug 2021 11:14:57 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17BIEvMC005246 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Aug 2021 20:14:57 +0200 Received: from [167.87.241.87] ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17BIEuib000689; Wed, 11 Aug 2021 20:14:56 +0200 Subject: Re: [PATCH 3/3] dpkg-gbp: default to "git" patching From: Jan Kiszka To: "[ext] Henning Schild" , isar-users References: <20210122084241.10573-1-henning.schild@siemens.com> <20210122084241.10573-4-henning.schild@siemens.com> <37fed018-d270-a314-99ac-53c05db8323b@siemens.com> Message-ID: <0d573291-8590-ebf0-5de1-8714efcd49e5@siemens.com> Date: Wed, 11 Aug 2021 20:14:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <37fed018-d270-a314-99ac-53c05db8323b@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: gDUBw3VX1uQp On 22.01.21 11:55, [ext] Jan Kiszka wrote: > On 22.01.21 09:42, [ext] Henning Schild wrote: >> From: Henning Schild >> >> That class is about packages coming from git, so that is the natural >> choice for the patching tool. >> >> Signed-off-by: Henning Schild >> --- >> RECIPE-API-CHANGELOG.md | 5 +++++ >> meta-isar/recipes-app/cowsay/cowsay_git.bb | 1 - >> meta/classes/dpkg-gbp.bbclass | 2 ++ >> 3 files changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md >> index cc45f3f66e..c4ec5894a8 100644 >> --- a/RECIPE-API-CHANGELOG.md >> +++ b/RECIPE-API-CHANGELOG.md >> @@ -282,3 +282,8 @@ like /boot/efi to avoid such issues. >> ### Deprecate BUILD_DEPENDS in u-boot-custom.inc >> >> Use DEBIAN_BUILD_DEPENDS instead, to align with deb_debianize. >> + >> +### Default to PATCHTOOL ?= "git" for dpkg-gbp >> + >> +Migrate your patches so they can be applied with "git am", or >> +"unset PATCHTOOL" to get old behaviour. >> diff --git a/meta-isar/recipes-app/cowsay/cowsay_git.bb b/meta-isar/recipes-app/cowsay/cowsay_git.bb >> index 2e885a8aa3..c3a1f4942a 100644 >> --- a/meta-isar/recipes-app/cowsay/cowsay_git.bb >> +++ b/meta-isar/recipes-app/cowsay/cowsay_git.bb >> @@ -5,7 +5,6 @@ >> >> inherit dpkg-gbp >> >> -PATCHTOOL = "git" >> SRC_URI = "git://salsa.debian.org/debian/cowsay.git;protocol=https" >> SRC_URI += "file://isar.patch" >> SRCREV = "756f0c41fbf582093c0c1dff9ff77734716cb26f" >> diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass >> index ba5c3ebb89..d956e8c3bc 100644 >> --- a/meta/classes/dpkg-gbp.bbclass >> +++ b/meta/classes/dpkg-gbp.bbclass >> @@ -7,6 +7,8 @@ inherit dpkg >> >> S = "${WORKDIR}/git" >> >> +PATCHTOOL ?= "git" >> + >> GBP_DEPENDS ?= "git-buildpackage pristine-tar" >> GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" >> >> > > Sounds reasonable to me. > ...but breaks rebuilding as long as we do not clone into the buildchroot and rather patch alternates: ERROR: mc:qemuarm64-buster:cowsay-git-r0 do_patch: Command Error: 'sh -c 'git --work-tree=/build/tmp/work/debian-buster-arm64/cowsay/git-r0/git reset --hard HEAD'' exited with 0 Output: error: object directory /downloads/git/salsa.debian.org.debian.cowsay.git/objects does not exist; check .git/objects/info/alternates error: unable to read sha1 file of cows/elephant-in-snake.cow (1003cdf63bd9ae64e6674b47f8ed4799b5f809a6) error: unable to read sha1 file of cows/elephant.cow (959cd3f6dd2b628b2471572a06e162b31dbcac96) error: unable to read sha1 file of cows/head-in.cow (2e51774886392c2d295e5659b03dbfa04f14aeb4) error: unable to read sha1 file of cows/luke-koala.cow (78acd6988fa397cc1dfcd98f04373af94288430e) error: unable to read sha1 file of cows/moofasa.cow (15119d6782fec20424c648fcf0174f291dd22026) error: unable to read sha1 file of cowsay (900ca46014cf0454075a6390830b399b2a4b2a34) error: unable to read sha1 file of cowsay.1 (7133866af2f7ea7cccdfa79378a61b27c1573e6b) fatal: Could not reset index file to revision 'HEAD'. ERROR: Logfile of failure stored in: /build/tmp/work/debian-buster-arm64/cowsay/git-r0/temp/log.do_patch.71 ERROR: Task (mc:qemuarm64-buster:/repo/meta-isar/recipes-app/cowsay/cowsay_git.bb:do_patch) failed with exit code '1' Did this change have a practical motivation or was just out of esthetic reasons? If it were only the latter, we should revert until our bitbake can resolve the underlying problem. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux