From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6811501080263786496 X-Received: by 2002:a17:906:1e48:: with SMTP id i8mr19532129ejj.232.1586848545975; Tue, 14 Apr 2020 00:15:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:54cd:: with SMTP id c13ls2124275ejp.5.gmail; Tue, 14 Apr 2020 00:15:45 -0700 (PDT) X-Google-Smtp-Source: APiQypL24xKXLt03YEcSuqc4sTHNpFrRcAjWpNjwRZfNDZGcCo+M9tO0PtDldFovizGFsRvt9rCn X-Received: by 2002:a17:906:18a2:: with SMTP id c2mr19479398ejf.167.1586848545274; Tue, 14 Apr 2020 00:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586848545; cv=none; d=google.com; s=arc-20160816; b=f566sSWWMPnBmGwNiVxwic/Iyue+zEGB7AkmjXJ+uL1haJEGM1IxVlHOjc9CkcwWyt k1SPeGgX7pWn5Kr1B2V5KL+jnWigkSMJnIgScMGijQ33rn29WHzhJsZPwFWtfP34mu8H EZ3ackVb3xCoITFgvDGhemb4gzZlWMCpbZA1c7bsi+IyDIkaabl6963Vitg91UG6BCEp jAHjsiIO1kdZ+XNaturv38sbcwANrS15W5TiO1mM6Mo0T3YywSrSKUe5Qofv52/x5zMP nAp5OTU616rY3chFQvP2h0tZkjJt5ak37HdeLnrLF6H2+vsqD+9kY8oE5hnK0IviuK6F tnFw== 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=VfqM9nJ+eUXKnSpJefaZ/Ldx/CyRWtfsAx0d7KHwqPI=; b=V5vN16HMeOY4vmvwVxR3IwpcdBB+BZi8bvy3LKf3GIzLrfEajNAHtnG78ZefzeWVuB bMF09vnMsejQTyH2USEdH4fgUYi4HQfdz2cxstU5pO67YQXGgGQEAJ7VMPctzXRKiGkG WB27F5BCGnJvp6GXOudoDQl5gcdZ4/YfqzPKnVGiBL1UPwyGO9nC3qGOtGREXJUJ9Xu+ QfF2CINJWzWvG13NuIMulMR0q9xBYA0FH5HVsQXOdqwnofGrJS5cNNkceeT1G1iRRpeH f32otFl9SOrpCVFg93xjWvoZIkxPk8cl1RITKZnzhoV8TubKgKiElnxI5TwU4SZOdc3C au7w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id f24si132962edw.3.2020.04.14.00.15.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 00:15:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03E7FisE010730 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Apr 2020 09:15:44 +0200 Received: from [167.87.42.238] ([167.87.42.238]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03E7FgPE031161; Tue, 14 Apr 2020 09:15:42 +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> From: Jan Kiszka Message-ID: <9ee8eecd-56df-6152-178e-190d7961396c@siemens.com> Date: Tue, 14 Apr 2020 09:15:41 +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: <20200414090524.04d023f1@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 2yHaXQ+bmjb9 On 14.04.20 09:05, Henning Schild wrote: > 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? This may cause artifacts being distributed that shall not. ${S} may contain a complete git repo while ${D} shall only contain some selected files of it. > >> find . -maxdepth 1 ! -name .. -and ! -name . -and ! -name >> debian | \ >> - sed 's:^./::' > ${WORKDIR}/${PN}.install >> - mv ${WORKDIR}/${PN}.install ${D}/debian/ >> + sed 's:^./::' > ${S}/debian/${PN}.install >> >> deb_debianize >> + >> + cat <> ${S}/debian/rules >> + >> +override_dh_install: >> + dh_install --sourcedir=${PP}/image >> +EOF > > Because this looks confusing and will break if people already had their > own override ... for some weird reason. > > And because of the hidden API "change" i commented on in the other > patch. I can write a small changelog entry, but I don't see any point in addressing purely hypothetical user issues by copying stuff around - which may even not be as simple as you think. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux