From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7353211393399586816 X-Received: by 2002:a2e:a9a1:0:b0:2d6:b98d:c868 with SMTP id x33-20020a2ea9a1000000b002d6b98dc868mr9553443ljq.14.1712052941899; Tue, 02 Apr 2024 03:15:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:91d3:0:b0:2d6:d53c:d553 with SMTP id u19-20020a2e91d3000000b002d6d53cd553ls62665ljg.1.-pod-prod-07-eu; Tue, 02 Apr 2024 03:15:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBS3Ige183A6RqTN/9nboyc35Z8xlQMQlgqWK7Ly8HAVgu32it1dvcjav2JDGQxVUUipCS X-Received: by 2002:a05:6512:e96:b0:513:cdff:d765 with SMTP id bi22-20020a0565120e9600b00513cdffd765mr13367849lfb.59.1712052936614; Tue, 02 Apr 2024 03:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712052936; cv=none; d=google.com; s=arc-20160816; b=yUtR7uc3lwTMbzkiZw22DTC4uRlQSyqbvCr9brRMX6LHwvk8ShZJ495F5VZJqLGnJg FsWJ97Nacbf/Go9t4xLCOkgmSmOSFiMFFjRNGmy7foGQlJ39B4e+LBB5GAAus7HXkv6f CHbuDqDfZOkb+Z4YAGppj2458kg/PHLbtlCNtUFBMn4NMQAxG8SN2pPSUNfdieQOrcW0 JO1lXYSNmQ3NKOOoHO7x/INGQUdsAkm7RyNNbV7tf+sjvc0LrRluBYiH0GCtHgIg7V7I QQmJlAi6QjVGpvUEqji8kjFlZ7Re9X7g2sevXNJ4urOif9c2ShcLg/YkAOeFzkMFmyCH StoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=WDmpRDsVGU3Hvv8CryjnQZ1lt4GQNOH/kXupY63UgTc=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=qLJlR7MQd8fyZd4nk5PwXvjCXF2eH9cdpQFmy0DynpMD6tjvMTJf4v3o68QQ73+bbj wPwn0V2vJMadh1io/82jh/DpNEX0c/E1FLtMeIr92JqSCoekcjKcwvR8Sbcrxoe1zZgT mKrWHtBSMWQn0CrLPQ/ih/Mj7cXUXYvJjXp3qvrOT4ZLqJ2LrmsScvTlidBAdJ9LxrYH GQzC5f0DiucheB0DkpkRguqA//+IQAgj4N4ccuizBWZNKCwH1RMHCPUKyLbqpxzGsQTc ytncqzzyV7LLp9wNw6L6Y6MwtvJgKhS+18gP4aTDd/APez/VYUEFSHyAD+CHDjQNnVXP gHCw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g35-20020a0565123ba300b00515c48b0a75si342084lfv.10.2024.04.02.03.15.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2024 03:15:36 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 432AFYkL017662 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 2 Apr 2024 12:15:35 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] hello-isar: Improve patches apply testcase Date: Tue, 2 Apr 2024 13:15:27 +0300 Message-Id: <20240402101527.55012-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: MZ64T24dyZUL Move one of the patches to meta-test to cover multilayer patching. Also add the coverage of FILESPATH autofixing for multiarch. Signed-off-by: Anton Mikanovich --- meta-isar/recipes-app/hello-isar/hello-isar.bb | 2 +- meta-test/recipes-app/hello-isar/hello-isar.bbappend | 8 ++++++++ .../hello-isar/hello-isar}/yet-another-change.txt | 0 3 files changed, 9 insertions(+), 1 deletion(-) rename {meta-isar/recipes-app/hello-isar/files => meta-test/recipes-app/hello-isar/hello-isar}/yet-another-change.txt (100%) 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 += "libhello" SRC_URI = " \ git://github.com/ilbers/hello.git;protocol=https;branch=master;destsuffix=${P} \ file://subdir/0001-Add-some-help.patch \ - file://yet-another-change.txt;apply=yes;striplevel=0" +" SRCREV = "b48d15629667377f544e71c7310b80a71d00d9dd" inherit 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 := "${FILE_DIRNAME}/${PN}:" + +SRC_URI += " \ + file://yet-another-change.txt;apply=yes;striplevel=0 \ +" + # Examples for SRC_URI parser testing SRC_URI += " \ file://nonexist-file \ 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 -- 2.34.1