From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6546088382730076160 X-Received: by 10.46.153.73 with SMTP id r9mr317034ljj.6.1524129971309; Thu, 19 Apr 2018 02:26:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.158.196 with SMTP id h4ls709180ljk.7.gmail; Thu, 19 Apr 2018 02:26:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx49xOctT4X92kpkiJGAZMffXVbE2asJdPahZqTHZ6MWBsQaA6aGKFV9mfxnTLjz/A7Nr+HCv X-Received: by 10.46.7.17 with SMTP id 17mr293117ljh.23.1524129970723; Thu, 19 Apr 2018 02:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524129970; cv=none; d=google.com; s=arc-20160816; b=Xi6zDW/Dpg3AuQ9BkV0YTNriUDNO6nGj4yLvFNwIQEJlL71AgevyFxJf1ZhxXzGAGs 1ujPL77a1VKuDp/WpzB0EhDHJ449fr+pHa/B1MT2FE6WqXhSLPfFfd/69BSv0H/Obx3H cbFlvnCqApKZbdk+dS23mSqYGyXmwiAwNxFmxFmGDNRjBA0Vbutq/3jQ1fl9zYPoIzWN F8ciWbZw4yR23tKKeS0ZTscAI4yX8BSbWrRBL2yDTpfdJjP4Whm0Z5FxrO7VfTPiFv92 xVF9pAuTQ29kn9rsJjdJ1/zKA4FbUVFhzZIlG7GMMBN8zKb9NgRiawJNRCa4D5TrwXql 02dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=k6lDlmiWuLOVp852VuQkJa8vaSQq8QpZhD16Vf0IbMU=; b=U4rZz+txLU6pLXVgIHYp1jpvaAgr0MrnOntc2AqALoL1ON+yi1s0Vd0zC/2IW5ruWg SrkhcCtF6MQhuj+GNWSpynsV4N5dAliP/5iqYtR8N8GXvmXhCww1SqzBvjQSOg9KIgco iMP6z89LmlesiSmfaILXlBB8oD452m7s/1wzHZ3P/h/WI9E0OMgDmmnG/G91s6nal5+n 3aChFwOo0UiyJGkWnF6V/w7Ost1y6yjr71H34a6qcuwyzUuExRIv49HZXnK8+TvVF5Vp EH1xbSFG+pIMkeWTrBD4lefCzPZiXiqSfSTHU98yeXc7E07EF14K+akgIGHZrENpUlHK t2KQ== 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 Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id p138-v6si165600lfd.0.2018.04.19.02.26.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 02:26:10 -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 Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w3J9Q9UQ019289 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 19 Apr 2018 11:26:09 +0200 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w3J9Q9i9003038; Thu, 19 Apr 2018 11:26:09 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Henning Schild Subject: [PATCH] Correctly use the bitbake variable S from now on Date: Thu, 19 Apr 2018 11:26:02 +0200 Message-Id: <20180419092602.7791-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUID: yMT1Q9J0v+XD S is defined as ${WORKDIR}/${P} so it already contains ${WORKDIR} by its definition. In Isar it was often concatinated with WORKDIR again. One example where this was a problem is if you specified a patch in SRC_URI but did not actually overwrite S. Align the use of the variable with OE and bitbake defaults again. Impact: layers building on top of Isar will have to adjust their recipes like the internal ones needed modification. The suggestion is to not set S and make sure to unpack to ${WORKDIR}/${P}. When setting S make sure to include ยง{WORKDIR}. This patch also introduces a warning and tries to preserve the old behaviour a bit. However if your recipe uses patches in SRC_URI and sets S you will get the warning and do_patch will fail. Signed-off-by: Henning Schild --- doc/user_manual.md | 2 +- meta-isar/recipes-app/example-hello/example-hello.bb | 4 +--- meta-isar/recipes-app/libhello/libhello.bb | 4 +--- meta-isar/recipes-kernel/example-module/example-module.bb | 2 +- meta-isar/recipes-kernel/linux/linux-cip_4.4.bb | 4 +--- meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb | 4 +--- meta/classes/dpkg-base.bbclass | 13 +++++++++++-- meta/classes/dpkg.bbclass | 2 +- meta/classes/patch.bbclass | 2 +- meta/recipes-kernel/linux-module/module.inc | 8 ++++---- meta/recipes-kernel/linux/linux-custom.inc | 2 +- 11 files changed, 24 insertions(+), 23 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 2bd3793..3072bd5 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -511,7 +511,7 @@ PV = "1.0" SRC_URI = "git://github.com/ilbers/hello.git" SRCREV = "ad7065ecc4840cc436bfcdac427386dbba4ea719" -S = "git" +S = "${WORKDIR}/git" inherit dpkg ``` diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb b/meta-isar/recipes-app/example-hello/example-hello.bb index 9788ec0..d23ee6c 100644 --- a/meta-isar/recipes-app/example-hello/example-hello.bb +++ b/meta-isar/recipes-app/example-hello/example-hello.bb @@ -15,11 +15,9 @@ PV = "0.2-86cc719" DEPENDS += "libhello" SRC_URI = " \ - git://github.com/ilbers/hello.git;protocol=https \ + git://github.com/ilbers/hello.git;protocol=https;destsuffix=${P} \ file://0001-Add-some-help.patch \ file://yet-another-change.txt;apply=yes;striplevel=0" SRCREV = "86cc719b3359adc3c4e243387feba50360a860f3" -S = "git" - inherit dpkg diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index 1875831..4e75f98 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -10,9 +10,7 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260 PV = "0.1-98f2e41" -SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https" +SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https;destsuffix=${P}" SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" -S = "git" - inherit dpkg diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb index dbaf5ac..98d0aaa 100644 --- a/meta-isar/recipes-kernel/example-module/example-module.bb +++ b/meta-isar/recipes-kernel/example-module/example-module.bb @@ -9,6 +9,6 @@ include recipes-kernel/linux-module/module.inc SRC_URI += "file://src" -S = "src" +S = "${WORKDIR}/src" AUTOLOAD = "1" diff --git a/meta-isar/recipes-kernel/linux/linux-cip_4.4.bb b/meta-isar/recipes-kernel/linux/linux-cip_4.4.bb index 7502f70..e9aaa9f 100644 --- a/meta-isar/recipes-kernel/linux/linux-cip_4.4.bb +++ b/meta-isar/recipes-kernel/linux/linux-cip_4.4.bb @@ -8,12 +8,10 @@ require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ - git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-cip.git;branch=linux-4.4.y-cip \ + git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-cip.git;branch=linux-4.4.y-cip;destsuffix=${P} \ file://x86_64_defconfig" SRCREV = "4e52cc5f668c4666e31a8485725b5f4e897b3baf" PV = "4.4.112-cip18" -S = "git" - KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb index 2c93d40..751912f 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb @@ -8,10 +8,8 @@ require recipes-kernel/linux/linux-custom.inc SRC_URI += " \ - https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ + https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz;subdir=${P} \ file://x86_64_defconfig" SRC_URI[sha256sum] = "866a94c1c38d923ae18e74b683d7a8a79b674ebdfe7f40f1a3be9a27d39fe354" -S = "linux-${PV}" - KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig" diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 3c3a484..3845d8c 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -2,8 +2,8 @@ # Copyright (C) 2017 Siemens AG do_adjust_git() { - if [ -f ${WORKDIR}/${S}/.git/objects/info/alternates ]; then - sed -i ${WORKDIR}/${S}/.git/objects/info/alternates \ + if [ -f ${S}/.git/objects/info/alternates ]; then + sed -i ${S}/.git/objects/info/alternates \ -e 's|${DL_DIR}|/downloads|' fi } @@ -21,9 +21,18 @@ do_build[depends] = "buildchroot:do_build" DEPENDS ?= "" do_build[deptask] = "do_deploy_deb" +def get_package_srcdir(d): + s = d.getVar("S", True) + workdir = d.getVar("WORKDIR", True) + if s.startswith(workdir): + return s[len(workdir)+1:] + bb.warn('S does not start with WORKDIR') + return s + # Each package should have its own unique build folder, so use # recipe name as identifier PP = "/home/builder/${PN}" +PPS ?= "${@get_package_srcdir(d)}" BUILDROOT = "${BUILDCHROOT_DIR}/${PP}" do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 06f0579..c8d4ac5 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -6,5 +6,5 @@ inherit dpkg-base # Build package from sources using build script dpkg_runbuild() { E="${@ bb.utils.export_proxies(d)}" - sudo -E chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${S} + sudo -E chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${PPS} } diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 26a0c81..1559359 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -5,7 +5,7 @@ python do_patch() { import subprocess workdir = d.getVar("WORKDIR", True) + "/" - src_dir = workdir + (d.getVar("S", True) or "") + src_dir = (d.getVar("S", True) or "") for src_uri in (d.getVar("SRC_URI", True) or "").split(): try: diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index ec1c4b0..3075f44 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -18,14 +18,14 @@ AUTOLOAD ?= "0" inherit dpkg dpkg_runbuild_prepend() { - cp -r ${WORKDIR}/debian ${WORKDIR}/${S}/ + cp -r ${WORKDIR}/debian ${S}/ sed -i -e 's/@PN@/${PN}/g' -e 's/@PV@/${PV}/g' \ -e 's/@KERNEL_NAME@/${KERNEL_NAME}/g' \ -e 's/@DESCRIPTION@/${DESCRIPTION}/g' \ - ${WORKDIR}/${S}/debian/changelog ${WORKDIR}/${S}/debian/control + ${S}/debian/changelog ${S}/debian/control if [ ${AUTOLOAD} = "1" ]; then - echo "echo ${PN} >> /etc/modules" >> ${WORKDIR}/${S}/debian/postinst - chmod +x ${WORKDIR}/${S}/debian/postinst + echo "echo ${PN} >> /etc/modules" >> ${S}/debian/postinst + chmod +x ${S}/debian/postinst fi } diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 0498dfa..2643fec 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -32,7 +32,7 @@ dpkg_runbuild() { # Install package builder script sudo install -m 755 ${WORKDIR}/build-kernel.sh ${BUILDCHROOT_DIR} - sudo cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${WORKDIR}/${S}/.config + sudo cp ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/.config E="${@ bb.utils.export_proxies(d)}" -- 2.16.1