From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:a17:902:b412:: with SMTP id x18mr20246970plr.236.1571670669385; Mon, 21 Oct 2019 08:11:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:5984:: with SMTP id p4ls2923586pli.3.gmail; Mon, 21 Oct 2019 08:11:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzQtPXwh0rah2j99CHWYYGGXxEGPTvTtL8o5W4GLtMPcR+QgA8qnVprFl02TbzvMtpcgkUj X-Received: by 2002:a17:90a:9f42:: with SMTP id q2mr29557018pjv.95.1571670668982; Mon, 21 Oct 2019 08:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571670668; cv=none; d=google.com; s=arc-20160816; b=kt0u4mYvK4QjCP8r8aOBvQwdvV8yZIPEj0FB17w84QZZA9ELvHm4s3PrHTu7q726Ov GEfRLz6HdbelieXa7r5v/ZW2tvJAglJLOcU0hCtz+L7wsoHTBLIBvbTWywKGdmMVsOeK pUy87eSGeLc/SY0gleNRXYKsxuTyaXsyC4HgE7no3n3NN0DPdjt+foVq2tjcxZiaHgf3 onvLnv3rBIyhjdgL0pdNmaLCUja5APg47K+uz41rMyvarosKZIeMKAXXndoT11elWN1k eeSbU9yweS48tX+LSuxwz5OYU/YNR0Xz6iIcu1DaOdQ0tobplKVfOh1bvImwgBFuyGBM B16g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=DuKR3iFArxl8pca7mHc1eMWBuoxoQpBwMD6AW2L8oOM=; b=eZ4i2DFmzgvxz6QA1kzyPE6e23XUPMAbBUDFyM67LIFxzCuygKAH+TS1OnB/aVYTPQ oBUGT2UMeEdasYRgiGQV1apT2a5MorAaPAu2/FteUz19z5a42gUhGp3utXBnDdvL4Ctq XNrMjj2vSPdAJAwvfxu96LqEW4yBDXfONHmYfvnLERW5Cf3zOwwQI3M3rb9L6k7Fi04z KbFpzCQ7rO1x6Sn5UlnfIewNVYwEg4MdI75pmTAzOFCf0HUCig/0Cxid5ase97jULNu6 q3zsvOUt73qZ0wbf7ckUjELx1124dNfplaP51BKBZvzH1kfZ88s5tcC3H2masPMV3tRn 6X6Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id b1si727956pjw.1.2019.10.21.08.11.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 08:11:08 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: eLV18LE5CSs7WmPCmt2URQM3bplEb+48iD8Rh5YMrkMkDrlQACXbnwoFiQBK8OVQ0OJxGBj/91 2D66E/Fl0euNPZ6Z7Ao5JYajxJFxkOyulV2ejvKPaNE/cwHWlhpGwLm5KnTRauOrHDZi15bKT5 l9syy6bKL+02TLKhtPCij6U0/JFWy9o6bdWMdVA7xbVR9KBKmg3SSt0Q4Rqe1GhsD7Lb3juF0g xvv0pOrjRXe/wc8SRfd3J+DKNQWP8n/DdeVbjxjsg56wzU5D6b7SySofOq39bqKGdZCzznSb+3 oRI= X-IronPort-AV: E=Sophos;i="5.67,323,1566892800"; d="scan'208";a="42440948" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 21 Oct 2019 07:11:08 -0800 IronPort-SDR: dtzAMRJ3r9iHUZCIA0ER08jk3GAdBjK3LmNTKhgdypHM0mm44Ew/+B1lN54m0SpPGRCb9BvPpw kgIbXIlyBiypKKincy2k/duciex/9RwBHS0YsWKGOOCFSmM01GslzzUqxV/4/04k6zXAf/QY+e cFXPkpycJWJCSUV+xySGnJDqpZLGZ3vccZgwgnvFaGn3TNv53kJCGJQJ3v87peLgJbqhFg7Jia 44mP6JoHMnz2eHGt+PnJZuPfSTja9bvxnXgTdraHb+pS3E8ff7to+1/HEfJoaZ2mmG6IzZfgl5 O94= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v2 5/5] hello: add a sample patch to exercise patch.bbclass against dpkg recipes Date: Mon, 21 Oct 2019 17:10:55 +0200 Message-ID: <1571670655-818-1-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571670492-767-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571670492-767-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Cedric_Hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: g/Xv1HHtAIc+ Signed-off-by: Cedric Hombourger --- .../files/add-built-by-isar-to-version.patch | 22 +++++++++++++++++++ meta-isar/recipes-app/hello/hello.inc | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 meta-isar/recipes-app/hello/files/add-built-by-isar-to-version.patch diff --git a/meta-isar/recipes-app/hello/files/add-built-by-isar-to-version.patch b/meta-isar/recipes-app/hello/files/add-built-by-isar-to-version.patch new file mode 100644 index 0000000..1ae879a --- /dev/null +++ b/meta-isar/recipes-app/hello/files/add-built-by-isar-to-version.patch @@ -0,0 +1,22 @@ +diff -uNr hello-2.10.orig/debian/patches/add-built-by-isar-to-version.patch hello-2.10/debian/patches/add-built-by-isar-to-version.patch +--- hello-2.10.orig/debian/patches/add-built-by-isar-to-version.patch 1969-12-31 19:00:00.000000000 -0500 ++++ hello-2.10/debian/patches/add-built-by-isar-to-version.patch 2019-10-21 10:46:18.865268349 -0400 +@@ -0,0 +1,13 @@ ++Index: hello-2.10/src/hello.c ++=================================================================== ++--- hello-2.10.orig/src/hello.c +++++ hello-2.10/src/hello.c ++@@ -169,7 +169,7 @@ Report bugs to: %s\n"), PACKAGE_BUGREPOR ++ static void ++ print_version (void) ++ { ++- printf ("%s (%s) %s\n", PACKAGE, PACKAGE_NAME, VERSION); +++ printf ("%s (%s) %s (built by Isar)\n", PACKAGE, PACKAGE_NAME, VERSION); ++ /* xgettext: no-wrap */ ++ puts (""); ++ +diff -uNr hello-2.10.orig/debian/patches/series hello-2.10/debian/patches/series +--- hello-2.10.orig/debian/patches/series 1969-12-31 19:00:00.000000000 -0500 ++++ hello-2.10/debian/patches/series 2019-10-21 10:46:02.049662973 -0400 +@@ -0,0 +1 @@ ++add-built-by-isar-to-version.patch diff --git a/meta-isar/recipes-app/hello/hello.inc b/meta-isar/recipes-app/hello/hello.inc index 747b96b..e59ea40 100644 --- a/meta-isar/recipes-app/hello/hello.inc +++ b/meta-isar/recipes-app/hello/hello.inc @@ -8,6 +8,9 @@ inherit dpkg # this will fetch and unpack the sources from upstream debian SRC_URI = "apt://${PN}=${PV}" +# modify the output of the --version option to demonstrate how to patch upstream packages +SRC_URI += "file://add-built-by-isar-to-version.patch" + MAINTAINER = "isar-users " CHANGELOG_V = "${PV}-99+isar" -- 2.20.1