From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7353211393399586816 X-Forwarded-Encrypted: i=2; AJvYcCXwGEVkte/0dYYCZa90E5e33iMiARvQ3xTYErPsY3kSg8m3GZROTo/kK7mHc8OBKRmu7nzQZzdiJ/icO3ecopMRERTxxUVFw3R9AzA= X-Received: by 2002:a2e:b4b8:0:b0:2d8:6175:b6ae with SMTP id q24-20020a2eb4b8000000b002d86175b6aemr7436215ljm.47.1712640506547; Mon, 08 Apr 2024 22:28:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8648:0:b0:2d3:914b:406e with SMTP id i8-20020a2e8648000000b002d3914b406els37065ljj.1.-pod-prod-08-eu; Mon, 08 Apr 2024 22:28:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWk5doHXFEoDJrVSX8xluCY4RXOm4NXG1g1DqSXhm7rJFQBtrE0skp1YYa5WwQ10pvtdqmxNE6dLvYN8zwcyD5tOH8JViv7Dt7bXpQ= X-Google-Smtp-Source: AGHT+IHx3MnYCNoEGqiSFJKR2BueRF3KgSK5t2Ax5oLevWo/QTx6yY4x5YCqmX5qA44gq/xIxWuX X-Received: by 2002:a2e:8907:0:b0:2d8:73a8:2186 with SMTP id d7-20020a2e8907000000b002d873a82186mr6434951lji.46.1712640504082; Mon, 08 Apr 2024 22:28:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712640504; cv=none; d=google.com; s=arc-20160816; b=yr342QGHbm3ydvK3rLWrTLFgNrhD9rg/GCGqf+OZ5ok990FSViLqovouYkeHDV2dSe 5o67EWZhgHlwWn/ZEgYRPADQO1gtqtjI/xQVyZ65t5IKC54eos0bUCZk5OFsTldDTmtd KW32PLibBOozjxmBmaZiDZrafh0ItqWgpMWGLrZJ4aAsFj15PwTVuyHl994+8ic/pWl3 wWm/gob449mhWyMwxcgNCc6vPmRebQvQEC3Cr9iDgl0zLdIWf2pco5a9R+JJ2yyBPCuS MdEY9zICUiGr4L0Jeafh/5e1OArDQ6JSKEjYduKo02raZZyW/zIFYMQd56O1Ag3d7hfe W5Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:to:from:subject:message-id; bh=cudWwzlmmCGaR8q+EBmSGaKGNGggEVSoY3X8XmnNFc0=; fh=JZvUnqoG0jWph92hWpw0EINycbLveqkIcdkusZDYok4=; b=DYsrCpuAdAAN94jfE3ILYGuF/INIC3b7Gs3RUfnzUpwYtyhqwbOIEmLeqpzwh+CGKf sbLfkEc32tgztwm50y6NNAt4en4pTA9SPRFyvThyuIE/cwmBuseZlt80+Sqga/dCgsq0 LYVRRz4r7o15BPz3AhSRTZY9Y8HlbSdZBte74M8sHQWgi0ntbb05x2g1YlKBLqYyM/Sk 7aUS8rJX4b73vifRvg7xRNCH9Fm3k8CEeB5Db3/b5SRZLuAEDR49meLbkwwEYyAK7YxI G4bVXEPQ2jU1jA2sdSVF3aCzM4ynQRZ20Sv8khQhxGOw7t8HDasHkm7MPVANxQ4IjhoU oEgg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z17-20020a05651c023100b002d6fac9a294si252843ljn.1.2024.04.08.22.28.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2024 22:28:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from [IPv6:::1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4395SLKd019795 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Apr 2024 07:28:22 +0200 Message-ID: Subject: Re: [PATCH] hello-isar: Improve patches apply testcase From: Uladzimir Bely To: Anton Mikanovich , isar-users@googlegroups.com Date: Tue, 09 Apr 2024 08:28:21 +0300 In-Reply-To: <20240402101527.55012-1-amikan@ilbers.de> References: <20240402101527.55012-1-amikan@ilbers.de> Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtLkBDQRjtnlJAQgA0nDigNK6FToZn7ezdts22l//+cyPF9k1OQM+wNuhdEYG ZvieFPNnH4iPf2C6OVPxOsHxs66X3mpn728s5Mg+0V2pkDqX4E9IU1sdPAFGC9Zl5eDGmE0PxqaTr lLG2ZA2lxouoHUe/xwE3fKiHENxiY4RVC8vya8dnU/SMnTc39uHS1nlPk0oPiZd2odHO+YABGz2pM LMShCstX+8LDlV/XxXacBbXYDeR+Xk78mFsjKzavfXWhZ7UoA6vitR7XG5y1koZ9FbtU6kq7JPRDe eYbVf0mIufdGTUBedza12M1Lm4knvzZRX+get1lLFngPstU48t041YfQKZpNK0cePPwARAQABiQE2 BBgBCAAgFiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAmO2eUkCGwwACgkQAUQYBM/2Fkq3aQf6AuKj6 5nqjLIOLIasYQ6D28Jhip65ZFhW6XISv5rcjHkvYfMp4J+LaNOZk2P+1b/QN/2wDVisNGYq6lhkkf pBN3vTQlvMY0ugKDug2YaRYeuoLSFBMFVONa9N6437KQg+vRNd46d5282q9BTXAlOLWR/ZuXg/IR5 ZIV3JTwLtqbPCUGof85hFxSPWEHMYeeE7180r66wUjA/Zf46Mar9t+olviBW1ss5XOx1JWt7FpQ5p eETwmkoYi4Kq16iyuRB94mQqyy1C4fiqTq8dKr4uUYg759NWwU6j21G0kf31bDd4QgTIHvhY/8Agl dyzoeJX5Bz67KzX3+/fAWvPEXAvvg== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.0 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: qQT9GR53CjNS On Tue, 2024-04-02 at 13:15 +0300, Anton Mikanovich wrote: > Move one of the patches to meta-test to cover multilayer patching. > Also add the coverage of FILESPATH autofixing for multiarch. >=20 > Signed-off-by: Anton Mikanovich > --- > =C2=A0meta-isar/recipes-app/hello-isar/hello-isar.bb=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 2 +- > =C2=A0meta-test/recipes-app/hello-isar/hello-isar.bbappend=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 8 > ++++++++ > =C2=A0.../hello-isar/hello-isar}/yet-another-change.txt=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 0 > =C2=A03 files changed, 9 insertions(+), 1 deletion(-) > =C2=A0rename {meta-isar/recipes-app/hello-isar/files =3D> meta-test/recip= es- > app/hello-isar/hello-isar}/yet-another-change.txt (100%) >=20 > diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta- > isar/recipes-app/hello-isar/hello-isar.bb > index 6304b6b4..57ee7346 100644 > --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb > +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb > @@ -17,7 +17,7 @@ DEPENDS +=3D "libhello" > =C2=A0SRC_URI =3D " \ > =C2=A0=C2=A0=C2=A0=C2=A0 > git://github.com/ilbers/hello.git;protocol=3Dhttps;branch=3Dmaster;destsu > ffix=3D${P} \ > =C2=A0=C2=A0=C2=A0=C2=A0 file://subdir/0001-Add-some-help.patch=C2=A0\ > -=C2=A0=C2=A0=C2=A0 file://yet-another-change.txt;apply=3Dyes;striplevel= =3D0" > +" > =C2=A0SRCREV =3D "b48d15629667377f544e71c7310b80a71d00d9dd" > =C2=A0 > =C2=A0inherit dpkg > diff --git a/meta-test/recipes-app/hello-isar/hello-isar.bbappend > b/meta-test/recipes-app/hello-isar/hello-isar.bbappend > index d567599f..44686458 100644 > --- a/meta-test/recipes-app/hello-isar/hello-isar.bbappend > +++ b/meta-test/recipes-app/hello-isar/hello-isar.bbappend > @@ -1,3 +1,11 @@ > +# Checking patches apply > +# Using PN only for testing autofix, BPN should be used instead > +FILESPATH:prepend :=3D "${FILE_DIRNAME}/${PN}:" > + > +SRC_URI +=3D " \ > +=C2=A0=C2=A0=C2=A0 file://yet-another-change.txt;apply=3Dyes;striplevel= =3D0=C2=A0\ > +" > + > =C2=A0# Examples for SRC_URI parser testing > =C2=A0SRC_URI +=3D " \ > =C2=A0=C2=A0=C2=A0=C2=A0 file://nonexist-file=C2=A0\ > diff --git a/meta-isar/recipes-app/hello-isar/files/yet-another- > change.txt b/meta-test/recipes-app/hello-isar/hello-isar/yet-another- > change.txt > similarity index 100% > rename from meta-isar/recipes-app/hello-isar/files/yet-another- > change.txt > rename to meta-test/recipes-app/hello-isar/hello-isar/yet-another- > change.txt > --=20 > 2.34.1 >=20 --=20 Applied to next, thanks.