From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6811501080263786496 X-Received: by 2002:a19:760a:: with SMTP id c10mr12816131lff.126.1586847934181; Tue, 14 Apr 2020 00:05:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a550:: with SMTP id e16ls469852ljn.6.gmail; Tue, 14 Apr 2020 00:05:33 -0700 (PDT) X-Google-Smtp-Source: APiQypKnt4qzac52ocF6l79I0mPjG9JQiIc8v5dm12FmOenIBKW5FwrGmAVdUtCmXw4MitKffXph X-Received: by 2002:a2e:6c15:: with SMTP id h21mr9083780ljc.248.1586847933581; Tue, 14 Apr 2020 00:05:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586847933; cv=none; d=google.com; s=arc-20160816; b=jw0JtvzEekZjK3geXwq5Jf9yzVgrwcNKE3F9ODNk3LdFmPhoAnUdXmukZkCbcW0T7a 98cvrv+8Riiob31B9ZH2gE3AZW6g11/j7h6ytA+82sMSulrbvX0YRq3bB0DhcgG+zwh/ Avzobn8huKmD2Te4xqbv6QlYMCmRkFrOhEzOcU1DYNXy6QZp/WFhmNLHnbIoQr2QnkZj B48pEPwDITM9wXqAy0vHB/lhMrmGmDJRw2SLbViIiRFexs5VrBnZ4DPxjR5wvql1wLWf wmFWW8bcjkfPqv/552sODQ+eo6cFjJ+q0SGkmZVdHs35vdlgs87O+4wOgaoJD2S6bnJG 6Ltw== 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=ergd/0tIqClI3rXAfm+GANbOakfXh0xN5DYxLS13DGo=; b=HSft7S1GGLagr0CBGrGEVT4QI5snZgEVMPq36ItBhEsxCgI35Kof5vhI79jip0lzLn n7XAukEIFQvW4G9kqYc9fudlLqr5GPjtCXUQx4oKTkBqr2Sp40dOYeimQOwE6R34A3dS OwqyHZxkJCUJ8n27UvlzoZXE3uLYeRB0464QSMU27dRjBKqI/RH+/5xgIdpQZDioo1gy GCqVsKbMM7GShoN2XJ1YyrBn/5VxABm/JPZ3mc9wDQ4S/ZMzmIg92UcRe4imUT3Y64Fq qw8ygigumTFK8OYQ/wAPzTxAy5QUfqOOZ1TYnXVqiaH51+552yowmU5ng2ubyqPdCBTT +K3Q== 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 a21si668218lfr.4.2020.04.14.00.05.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 00:05:33 -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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 03E75WEw025923 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Apr 2020 09:05:32 +0200 Received: from md1za8fc.ad001.siemens.net ([139.22.36.226]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03E75UfV018239; Tue, 14 Apr 2020 09:05:30 +0200 Date: Tue, 14 Apr 2020 09:05:24 +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: <20200414090524.04d023f1@md1za8fc.ad001.siemens.net> In-Reply-To: References: 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: HVJhUgKa9+j5 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? > 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