From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6920502129401528320 X-Received: by 2002:adf:a452:: with SMTP id e18mr5349389wra.244.1628886152843; Fri, 13 Aug 2021 13:22:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:db90:: with SMTP id u16ls1062427wri.2.gmail; Fri, 13 Aug 2021 13:22:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuXEY+ibZZfzYxIVZ4plct58RHubDq/L0ivHkZjgFf+6s9pMXyghe+ZLRivIvlqDTqRPD0 X-Received: by 2002:a5d:590f:: with SMTP id v15mr4470899wrd.189.1628886151951; Fri, 13 Aug 2021 13:22:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628886151; cv=none; d=google.com; s=arc-20160816; b=fKiMGbEylYb/SVC7wduU3mABhYIZJ4+ZEnjGgvQ15j+WlNmt5K3zDvj0zrDvPIs8Jt ZxgvU5w2rx1fHgVrGTLOoUxu4o/zf/ixHIiKeQOLJrDMwqHuTeGi85jRoPGpI1xJATfl 2wOp4HhHqNM2dFYOyKL+hkY/X2FU6zyPOTZJX/MUjKm6AXfaasl9cbDkRcOJh5VhObQi dmjmbigr0HMBL6Tf3P3mT+MEYo04cwzQq6GCOAacPJoXFgCth9dtWh9t23ASaxOM3MOb Fp8tynigovyT9NQ4kPHejmOrx2ycBLYBJCDmtKxuwlea38xsY7KZx71PxvWgEl44SMMF qbYg== 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=IwkTQwHg5OHtWJGyBfMGHyw8VWu/0oAT673yjoR/GXE=; b=RyVTtZ1k+MrSkLBLUwOxPNQQUGGuXk6LiHJDLh83ljtEfHMlbjFkdZrNQmCPI4Oy1o liWFyIE2FMYV1cNVILmLxeyu0kgPwmVCjbtqxMQzmwWT5O/RACQIczXk0Lwr2qWzBHEx /xDwdyPVAyCR0kY/MP9Q+UGRCQWu+ZVe+NQVhJ0DlVxJTDaVyYFusiW0q6warN7qUoAb zh48RZ6JGhAK0YHoEHHCFkf33NmqeNtVhfa1cPNUT3TLMVTS4la8UoRSZTEjwWuXFmTK aH8PlopDzDJ0ZPjnplL7gEnScrDR/q4omaoA4Kc/gc5lN2wkblYVII+iXMsfFsJ0Q5yR 8m0g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z16si91619wru.4.2021.08.13.13.22.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 13:22:31 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 17DKMVtN027543 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 13 Aug 2021 22:22:31 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.32.22]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17DKMVav002360; Fri, 13 Aug 2021 22:22:31 +0200 Date: Fri, 13 Aug 2021 22:22:30 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH 3/3] dpkg-gbp: default to "git" patching Message-ID: <20210813222230.2bca9f39@md1za8fc.ad001.siemens.net> In-Reply-To: <9cca8daa-595e-7cd5-8886-903e04574491@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> <20210811203649.63399e0c@md1za8fc.ad001.siemens.net> <20210811204431.657d7888@md1za8fc.ad001.siemens.net> <9cca8daa-595e-7cd5-8886-903e04574491@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: zQBSOetiD9xK Am Wed, 11 Aug 2021 21:15:49 +0200 schrieb Jan Kiszka : > On 11.08.21 20:44, Henning Schild wrote: > > Am Wed, 11 Aug 2021 20:36:49 +0200 > > schrieb Henning Schild : > > > >> 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. > > > > Doing BB_GIT_NOSHARED=1 in general and dropping "adjust_git" is not > > something i have tested. But i am almost sure it will work. > > It will have an impact on performance and disk-usage. > > > > If a layer wanted to early-adopt ... it would be cherry-picking that > > bitbake commit into isar, setting that variable global and dropping > > "adjust_git". > > > > That's not a layer topic, that's an Isar topic if that feature is so > important. If the patch is upstream in master, pick it on top of our > release and do the refactorings. That's better then fighting > adjust_git by randomly breaking it. I did send a patch that will "unshare" in isar without having to wait for a bitbake version bump or doing cherry-pick forking. Let us hope that patch is accepted and we will simply carry adjust_git until that bitbake bump. Henning > Jan >