From patchwork Tue Apr 2 10:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3460 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Apr 2024 12:15:50 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f187.google.com (mail-lj1-f187.google.com [209.85.208.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 432AFmTQ017678 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Apr 2024 12:15:48 +0200 Received: by mail-lj1-f187.google.com with SMTP id 38308e7fff4ca-2d48af389acsf35431201fa.1 for ; Tue, 02 Apr 2024 03:15:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712052942; cv=pass; d=google.com; s=arc-20160816; b=0gtKop/xhikU8JPU+vGyCvZfMDQ6cciIfFXCqgnVFQ2trj9t72UkhlEMjTjDCyzPuu XQAW6xD8zLktnaKoswm6pH1uv3TZkFygjCD9YkP9iROTeZfDn8/de9tioZaC9X2pIpF0 iGvKKmrEUwZKqHq7B2BCYU7ukjlRHIQvnGJntZd9dqA33Bqq4VxkqDs82vItbAHU5BsL kZF+PcQAxUs7rpuKvuIqf8RtPX1isccZiqH6lO2UDCaA4vSv44JA7mzUmiqHurnbd44N Eb/AAG3w7XeyoMk4WGMJuhMX8DTK7bpVF7RWK9g8XNqODE3UhcGqr0QNddLnpEtJ4rNO HHtw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=U2MpRqjdY4TgCGLBoDK7o9bEtN8Ugljp5oMYThFuB90=; fh=3AmzWZP8w83xtYNc5FCdoi+9XMMATWDpfG/tpmNXYxE=; b=QF7jDivaOSQUFyQM4BEHx+R9ZgtZIGwfIE4RZWG5XVlN5Jem2zUaN1gzVVtMrnNNec srLaycOeT5/ePv204lFzN2I6OsgQjHx9ckHg/WYZ1Kp4AQxwujBhfk9HJLWry2Pixf4D p0GQ4PRtDGD6AmMDq3Ysn+IsQejl0gdlvZLEhrOKGZnG1BeEliezdHhtMEKKF+h9LwTE BmiM4Jp9InhzaPkbb+k9TwLPm1RB1PjO3EbncKkHGFcSj/HpIrA7F7t/9MIgASC8b9tE yLL5KfLcAfyXU6uM/UIocfLMZTCC7lEbBzQsqhUEYKe9ymHtZL6/ZbmED+n5weToG1Pn ir3g==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1712052942; x=1712657742; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=U2MpRqjdY4TgCGLBoDK7o9bEtN8Ugljp5oMYThFuB90=; b=AQs9/ubMwg6zdze+yEpcy0SnYt9LpJeEtjcKJ9YrCSGYyIC0t1HnaIVy62eGIHHcCr u4tXEigGCZkTtMX9XMg8uNJ5Xvj7D1Zt+Du8LmN1RhehtEukBv1PBfF5ATUbWxzB9abA gnaDjMt2BlwDRgTZXM9e2IScN4RKvhHGcRYI2lE9YgsHgEQJ09n2zCaEe0pAoXCGZjQe JtnH/tSaXBvuP84SOTTBS9aTrC07AxKctjeyr1AZ6vj2lLwzQLLRiraDzUdKN8AkjDNX B2iwoc72eGuIpNBOokC6iwBWlgEcX8NhSkKTV6+qshtHLINtcNkzHQjtWHKXApZdgFbo A9QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712052942; x=1712657742; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=U2MpRqjdY4TgCGLBoDK7o9bEtN8Ugljp5oMYThFuB90=; b=cl4YhfmpWMDDF39lFMFo/77wmz6d10DTA0nYFe92+eHeNJU1TnpZDOi5p5B4xgp8Oq tm34mvqvMgP6Z6TiZdkyDBBSd+mFwaHsfGh/j7WvwfHri64oQVhZPyzA/1k3c7D2AdK8 Qz1IYVYmsoYyWWkJHVvmROhZmYFvoF/sRQRRGIRKy9GHE74pf4dBUFKnyhSCDDpS2yj+ 8PFV2rVLNDAE/7R7wIC2nalAWoFGlUtdH9MvoOX6ChaCLEP8OU6ZY0p9d+p/R+qRG8ee KjiJRutVJdZYgZ3R7HZymXKQvtKKyIEkcWtPxKyvpF/E1oX4paqO6oHzil27prVI8H5a 77Hw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWPgbaF7y+wUb/IGngwJJwWhWhITUjbd0unN4AW9Wh3e95qSzgYEvhduUDpDXLuhXPi8l/chOAMyPUAL01cmx1Tg/9DEw8= X-Gm-Message-State: AOJu0Ywte3WMCmJmCREPGOhSfQF9eKNHJcyXWJeNfKozqF5k4dBVVeGv xBC8ikcDI+kuO6BdfJ2tBYch7vUNMzNpcPU54u0wB20rCe8jWeK3 X-Google-Smtp-Source: AGHT+IHICJMa+48X93VNddVa7/ISWMXSOs2jF3wT/uwu4T9EFAjQ6UFSjZGCysTddbSuX+wuy61ZXw== X-Received: by 2002:a2e:3512:0:b0:2d4:99f8:8b9f with SMTP id z18-20020a2e3512000000b002d499f88b9fmr7461714ljz.50.1712052941791; 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-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 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; 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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