From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520199916203016192 X-Received: by 10.28.190.2 with SMTP id o2mr18776wmf.2.1518110581102; Thu, 08 Feb 2018 09:23:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.191.3 with SMTP id p3ls1569496wrh.2.gmail; Thu, 08 Feb 2018 09:23:00 -0800 (PST) X-Google-Smtp-Source: AH8x225mkFGiQLlHBkZ41oD6sKlh1HihP+1DBrw7P9Ycj8sdbDfVMl5L1AXPpEQXwkCe3KX0R5tL X-Received: by 10.223.166.209 with SMTP id t75mr228296wrc.19.1518110580537; Thu, 08 Feb 2018 09:23:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518110580; cv=none; d=google.com; s=arc-20160816; b=Sc+AU+iZrs9lPFv1/vK0U/74g26oYJlgrR3MmrQ1lCx/47KuhZia2DQIbxpT3WqiHO V8u25z8D8UmYgZ/LbI021U29m19dfWA70h/TIJL2fAdABK9WW0kQyK0H+9ZU76v+kSaX FBq1MqcOpUajkafOQ6ghuiEIa96phwu3kt1XXa2qCeId3EKlMx55uAnm4q/Z/IvQUivp 4b4CRoSvQD/5flC5tas1rJPht63UKb/g29HHiD54IjTid/s0+hyAqdfgammg2lIMPcpC a1FvoHC+h/EsiyEwpERvA4b//arqPKw6pyi0lIE9SlVju6MCIVr9d6axe+ToNTZ6tEjk 1XDw== 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:to:from:arc-authentication-results; bh=PgSIZWiF3YjPR5rltgs2fXU8TVKWK1ANqPvR0J1mdos=; b=DBgBv1R9rxJ/O9UovUFwLvuNeCD+H9perb17kLI2ZlE39rq+0HEgy/SQAz0UUbRLsw LjpZipPvbp8Ga8SO+6RM3jQdG8c/mBvyg3z+qP5rhAUy4S/ASsyuO+vicA3ZCcz3ppWV eJ6f4VVexzchsZ5iCH7JluygRg0mEc4GaZu5Ck0NB0Lhwrx4cmXG8mbHjGGZvJDESpW9 SQQamo15H0geOxHdyrIVvcN50CTs/j+YaC9BzjrJSk+qxbIXSffwUvftHGoVrNPFN1MG +/dJWUROWHOfGIkcImV6gg96HQK8zAaJ8AysjkM8t87Xwwsx4n67p+Iyyjzr7zz/sEGm rtHQ== 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 Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id s5si24358wra.3.2018.02.08.09.23.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Feb 2018 09:23:00 -0800 (PST) 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 Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w18HMxYI014742 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 8 Feb 2018 18:23:00 +0100 Received: from md1f2u6c.ad001.siemens.net (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w18HMxfh025766 for ; Thu, 8 Feb 2018 18:22:59 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v2 3/8] Replace SRC_DIR with S Date: Thu, 8 Feb 2018 18:22:54 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: z/vUF8iPMQGE From: Jan Kiszka This aligns us with OE/bitbake style. Along updating the manual, also fix SRC_REV -> SRCREV. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 6 +++--- meta-isar/recipes-app/example-hello/example-hello.bb | 2 +- meta-isar/recipes-app/libhello/libhello.bb | 2 +- meta/classes/dpkg.bbclass | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 969f6d2..0771d1e 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -513,7 +513,7 @@ PV = "1.0" SRC_URI = "git://github.com/ilbers/hello.git" SRCREV = "ad7065ecc4840cc436bfcdac427386dbba4ea719" -SRC_DIR = "git" +S = "git" inherit dpkg ``` @@ -531,8 +531,8 @@ This approach prevents duplication of the license files in different packages. - `PV` - Package version. - `SRC_URI` - The link where to fetch application source. Please check the BitBake user manual for supported download formats. - - `SRC_DIR` - The directory name where application sources will be unpacked. For `git` repositories, it should be set to `git`. Please check the BitBake user manual for supported download formats. - - `SRC_REV` - Source code revision to fetch. Please check the BitBake user manual for supported download formats. + - `S` - The directory name where application sources will be unpacked. For `git` repositories, it should be set to `git`. Please check the BitBake user manual for supported download formats. + - `SRCREV` - Source code revision to fetch. Please check the BitBake user manual for supported download formats. The last line in the example above adds recipe to the Isar work chain. diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb b/meta-isar/recipes-app/example-hello/example-hello.bb index 9d83e4c..73cca0a 100644 --- a/meta-isar/recipes-app/example-hello/example-hello.bb +++ b/meta-isar/recipes-app/example-hello/example-hello.bb @@ -17,6 +17,6 @@ DEPENDS += "libhello" SRC_URI = "git://github.com/ilbers/hello.git;protocol=https" SRCREV = "86cc719b3359adc3c4e243387feba50360a860f3" -SRC_DIR = "git" +S = "git" inherit dpkg diff --git a/meta-isar/recipes-app/libhello/libhello.bb b/meta-isar/recipes-app/libhello/libhello.bb index df5793e..1875831 100644 --- a/meta-isar/recipes-app/libhello/libhello.bb +++ b/meta-isar/recipes-app/libhello/libhello.bb @@ -13,6 +13,6 @@ PV = "0.1-98f2e41" SRC_URI = "git://github.com/ilbers/libhello.git;protocol=https" SRCREV = "98f2e41e7d05ab8d19b0c5d160b104b725c8fd93" -SRC_DIR = "git" +S = "git" inherit dpkg diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 9cd4403..06f0579 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}/${SRC_DIR} + sudo -E chroot ${BUILDCHROOT_DIR} /build.sh ${PP}/${S} } -- 2.13.6