From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6811501080263786496 X-Received: by 2002:a1c:147:: with SMTP id 68mr9374305wmb.28.1585926181125; Fri, 03 Apr 2020 08:03:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:968f:: with SMTP id y137ls1268973wmd.3.canary-gmail; Fri, 03 Apr 2020 08:03:00 -0700 (PDT) X-Google-Smtp-Source: APiQypJ/pjXycRA8OcUr0FrWnHkDlvi3M2CNftVk4bmLvMZeWGKpMU5La4EywtJh33unpkj3elHZ X-Received: by 2002:a1c:7d88:: with SMTP id y130mr9547508wmc.5.1585926180348; Fri, 03 Apr 2020 08:03:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585926180; cv=none; d=google.com; s=arc-20160816; b=hNKq32C1YPQsZtbD4v84QYJElzhCgTebNqS1yu78C8rnE3cCsH6pZltGPSEbwYncUr B4GPsR4x3e0fzbyfApCpMvp1ur2NmGH0k+Au00Dpz8EXtwIGVCKGk44fVTlizG9OmlxH oT6nTXaPtwYqM0mLBN89DM8HpSYlKmsHM4/T22B8GohaU/c66HT62ua8fBGQKGk5svBm f7zDqnnpr7v66qfXb16tOXK8ZSBFRNVNpYAN1KF06mqL0/Gboa6m44vl7LScZn63E4j8 YzZ98RapySQJILv1TglgjW+vVkF7Ck/CPoZZRTfMT0hUawgQLOdPynvOHw0/DNL+yilB /y/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=HqE8aPRxbfamyJG8fRHbd7/mL02EfFK/Uikl+IDIoaI=; b=U2I69aVR7xRq/CV8nUwqweMePwePF37Waq1+OP3b7/yw0kpHaol39hpF+55yk58e9U HBlxuKvZuTj3QZMfrS37vsKnVYWxVS5hs+8Zsx8Mu3PpoAoAqAMQoY/BBBau31FcfEyC bp9QkhOxcwtjFnVqrYfnBZwG3OjpzMTbOqqVK/yp4N2Yaup/0Q5oEowwSKS6EImJytG+ Af6GPhAxSVN9gaEpYVSrImED3F7aOXddkrdSEcyVp9zurXHsLCDq5LbGJ1GcuaqZ3ySb RkrPbfNXLFT1Da/96JBmSEzrjNXuh5NY3S0d27596hVvWSKT3vtbV6t3QtAMjdE3l6gw 9AaQ== 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 r8si303790wmh.2.2020.04.03.08.03.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Apr 2020 08:03:00 -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 033F2xq8007855 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 3 Apr 2020 17:03:00 +0200 Received: from md1f2u6c.ww002.siemens.net ([139.22.137.14]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 033F2vfO007838; Fri, 3 Apr 2020 17:02:58 +0200 From: Jan Kiszka To: isar-users Cc: sven.schultschik@siemens.com, cedric_hombourger@mentor.com, henning.schild@siemens.com Subject: [PATCH 2/2] dpkg-raw: Correct path so that git fetching works Date: Fri, 3 Apr 2020 17:02:57 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 9Ro9OGa5sMEW 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} 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 } -- 2.16.4