From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6995471841453146112 X-Received: by 2002:aa7:c345:: with SMTP id j5mr2812258edr.331.1628857725794; Fri, 13 Aug 2021 05:28:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:d1f:: with SMTP id gn31ls592104ejc.11.gmail; Fri, 13 Aug 2021 05:28:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwkrv5SC/ybk+GHSb2Sd4o5GLxcn3lMhbzwPhr2XhITj1NIlX30xwlunYlAlU0TaTxb5Z1 X-Received: by 2002:a17:906:8606:: with SMTP id o6mr2172077ejx.247.1628857724646; Fri, 13 Aug 2021 05:28:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628857724; cv=none; d=google.com; s=arc-20160816; b=RT8nkKHHVHfDTcmRxiHr9qV1FEv728aW7scvloWV5jAWNt/fD8ChnqNW1H03i4gFk3 kpc4Dy5PzhKz/pDniprutaWF1iJ6x5CEXP/Ir/DHxN5VGqry334VU0HRJOJrWTaJ5oUa RM8NjgN7mkdKEFZFKtyhJQIX44zvRKxTRYljLC3Os684S7wLMrLtCAj6gKHh0PvBfegq YiZd5GOzuKWgCM8gJ03oTutF6hdxagbhBvBKAj+MK0zyihEG8jqbxVK0pcA9KzS29V25 SqXyJQUB2OW+dnSAH7E7elCIBiX5gR20yWWmQIGSoSvMNRd/cyLejY4+CH+Oiq5uOKWY ZDaw== 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=V1cCsWR1PMjEVOzJQZi8xHhy6Ey35L0OK9swzE5zM78=; b=TucEDiJ54VSzwZXi2mYqZnbAREojnzaF7YaPj8PIkMQVuQeuO5Ytu3OlCgHf4g4xWZ zJC3eHcG8A//oJRSrfXFCt6elOsYPVvsd2+isy/E+wzcW7Wu9GGpNi7RQASqwkoXomWt 2c/guhR3YYPKqcKqD3At3HgC2oszsQ03FMI02jir57G+9Z+P8hzSGxk/svVZ1yJwYBUR AIvbdyuJpoVjpBKbrnlXEu77PUFpgCkyTysmh/9eeTcyj7W54OZSNQwjWgfjiaTgrFeB Ev6x6iog6xEe2Y0ClIwU9artTBKdFLkz4+0je4aRvWlBHgiprj/n5NFLxE68jm5EPqWE MURw== 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 h14si115479edr.3.2021.08.13.05.28.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 05:28:44 -0700 (PDT) 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 17DCSiwK005066 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 14:28:44 +0200 Received: from [167.87.241.87] ([167.87.241.87]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17DCShem019361; Fri, 13 Aug 2021 14:28:43 +0200 Subject: Re: [PATCH v2 0/4] Make adjust_git work in both worlds To: Uladzimir Bely , isar-users References: <3710f21b-429e-40c2-8a8f-814bf1b734c2n@googlegroups.com> <0a83a4d0-ecbb-e5ae-047d-c362daa8e55f@siemens.com> From: Jan Kiszka Message-ID: <3665f9de-913c-620c-0327-61894494bbe6@siemens.com> Date: Fri, 13 Aug 2021 14:28:43 +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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: /tG/cBtXdCwt On 13.08.21 14:23, Uladzimir Bely wrote: > In addition to this series we still need something like I had done in > "[RFC,2/2] dpkg-gdb: Reset git to SRCREV revision before patching". > > Because the problem with git has gone, but there is a problem that we > try apply patch on top of git tree where it's already applied. > > Steps to reproduce are quite simple: > > - Run first build: bitbake mc:qemuamd64-buster:isar-image-base > - Modify local.conf (e.g. set ISAR_USE_CACHED_BASE_REPO ?= "1" or do > something else that will cause packages rebuild) > - Run second build: bitbake mc:qemuamd64-buster:isar-image-base > > It ends up with: > > ERROR:mc:qemuamd64-buster:cowsay-git-r0 do_patch: Applying 'isar.patch' > failed: > The next patch would create the file debian/patches/isar.patch, > which already exists!  Assume -R? [n] > > In CI tests we remove build/tmp, so that we don't face this problem. > This is supposed to be handled by the patch class - when it works properly. Please check if quilt-based patching addresses this and only git is affected and, if yes, also cross-check how that works in OE. We either miss something from OE while using their patch class or there is actually an upstream issue. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux