From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6811501080263786496 X-Received: by 2002:a17:906:5601:: with SMTP id f1mr17331827ejq.152.1586848306983; Tue, 14 Apr 2020 00:11:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:cfd5:: with SMTP id r21ls2116473edy.10.gmail; Tue, 14 Apr 2020 00:11:46 -0700 (PDT) X-Google-Smtp-Source: APiQypJNEyKOy8VlvsgaekSUE/mgtoIz41du6NxwRUW90XtpogGeprUcIQjkeAnukjKvxiB5Di3m X-Received: by 2002:aa7:df8c:: with SMTP id b12mr19743827edy.22.1586848306530; Tue, 14 Apr 2020 00:11:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586848306; cv=none; d=google.com; s=arc-20160816; b=JbEXnN1RVA1RZV0VsfidHlIKTEaRTIUFugt/zitGFhuZ2L2gS6EdDBJqXT2Upx8zHl qJNrpVeDKk5vdQP04yZrNhDZLQemq0Ch92NnKqiCNi6itt7HaKWroI7SQJC4Z8r1u6OM AXGNCwrdHfDwS2AJCRV2Fklvqd9WVizMDJRpkfl27zOnWcOP/v447aBjMXOxWcsQPr5s uzyuYc3JSMKefpGIO0JjqhR1WiWmpndbcFwefa5GUwEQ0ZsD2yXO1hKSDKZpNxKvBPgH 0PgntQP6cOJv1NLXLMMW4AbT8l6oWay8gJ7mLzgumwgZdi3SGmsw/vUcfGU54Bknboi8 PmfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=TRjnEWsdq+fbMA5fyDDqNRcQB/9p0tdKe/aqc0lcc0w=; b=ODokhFLeSQO4IzD9cYwaanSB3QCrpPoGlCuiPUNx6+HX6eFOdJNxRj4bKZUDVFWwNV 26/c1RuEye068eHUkFVvrfsGmVX4xY7EFZOH28kPn4vq8eBB5sXsspKrAcW40W/u2YTt ZNMerKbtP0Xl5Y84ib8WMaEyI1HaHaJwIJH+9AxJBLRf0faQAWni24pDrGXQfdkAROiC DhDXkrbLMApW4hLzzQCFdq32/6JiVZJ5GS8iCmC7NTDpiyDPg7smLHia0tox9cyL5ClB tsGE1c1Krn4IYV/nsMrEA1GExuO3FOC7RBpMq6/0xX32KVXrnI+otZdHXLWiXnI0Kf8h CY8g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@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 v18si712760eju.1.2020.04.14.00.11.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 00:11:46 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@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 henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03E7BkxR004854 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Apr 2020 09:11:46 +0200 Received: from md1za8fc.ad001.siemens.net ([139.22.36.226]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 03E7BiLu025956; Tue, 14 Apr 2020 09:11:44 +0200 Date: Tue, 14 Apr 2020 09:11:37 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users , , Subject: Re: [PATCH 2/2] dpkg-raw: Correct path so that git fetching works Message-ID: <20200414091137.5def8bb8@md1za8fc.ad001.siemens.net> In-Reply-To: <20200414090524.04d023f1@md1za8fc.ad001.siemens.net> References: <20200414090524.04d023f1@md1za8fc.ad001.siemens.net> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: gSK6IBCnsVwh 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. Henning > > 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. > > Henning >