From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6811501080263786496 X-Received: by 2002:adf:f8d2:: with SMTP id f18mr23447048wrq.139.1586850803299; Tue, 14 Apr 2020 00:53:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a915:: with SMTP id s21ls3326731wme.0.gmail; Tue, 14 Apr 2020 00:53:22 -0700 (PDT) X-Google-Smtp-Source: APiQypK6Wgr0BhZpeN6QUg9FQAK3dGybxGLuswnr9feJqg1NVqdKx10yYNT9kIdee3vpo4J4+VjP X-Received: by 2002:a1c:bd89:: with SMTP id n131mr21986550wmf.3.1586850802665; Tue, 14 Apr 2020 00:53:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586850802; cv=none; d=google.com; s=arc-20160816; b=ThrhPiBnzyP4aBfDwKM94UQRLFGCFGFVaoguyx4LG2Dz/BL3TNEcnKl/tSetGHP747 DJc+wbH9lcnSZhFK/qvy02YzVjeptVsaCqrd6ibQVsyNrr9XD/L8zzdqs/+7odb3G1Jw ttTnm5PSc5HQzUzcL60GJXvFD22nxbwS1NiiPYG1NkoXedvmUxAAaGbUWOru1BxYnQcx bwfJ1Uma7GQRyq/6qhRRWXzvLnvCvJ7c9TqxX4bdbLFoFnODfExLIiyvbF0BliHtNoHQ h6ODedYk4C1roUtUxpKwDAtk38OMEKHmUoGV52lM18zsFWk8/K0LlBkyfsU1KVBEQFzw bL5A== 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:cc:to:subject; bh=SFb0vAyD17DWRbaspU/GwlbxZrXQk7ROiSQDDikAl0M=; b=j66zJD9KSGWMmkrkUyMcJR1L/Xpa+1sBfb6m7VwLW70MSf2tIzBIAqlC9o/t8K9WR8 KYtBoe3/Tx+YzdWHSPuM3hQWU1aoEYp22R6ZuGaW4YLC13yOON31VaPL8NoatW1GbkST FHZ8YEP9xBJ8cX/OpPxJTUImtNq/MXo+6He9rQ9NZmGAgykPOzt/eLXMXh+uGl3lgQVF 5ogW1+QfWkxDF844/VUsbPiJRTF02BK5Asr1xyPWIMwWXwgij8djqyjbHiyoVrXe8Twg /ijBmKV/i/gf9FXfaOwP6ZvBrGwEHatDy4eDXTJRidv6rkCF7HdPKKv2/Mkjyiwf92RE cNgw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id m4si360527wrn.5.2020.04.14.00.53.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 00:53:22 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 03E7rMaA025774 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Apr 2020 09:53:22 +0200 Received: from [167.87.42.238] ([167.87.42.238]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03E7rIc9017698; Tue, 14 Apr 2020 09:53:19 +0200 Subject: Re: [PATCH 2/2] dpkg-raw: Correct path so that git fetching works To: Henning Schild Cc: isar-users , sven.schultschik@siemens.com, cedric_hombourger@mentor.com References: <20200414090524.04d023f1@md1za8fc.ad001.siemens.net> <20200414091137.5def8bb8@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: <0a139a0d-544d-e71a-d432-4684f4421a47@siemens.com> Date: Tue, 14 Apr 2020 09:53:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200414091137.5def8bb8@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: CRbzi5rNDJ/g On 14.04.20 09:11, Henning Schild wrote: > Am Tue, 14 Apr 2020 09:05:24 +0200 > schrieb "[ext] Henning Schild" : > >> Am Fri, 3 Apr 2020 17:02:57 +0200 >> schrieb Jan Kiszka : >> >>> From: Jan Kiszka >>> >>> Setting D to S and cleaning the former caused problems when fetching >>> the to-be-installed files via git. Fix this by using a distinct D >>> folder. This requires setting --sourcedir for dh_install >>> accordingly. >>> >>> At this chance, simplify ${PN}.install creation and avoid resolving >>> ${D} in the error message. >>> >>> Reported-by: Sven Schultschik >>> Signed-off-by: Jan Kiszka >>> --- >>> meta/classes/dpkg-raw.bbclass | 15 ++++++++++----- >>> 1 file changed, 10 insertions(+), 5 deletions(-) >>> >>> diff --git a/meta/classes/dpkg-raw.bbclass >>> b/meta/classes/dpkg-raw.bbclass index 8c01a46a..9d4e8c19 100644 >>> --- a/meta/classes/dpkg-raw.bbclass >>> +++ b/meta/classes/dpkg-raw.bbclass >>> @@ -5,22 +5,27 @@ >>> >>> inherit dpkg >>> >>> -D = "${S}" >>> +D = "${WORKDIR}/image" >>> >>> # Populate folder that will be picked up as package >>> do_install() { >>> - bbnote "Put your files for this package in ${D}" >>> + bbnote "Put your files for this package in $""{D}" >>> } >>> >>> do_install[cleandirs] = "${D}" >>> addtask install after do_unpack before do_prepare_build >>> >>> -do_prepare_build[cleandirs] += "${D}/debian" >>> +do_prepare_build[cleandirs] += "${S}/debian" >>> do_prepare_build() { >>> cd ${D} >> >> How about we create a recursive copy of S into D and leave the rest of >> the code as it was? > > In fact the debianization and creation of that install file are > something like a patch step. We can either try to roll it back by > having a reverse implementation ... maybe actually using quilt. > Or we need to invalidate its stamp together with unpack. As explained in my other email: It's not only about adding debian/, this is also about picking from ${S} into ${D}. You are still on the old path with your proposal. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux