From patchwork Tue May 4 06:24:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guzowski Adrian X-Patchwork-Id: 1473631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=exatel.pl header.i=@exatel.pl header.a=rsa-sha256 header.s=mail header.b=OOc8sWku; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FZ91w5f76z9sSs for ; Tue, 4 May 2021 16:30:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5C6CD40FAE; Tue, 4 May 2021 06:30:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zXp7A2hGxj28; Tue, 4 May 2021 06:30:08 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTP id 300C340F90; Tue, 4 May 2021 06:30:06 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id E524CC002A; Tue, 4 May 2021 06:30:03 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id CC1CCC001C for ; Tue, 4 May 2021 06:30:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A4AB9842F4 for ; Tue, 4 May 2021 06:30:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=exatel.pl Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qq8stRAHfoax for ; Tue, 4 May 2021 06:29:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from seg-perk.exatel.pl (seg-perk.exatel.pl [195.136.20.206]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3C68784312 for ; Tue, 4 May 2021 06:29:59 +0000 (UTC) Received: from slpapp024.ad.exatel.pl (unknown [192.168.95.33]) by seg-perk.exatel.pl (MTA) with ESMTP id 4FZ8vP5tzCz2pBc for ; Tue, 4 May 2021 08:24:33 +0200 (CEST) Received: from SWPAPP2002.ad.exatel.pl (unknown [192.168.95.184]) by slpapp024.ad.exatel.pl (Postfix) with ESMTP id ADA5347DC9C for ; Tue, 4 May 2021 08:24:33 +0200 (CEST) Received: from SWPAPP2001.ad.exatel.pl (192.168.95.183) by SWPAPP2002.ad.exatel.pl (192.168.95.184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Tue, 4 May 2021 08:24:33 +0200 Received: from SWPAPP2001.ad.exatel.pl ([fe80::8006:981e:47c6:523f]) by SWPAPP2001.ad.exatel.pl ([fe80::8006:981e:47c6:523f%5]) with mapi id 15.01.2176.012; Tue, 4 May 2021 08:24:33 +0200 To: "dev@openvswitch.org" Thread-Topic: Add ability to override default Release suffix in RPM packages Thread-Index: AQHXQK4lSWRYFQgTr0W8WDa3TmT9Jw== Date: Tue, 4 May 2021 06:24:33 +0000 Message-ID: Accept-Language: pl-PL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.157.31] x-c2processedorg: c1cbd27c-e2bd-4ee0-b00a-619935df9462 Content-ID: <234E4FFC70257542925BCDCAB124E83E@exatel.pl> X-Content-Scanned: Fidelis Mail MIME-Version: 1.0 x-msw-jemd-newsletter: false DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=exatel.pl; s=mail; t=1620109474; bh=eoEMLJ7zFu26AAjKdHhBiKEOEiek/GKPifAmRTke32w=; h=From:To:Subject:Thread-Topic:Thread-Index:Date:Message-ID: Accept-Language:Content-Language:Content-Type:Content-ID: Content-Transfer-Encoding:MIME-Version; b=OOc8sWkuXAXhKGFUb47E8mug5n4mVti6hgtHPfTkIqaaxOOiGa4Ie941FecMcLwZ6 CXyWaMmRLcSOVcPSMM7foz+iMvaxkUOT3llzvsGWOqJawilsYwjp93eEN27adWEO1I zSIRCA7DWJdChFDh3HHQCjBrC6Jm8vPtG15fiST8MX3xmbZFpTmKm3KoM1seDkgBSo ggSZxIPy/aYfo+lLWXVmzwQPLECWwYXivevCh/oCttriVd5lHzwRnSS1YjEG/zEK9+ Zwuc+hANNtdsExKel3N/tgt+Rp/S5DcRN0Raqc4/Zs8NOmr19zL3//2TzG6OQXNjBF ygjBPYa20jJWg== Subject: [ovs-dev] Add ability to override default Release suffix in RPM packages X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Guzowski Adrian via dev From: Guzowski Adrian Reply-To: Guzowski Adrian Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" In some cases, like building OvS packages in Jenkins, it may be useful to set a custom version suffix that will correspond with job's build number, etc. Currently, version number is explicitly set to 1. This change adds a define "release_number" that may be overridden during package bulding process: rpmbuild -ba --define="release_number X" ... Signed-off-by: Adrian Guzowski --- rhel/kmod-openvswitch-rhel6.spec.in | 3 ++- rhel/openvswitch-dkms.spec.in | 4 ++-- rhel/openvswitch-fedora.spec.in | 4 +++- rhel/openvswitch-kmod-fedora.spec.in | 4 +++- rhel/openvswitch.spec.in | 4 +++- 5 files changed, 13 insertions(+), 6 deletions(-) -- 2.30.2 Spółka wpisana do rejestru przedsiębiorców w Sądzie Rejonowym dla m. st. Warszawy, XIII Wydział Gospodarczy, pod numerem KRS: 0000044577, kapitał zakładowy: 576 854 559 PLN, kapitał opłacony w całości, NIP: 527-010-45-68, BDO: 000250055, EXATEL SA, ul. Perkuna 47, 04-164 Warszawa. Niniejsza wiadomość jest własnością EXATEL SA i może zawierać informacje poufne i/lub prawnie chronione. Jeśli nie są Państwo właściwym adresatem (lub otrzymali Państwo tę wiadomość na skutek pomyłki), prosimy o tym fakcie niezwłocznie poinformować nadawcę i usunąć otrzymaną wiadomość. Każde nieautoryzowane kopiowanie, ujawnianie lub rozpowszechnianie załączonej informacji jest zabronione. This e-mail is a property of EXATEL SA and may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail by mistake) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden. diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in index 7d3d9b498..de69863d7 100644 --- a/rhel/kmod-openvswitch-rhel6.spec.in +++ b/rhel/kmod-openvswitch-rhel6.spec.in @@ -9,10 +9,11 @@ # without warranty of any kind. %define oname openvswitch +%{!?release_number:%define release_number 1} Name: kmod-%{oname} Version: @VERSION@ -Release: 1%{?dist} +Release: %{release_number}%{?dist} Summary: Open vSwitch kernel module Group: System/Kernel diff --git a/rhel/openvswitch-dkms.spec.in b/rhel/openvswitch-dkms.spec.in index a47c038fd..c8a978a17 100644 --- a/rhel/openvswitch-dkms.spec.in +++ b/rhel/openvswitch-dkms.spec.in @@ -8,10 +8,11 @@ # without warranty of any kind. %define oname openvswitch +%{!?release_number:%define release_number 1} Name: %{oname}-dkms Version: @VERSION@ -Release: 1%{?dist} +Release: %{release_number}%{?dist} Summary: Open vSwitch kernel module Group: System/Kernel @@ -27,7 +28,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # conflicts with the openvswitch-debuginfo package for OVS userspace). %undefine _enable_debug_packages - %description Open vSwitch Linux kernel module. diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index e457fa679..90f242b1f 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -44,6 +44,8 @@ %define _rundir /run %endif +%{!?release_number:%define release_number 1} + Name: openvswitch Summary: Open vSwitch Group: System Environment/Daemons @@ -54,7 +56,7 @@ Version: @VERSION@ # lib/sflow*.[ch] files are SISSL # datapath/ is GPLv2 (although not built into any of the binary packages) License: ASL 2.0 and LGPLv2+ and SISSL -Release: 1%{?dist} +Release: %{release_number}%{?dist} Source: http://openvswitch.org/releases/%{name}-%{version}.tar.gz BuildRequires: gcc gcc-c++ diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index ff190064f..e5f78701f 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -25,6 +25,8 @@ #define kernel %{kernel_source} %{?kversion:%define kernel %kversion} +%{!?release_number:%define release_number 1} + Name: openvswitch-kmod Summary: Open vSwitch Kernel Modules Group: System Environment/Daemons @@ -34,7 +36,7 @@ Version: @VERSION@ # The entire source code is ASL 2.0 except datapath/ which is GPLv2 License: GPLv2 -Release: 1%{?dist} +Release: %{release_number}%{?dist} Source: openvswitch-%{version}.tar.gz #Source1: openvswitch-init Buildroot: /tmp/openvswitch-xen-rpm diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index ee8b3c9ea..220e5c747 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -21,6 +21,8 @@ # testing out of tree kernel modules the appropriate openvswitch-kmod # package should be installed first. +%{!?release_number:%define release_number 1} + Name: openvswitch Summary: Open vSwitch daemon/database/utilities Group: System Environment/Daemons @@ -29,7 +31,7 @@ Vendor: Nicira, Inc. Version: @VERSION@ License: ASL 2.0 -Release: 1 +Release: %{release_number}%{?dist} Source: openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm Requires: logrotate, hostname, python >= 2.7, python-six