From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6546088382730076160 X-Received: by 10.80.250.8 with SMTP id b8mr1830080edq.11.1524131108018; Thu, 19 Apr 2018 02:45:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.192.24 with SMTP id r24ls3589606edb.3.gmail; Thu, 19 Apr 2018 02:45:07 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+C1K39JsPdNHqUOV7SaRsuSQ/hZmInEqim8hsKbLt1mO+qiBVDsZnY6KD5M1t6YA39WS7o X-Received: by 10.80.165.200 with SMTP id b8mr1828408edc.1.1524131107440; Thu, 19 Apr 2018 02:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524131107; cv=none; d=google.com; s=arc-20160816; b=htRKo7O18g+xiGEOmYPH2mVPpWUSPdqqfu2LlMNa52e1swz3ueat813cT9+Rx8BWvW thWG5poy8RCTCkWJzQGtzM5LKS584a5vC8ZS+PO6klYFMIQwP161HUxSczWnR5EE15WS q8QAOiCxk8sYG9u8pu68mOX2s5hu8R7FI/HSVvvXWlxUAj8ZVvxIJ9my8fzDNAQWr7N+ ruh/7gAnMAKp5u8/agsB7efOByAVCchAiGMrrJUZbUotH+FjUmKQre7l81kd9InP9DNY gQSjvcOVroeluTeIBoyblZWmZ8UKW6YQXeeR75pHRjYyiN6s5iJrZJZFnfs30MzaSo1Q 5AzQ== 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:openpgp:from:references:to:subject :arc-authentication-results; bh=bpnuVCOdp7RXy0++nglhfsom6R5BxZJx8Li3os2FQKg=; b=dZNIplFJuPXg0jNWEb4T921weqnSK28boImotRpnFIISkwRMHNM7rCnkzRj1+9hQmL VIcbeXpxfEsfnntTJP8M7HiAPPnGc1211yAAvjn8qZjduiNI12VUpZhKOvwbluZIVt6c /9ZKa9x3zZiiIF8OJqoJYuVf0BHG32btfVYWfqzK8FvOQA+RhW86i2xgXUwNmbsYt9/h l8DDe4jVsqiuNyaOYbzgvuRftruLEdAPhIAk66UJ5bAu2/8Wz9gZG3+uUtrv6gjV/G26 oHqBPQ3B9pMUEjMVxloX8WA/qlVIFvcELqFYrN75PI1IyVLAfbDZKKQBo/fXIdEEA2FW tCEw== 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 Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id r7si133676edc.5.2018.04.19.02.45.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 02:45:07 -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 Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w3J9j6L4004457 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 19 Apr 2018 11:45:06 +0200 Received: from [167.87.42.84] ([167.87.42.84]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w3J9j6Or008472; Thu, 19 Apr 2018 11:45:06 +0200 Subject: Re: [PATCH] Correctly use the bitbake variable S from now on To: Henning Schild , isar-users@googlegroups.com References: <20180419092602.7791-1-henning.schild@siemens.com> From: Jan Kiszka Openpgp: preference=signencrypt Message-ID: <17ad58e3-a7f1-384e-cd8b-3cbb1caa53b8@siemens.com> Date: Thu, 19 Apr 2018 11:45:05 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20180419092602.7791-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: NTXpGHeSLBIx On 2018-04-19 11:26, Henning Schild wrote: > 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. Yeah, I missed that when migrating Isar from SRC_DIR to S. > > 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" Should we promote this pattern now or destsuffix? > > 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 "") That's not equivalent, but I'm undecided if it matters. S should never be unset (bitbake.conf holds the default). So we could just pull S and let the build fail if that assumption should ever be wrong. > > 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)}" > > Otherwise: Reviewed-by: Jan Kiszka Jan