From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6811501080263786496 X-Received: by 2002:a05:600c:21d6:: with SMTP id x22mr23368396wmj.95.1586849654187; Tue, 14 Apr 2020 00:34:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a551:: with SMTP id o78ls3184137wme.2.gmail; Tue, 14 Apr 2020 00:34:13 -0700 (PDT) X-Google-Smtp-Source: APiQypJUHWKuFLlfGBwZoriIx275OLzRtVEySx06DmGMEcD8AUjj8UQjtVTR0khbQhf3kdthIE/F X-Received: by 2002:a1c:7fd1:: with SMTP id a200mr23316073wmd.140.1586849653508; Tue, 14 Apr 2020 00:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586849653; cv=none; d=google.com; s=arc-20160816; b=Zzn4DnjyP3CjtzwNXlurU/SqG0MXyl1iMtnifJuWj9+n96V5U8rHypLj0XFJyxBEcL KxM911U4z3xlI9PzbQTHH7eBk06l2E+/TRUOUgl4jBPtHVGQVg5W0iltb/NDFxRBEiVE V39VTl/rmEhtYUww7H/vKJ4G5Vt5SQTWW0JLLGt/7VomyLsAnxo+hNtQGnsC/+jR470E UJ/diULazduh49ThGirDu3jtsc2KTQnd3GWqxeo4A7L9QDcTkMZ+AiJP43OOIvQkc8sy I6atnqZqr2aoTuvNB4yYOwbmFl67KuXZlB3rSvqrUHagzZqWOgu3x3xXHdFGcS0k2ByL SO5Q== 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:references:cc:to:from:subject; bh=wssEObgM7IZMQxvJMzl4conKNMRfKKRnTu8tv7d6Vu0=; b=CODqPqjmfY4Q9+CtAL1Z3deYKGPEWi09EtJSX9uNRyUToW++ozcUi/f6A8LTpLO/E1 kLmndol/6U5ekR+G307Mmt1NLxRkkbaaC8Bcj2ZCHItvBNeYLt7XIeOMF3sNMTUmTOQZ LNW5WI4KtwB/HRAi7EuRGHtGCsXpQjQMtnVA908rCw1irkoQ2p+/dZIF4FvkQ0Hutbpf Hb5Cl8KcWt7XKAiw+6rzRHpReBKTJ/DjtCjSx2gCz+ng8nLTQtB+y8ZeRT/RdxV2hSJP Lg8Jy1jRj1JvC6zd8TrernhBjnlB4LiSwqsskS4hFSJDN0nbmrBldEuPQwjhfP1ogDTq FvhQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id q17si621317wmg.1.2020.04.14.00.34.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2020 00:34:13 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 03E7YDTu019309 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Apr 2020 09:34:13 +0200 Received: from [167.87.42.238] ([167.87.42.238]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 03E7Y58k023328; Tue, 14 Apr 2020 09:34:11 +0200 Subject: [PATCH v2 2/2] dpkg-raw: Correct path so that git fetching works From: Jan Kiszka To: isar-users Cc: sven.schultschik@siemens.com, cedric_hombourger@mentor.com, henning.schild@siemens.com References: Message-ID: <9641d535-013b-51d8-4862-94bd6cb2c215@siemens.com> Date: Tue, 14 Apr 2020 09:34:05 +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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: +0wmiuEFYO1v 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 --- Changes in v2: - add RECIPE-API-CHANGELOG entry RECIPE-API-CHANGELOG.md | 5 +++++ meta/classes/dpkg-raw.bbclass | 15 ++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index fc416a4f..5717daad 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -236,3 +236,8 @@ downloads from previous builds for the cache. DTB_FILES now allows to specify multiple DTBs that should be deployed for consumption by imaging classes. + +### Separation of ${S} and ${D} in dpkg-raw + +${S} can now be used for checking out sources without being linked implicitly +with ${D} which needs to be filled explicitly in do_install as before. 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