From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6520199916203016192 X-Received: by 10.28.50.4 with SMTP id y4mr197782wmy.1.1518362721876; Sun, 11 Feb 2018 07:25:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.116.12 with SMTP id p12ls627556wmc.2.gmail; Sun, 11 Feb 2018 07:25:21 -0800 (PST) X-Google-Smtp-Source: AH8x226swr8+K4mm2UBK7k0/DX9Z9K17sc0fxIeJpBP7RJCuQcO+uT6pKvCVJ+HXGihf0VIFJOe3 X-Received: by 10.28.48.88 with SMTP id w85mr194199wmw.30.1518362721315; Sun, 11 Feb 2018 07:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518362721; cv=none; d=google.com; s=arc-20160816; b=NWQkFPy+jME6a52ycOGNxsToHXfSsvcA+hdw5JAv5WupNxI9pezEetF4Ud5bueRChJ dyxHzMUT3dW/9wcknwhq5sXrHb1fIdiy9ek7jiiobUvxxmFkocUZcdZAapBr152ouiFt oPEqw3w89mdmLdxtNKR3QBDTTqkWwKCSKTEEMTrZib9tvHcPpAskIv9nR11QR77dd7gd 9KkNzQJ7L79sCI75PoJF92WCRVMmDi2kT3rMFCm2eUkmP2FkKoTrMVzS8jZXjvZ3Qqqr 1lwlaImbYn3tw5DDq54cktiIfXBLo4xpdWMTQUBUBqi1s+bu7/aMs5LqouisJkkEq+qD pk2g== 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=tNSrypoFfVEAKJHBjmf6ejL9duH+jh5wWrKTPB2t8ypRvLlpiEcyWoA1AOPAfukYk/ Akm2XsA6n5W++bMaBiEic4VnSGlnufSC6orFW2qvk2/E5/B4fzWVgPQjEqkQt+yG/vFe Y3uI7gpKeqkSBa/Cfw0A//6zrpWYg8BoldYgxO8vHHeQzxmgeQPJMnHjFpavb/OOlRFT VEcRQ7Iaywn/XKHlHT37rzg+n45xIZpDzsCb49iKKc4OplH5P4Bbv6+PMCUK32YcAlxV G4wYCyvGHG8pCumJJDawLuH4F+LQqNW4KGmuUPhEIutePi5uLXL3gSAI3frxTiQ1z4ir FpuQ== 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 k21si388428wrd.1.2018.02.11.07.25.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 07:25:21 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w1BFPKNd022646 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 11 Feb 2018 16:25:20 +0100 Received: from md1f2u6c.ww002.siemens.net ([167.87.32.7]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w1BFPKhB024517 for ; Sun, 11 Feb 2018 16:25:20 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v4 3/8] Replace SRC_DIR with S Date: Sun, 11 Feb 2018 16:25:14 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: m3chvUF1kzjO 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