From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6685232874431447040 X-Received: by 2002:a50:89bb:: with SMTP id g56mr35777976edg.124.1557837729313; Tue, 14 May 2019 05:42:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:5489:: with SMTP id r9ls3936620ejo.2.gmail; Tue, 14 May 2019 05:42:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxljO22+j9GlejEl+ZwetrnkXV9G9i1SAgh8u6+fNf6VCVhof2hMASAXNiJhZ8ZEBOhbG4S X-Received: by 2002:a17:906:1d16:: with SMTP id n22mr25432707ejh.237.1557837728905; Tue, 14 May 2019 05:42:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557837728; cv=none; d=google.com; s=arc-20160816; b=QtrbITt8ufTv+QCtv1w+9KzzMz2myBoi/RMjAPill3+nCdPVkrHyU+fJM+XtDJmTVC z3paSPqrSufQjZRs5MJyN5d4lMCvXIdq4kZOIcIrv6YZZFGcbWNcFbNCCyqyUBQjm2kt esdZGJcpq1+REg3px3gw0ebJlDCb2AoLMFWkMp9AhQOvEZXYWaZhcchaLf7nTuCRMhXt a1oBWGqfvpk5pCQ7nfZx3oep44C+wtlREVB1rJABjEqqkw2h501Cr+Z5hDk/G2jm5xPK FUIHLIA8iR0GWrJTL8S9b60BDSKoShTLYgHu5MSnCjzzKST3qwEGky9rp9ch4VXOqpKx B+Lw== 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:organization:from:references:cc:to :subject; bh=6bwSFNoeX5RsIMqOkMDLfNWnSz60NF1oFm4wYN4KLWk=; b=LvYTlktfcCZXNwV3chNTJ4ENbrFCHJxQVxHt/lemLU1ulJWilRk1IulISLp8FziWC0 jLVZ2IpXXd21Os1Y1kpm71BhPkxabzV0IGTr6bEsZJNJTyFrPzXqg9YrvNmoffTrKQSW iTewJeE8uG0NjkHH38Kax/8ukJ5ncnxxvmG/fBUUl8tC82J3GnspwiT+dK5afUPxzlTu zU4bSb0Lb9Y3MU9VNHdghon8dM5YMZm7En5Pdqpe7koo4otShtsoVLc30FqqpSU+VUmx 6bSleS5MJXCKxuBlzBzJlSEd1RScXpmDfu4Ae4J5pWEc0den9Hbg2i6gWq3s2s3y+O3C YGtA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id w5si4867089edw.1.2019.05.14.05.42.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 05:42:08 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@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 mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.1.29] (115.165-131-109.adsl-dyn.isp.belgacom.be [109.131.165.115] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4ECg70X032400 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 May 2019 14:42:07 +0200 Subject: Re: [PATCH] patch: Add support for patches in sub-directories To: Jan Kiszka , isar-users Cc: "Su, Bao Cheng (RC-CN DF FA R&D)" References: <529c6ca1-0270-1323-07a2-7f0827329abb@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <4a80e2a0-9e91-f1b4-e155-303f83aa4e3b@ilbers.de> Date: Tue, 14 May 2019 14:42:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <529c6ca1-0270-1323-07a2-7f0827329abb@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED 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: WH+eAMzpo45q On 4/29/19 10:37 AM, Jan Kiszka wrote: > From: Jan Kiszka > > The patch class was assuming that the file is flat in the workdir after > unpack. That may not be true. Enhance the logic and add a test case to > hello-isar. Applied to the 'next'. Thanks, Maxim. > Reported-by: Su Bao Cheng > Signed-off-by: Jan Kiszka > --- > .../hello-isar/files/{ => subdir}/0001-Add-some-help.patch | 0 > meta-isar/recipes-app/hello-isar/hello-isar.bb | 2 +- > meta/classes/patch.bbclass | 9 +++++---- > 3 files changed, 6 insertions(+), 5 deletions(-) > rename meta-isar/recipes-app/hello-isar/files/{ => subdir}/0001-Add-some-help.patch (100%) > > diff --git a/meta-isar/recipes-app/hello-isar/files/0001-Add-some-help.patch b/meta-isar/recipes-app/hello-isar/files/subdir/0001-Add-some-help.patch > similarity index 100% > rename from meta-isar/recipes-app/hello-isar/files/0001-Add-some-help.patch > rename to meta-isar/recipes-app/hello-isar/files/subdir/0001-Add-some-help.patch > diff --git a/meta-isar/recipes-app/hello-isar/hello-isar.bb b/meta-isar/recipes-app/hello-isar/hello-isar.bb > index 5806f9e..144a433 100644 > --- a/meta-isar/recipes-app/hello-isar/hello-isar.bb > +++ b/meta-isar/recipes-app/hello-isar/hello-isar.bb > @@ -16,7 +16,7 @@ DEPENDS += "libhello" > > SRC_URI = " \ > git://github.com/ilbers/hello.git;protocol=https;destsuffix=${P} \ > - file://0001-Add-some-help.patch \ > + file://subdir/0001-Add-some-help.patch \ > file://yet-another-change.txt;apply=yes;striplevel=0" > SRCREV = "a18c14cc11ce6b003f3469e89223cffb4016861d" > > diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass > index bb203b7..2662702 100644 > --- a/meta/classes/patch.bbclass > +++ b/meta/classes/patch.bbclass > @@ -40,8 +40,8 @@ python do_patch() { > if apply == "no": > continue > > - basename = fetcher.ud[src_uri].basename or "" > - if not (basename.endswith(".patch") or apply == "yes"): > + path = fetcher.ud[src_uri].path or "" > + if not (path.endswith(".patch") or apply == "yes"): > continue > > patchdir = fetcher.ud[src_uri].parm.get("patchdir") or src_dir > @@ -54,8 +54,9 @@ python do_patch() { > > cmds = open(applied_patches_dir + ".patch-commands", "a") > > - patch_file = applied_patches_dir + basename > - shutil.copyfile(workdir + basename, patch_file) > + patch_file = applied_patches_dir + path > + bb.utils.mkdirhier(os.path.dirname(patch_file)) > + shutil.copyfile(workdir + path, patch_file) > > striplevel = fetcher.ud[src_uri].parm.get("striplevel") or "1" > > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov