From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6523981284478287872 X-Received: by 10.28.69.194 with SMTP id l63mr1539127wmi.18.1518982804116; Sun, 18 Feb 2018 11:40:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.28.206.133 with SMTP id e127ls1095061wmg.10.canary-gmail; Sun, 18 Feb 2018 11:40:03 -0800 (PST) X-Google-Smtp-Source: AH8x226Bs1kQS9VBahVatF9aajbcAsnz8y+9HZDQBvDKIG5SLyxZLpqNH3V/zc0SNP2nOuyOlGGJ X-Received: by 10.28.91.79 with SMTP id p76mr2045881wmb.19.1518982803524; Sun, 18 Feb 2018 11:40:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518982803; cv=none; d=google.com; s=arc-20160816; b=bEZtfZ1ldQvJAXliCwXbBeGRctZbajKMAHUw6qZGFMF7Pz2zIRd/RYleZrirfC4wGM 5JVBD6eW4e6zEBpDspnQzFiXPv0XEKOO/eZE/VEQoxijS+TA1ZC5hEqwsvFBgRRnkjWU rU6W+971rpjzAXTWJj6PaiFltNP97mIuLzJX+ePmGaXEQfqfHpRupC8a81LnmIDzC5Ab bvHQmuwQskzgokZt0gCT0kFCzAPtbRnp30ZMn/UiwCJiRj+2wkZoIg46m/5iCwIF99SY WcDPf4WyaUZGBFEggvwI9Se5XwyUtXft5s4w1FFQZV/+cbmICZ+jz4AqHDt0AnydcmHB zFdg== 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:to:from:subject :arc-authentication-results; bh=CuDjAoU39eKrzJOggudoXLPZVwCP5O6LZHgNooRebYU=; b=0oSKznvWZ1X5ErxQdZJI8xjooAC6tuUQIGE+Y0Se+jRN9YwktNAf3YbuX4+vTsih/H ni/x9sCClnxSgCie+XJaY/f07CI3J5pdZ3CELNQcOX3VeVEKRg7lR78PXtkdOdupjZX3 U6hloMt8qrUHf9+OEAH2wO/IkYL35qjxZz40Kv8QUtmeEYbzC1oImO9BS2EZdcotQ1gd qkq0AIC2/mBZI99GOjL2OkjGMgtqo9iP8Z1Geu+v8oNNoFWRt0nKpCyA75A8PZxYMTV2 bE1rdIYxD04eE0VlkO0PkLBysY3g121lGeFb7dJqpw9aRpoYZX92K+wD3I5NtPFDddeR ylOQ== 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 v8si455551wrg.2.2018.02.18.11.40.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Feb 2018 11:40:03 -0800 (PST) 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 mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w1IJe23A031347 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 18 Feb 2018 20:40:02 +0100 Received: from [167.87.27.66] ([167.87.27.66]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id w1IJe20Q024587 for ; Sun, 18 Feb 2018 20:40:02 +0100 Subject: [PATCH 2/2] example-app: Add two patches for demonstration and testing purposes From: Jan Kiszka To: isar-users References: <389542c1-1367-2639-a13c-ebbb9318c05b@siemens.com> Message-ID: Date: Sun, 18 Feb 2018 20:40:02 +0100 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: <389542c1-1367-2639-a13c-ebbb9318c05b@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: siId4rgJpwjZ From: Jan Kiszka This stresses repo patching, patch ordering, strip level and the apply parameter. Signed-off-by: Jan Kiszka --- .../recipes-app/example-hello/example-hello.bb | 5 ++- .../example-hello/files/0001-Add-some-help.patch | 40 ++++++++++++++++++++++ .../example-hello/files/yet-another-change.txt | 11 ++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch create mode 100644 meta-isar/recipes-app/example-hello/files/yet-another-change.txt diff --git a/meta-isar/recipes-app/example-hello/example-hello.bb b/meta-isar/recipes-app/example-hello/example-hello.bb index 73cca0a..9788ec0 100644 --- a/meta-isar/recipes-app/example-hello/example-hello.bb +++ b/meta-isar/recipes-app/example-hello/example-hello.bb @@ -14,7 +14,10 @@ PV = "0.2-86cc719" # for now it's the only way to correctly build bitbake pipeline. DEPENDS += "libhello" -SRC_URI = "git://github.com/ilbers/hello.git;protocol=https" +SRC_URI = " \ + git://github.com/ilbers/hello.git;protocol=https \ + file://0001-Add-some-help.patch \ + file://yet-another-change.txt;apply=yes;striplevel=0" SRCREV = "86cc719b3359adc3c4e243387feba50360a860f3" S = "git" diff --git a/meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch b/meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch new file mode 100644 index 0000000..3c68a93 --- /dev/null +++ b/meta-isar/recipes-app/example-hello/files/0001-Add-some-help.patch @@ -0,0 +1,40 @@ +From 4615f473881aaff12a52aa3bb625bfb38753b4f2 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Sun, 18 Feb 2018 09:02:11 +0100 +Subject: [PATCH] Add some help + +This just provides a commit to demonstrate patching in Isar recipes. + +Signed-off-by: Jan Kiszka +--- + hello.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/hello.c b/hello.c +index 269c24b..329a0c5 100644 +--- a/hello.c ++++ b/hello.c +@@ -5,10 +5,19 @@ + * version 2. + */ + ++#include + #include + +-int main(void) ++int main(int argc, char *argv[]) + { ++ while (argc > 1) { ++ if (strcmp(argv[argc - 1], "--help") == 0) { ++ printf("42\n"); ++ return 0; ++ } ++ argc--; ++ } ++ + say_hello(); + return 0; + } +-- +2.13.6 + diff --git a/meta-isar/recipes-app/example-hello/files/yet-another-change.txt b/meta-isar/recipes-app/example-hello/files/yet-another-change.txt new file mode 100644 index 0000000..0f8c1c8 --- /dev/null +++ b/meta-isar/recipes-app/example-hello/files/yet-another-change.txt @@ -0,0 +1,11 @@ +--- hello.c.orig 2018-02-18 09:09:26.712855740 +0100 ++++ hello.c 2018-02-18 09:09:51.969056718 +0100 +@@ -12,7 +12,7 @@ int main(int argc, char *argv[]) + { + while (argc > 1) { + if (strcmp(argv[argc - 1], "--help") == 0) { +- printf("42\n"); ++ printf("42. Or what was the question?\n"); + return 0; + } + argc--; -- 2.13.6