From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:a19:da01:: with SMTP id r1mr116670lfg.437.1628707012916; Wed, 11 Aug 2021 11:36:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:691e:: with SMTP id e30ls1009667lfc.0.gmail; Wed, 11 Aug 2021 11:36:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzocrrXsfx4AdT4/VWyY5D5bmH6VyzrFJ9wRFNe6Uy9dYy2jFL2OzIK9UgxKjc/ov0E3R2g X-Received: by 2002:a05:6512:942:: with SMTP id u2mr113611lft.501.1628707011658; Wed, 11 Aug 2021 11:36:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628707011; cv=none; d=google.com; s=arc-20160816; b=w1pz66uKLcMTgj9Vy5/P7Nh7uvUDGMOASjbGI5JhthhBayNuB9tLpAn6ao+oJeL+CY KRWio64hAdHebZ5lWPEChHekpPjRjPlI3MUeCkV0g5KXmQbjYAzOOY9Od3H/9pa4f7WU 9JgtnKHgug/d/Q3wHqANpudpSbZtXk36WYz9+l9ISemKMpXPgU+ZszsiLRoqyduvF0h2 9RAXAIfPZZQTVSTsNV412tsY4xJTVQ2RuJmIMI9IkA5Toq6n8b/ZNx6/OPik7RkeJCP8 hYGp5fzvsNX7gIL832mex0o5biFLvtI2RwxkOYkj0njIhrgKk2ZSQ+qZyTc4PxPRPmjR BK9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=K3l9ScQ2BUNPaxzv7qKkOF6AsaDQu50DSSgamEXBNBo=; b=nRMM0FQrB/sFNscpOcmsRzsW4iRP59TAzYFvf4JlvrZoZVFGB9IEShRiLCvjVP64NT 0QBvOs2Rb0EExf/Mklr5PZXRoY2hzX+SHqlzJD9mCPXlf74/pPJzapRSFnPOvlzrkZab NvoeFW6xDD/M00eKAWgZ+zgq/2MZXqHdu5avOfrJv5HeGAlD2PZhLrlb/GhqEuIwN0Pd e5dEffDw8QpddZPs2r/4bDAcXlL6tAMmQdVAEvanA+o88F3dUipwHgNzG0F5ROqGCcIs 8mmzVKy5PUpcFpIEGUAgglyBddqS+EWVh7fbUj4qNhbZI9oQKnfhHVjhdGwEryXavvX2 fsKQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@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 u9si5378lfs.9.2021.08.11.11.36.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Aug 2021 11:36:51 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 17BIaoGG017970 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 11 Aug 2021 20:36:50 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.5.58]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 17BIaoZR002057; Wed, 11 Aug 2021 20:36:50 +0200 Date: Wed, 11 Aug 2021 20:36:49 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 3/3] dpkg-gbp: default to "git" patching Message-ID: <20210811203649.63399e0c@md1za8fc.ad001.siemens.net> In-Reply-To: <0d573291-8590-ebf0-5de1-8714efcd49e5@siemens.com> References: <20210122084241.10573-1-henning.schild@siemens.com> <20210122084241.10573-4-henning.schild@siemens.com> <37fed018-d270-a314-99ac-53c05db8323b@siemens.com> <0d573291-8590-ebf0-5de1-8714efcd49e5@siemens.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: JzUxShsAgs7E Am Wed, 11 Aug 2021 20:14:56 +0200 schrieb Jan Kiszka : > 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. It does have a practical motivation. Patching with quilt in isar has nasty side-effects when debian/ is using quilt as well. Using git as patchtool when git is also doing fetch/unpack seems like the best solution to that. The patching with quilt gets especially nasty if you can not add a quilt patch-patch to just deal with the code ... when you find yourself also wanting to patch debian/. I would say that "adjust_git" is to blame here and we need to live with that until we version-bump bitbake. In recent bitbake we will have https://github.com/openembedded/bitbake/commit/6ae6f1865d5e666ebc670f70b7401a7b41648102 and will be able to ditch "adjust_git" by simply setting a global BB_GIT_NOSHARED for isar. That will also result in much improved usability ... since git repos will end up usable insisde/outside chroots. Henning > Jan >