From patchwork Thu Dec 13 17:30:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 1013186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ij21zQMe"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43G80d4KBnz9s1c for ; Fri, 14 Dec 2018 09:45:53 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6E6E2129F; Thu, 13 Dec 2018 22:44:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id C1E92129F for ; Thu, 13 Dec 2018 22:44:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 7E7177E9 for ; Thu, 13 Dec 2018 22:44:08 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id j10so515748pga.1 for ; Thu, 13 Dec 2018 14:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Bj5HBBd+dfRtLjTAeEfE2m0t4IF1i/HjmcUfBcgLtrk=; b=Ij21zQMesYKG36tw97ffgxqwWye1VA23E17rWFdA+s06jaqoTnhdnUhzpIL+7cdMTp 3gxtgN+ywOHKOuFJ2zbmrA1pb30kpHqW9FOdgih55UhLqR7p05LxDCmGoRLlT7J0lI7a S4j3lK5l9OgOF7YKU+SHbTH4jsC3ghtC3/RHi22R3kb4PH/Wo3BekywTVc4gfDYG2UTA AbhOU2VIFH8DAoIXVoXc3gCqyEI5zZAAtDu63XIcG6ZHSVEZxQwFN/NKUKRf8LvM6nYL svDVyIrElNL87HdRjblDgkC5mHo4yaxL2eenMNwg3NaekrqqLwwqyS5OoJWh9Z6b1Wpr 5mvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Bj5HBBd+dfRtLjTAeEfE2m0t4IF1i/HjmcUfBcgLtrk=; b=qiF1PEsQI2ZoKgqTlyh4iG59VpP+bXKtNKn1tDbBju2jXye4Wl6CMS1DZSL0u8IP61 aTFgEnJOH6to4e31AF1QC5Td8qMjEEiwR7sxjpzvdF6qtwURyqLRPmiATIejRacL5W8j koBNSs9MOSveYHm7aqS/GNVKMiTll6Om8hqcyf0fVWXSeJ4O1tpm34QkI8e/Ne3owjZw A9Vtobn/8a5B3zJFPK98ZbnQYQYy7L3BTI7prq0xkPgKUcjfbQpfS4CBvzSTuhRwYaSY A/BxW0bwH5KLpqoRuohh5tdkACnQKKy3G8j/F4PNYnNvnI8jCcIRwrQ5H7llDtoklm82 kcsQ== X-Gm-Message-State: AA+aEWZeQsIYLOPEhbwSWKBPaHf2/agCOnQkMVwhOFO1/gXZrLu0esBh 2nekN/A7lpjWUE3qN2XGuITMosQ8 X-Google-Smtp-Source: AFSGD/Xxvp2TiAuZcXcXtDSdnmiIekgwEHxtmrajqfEdbNOi6mDGcZFYYFdXfDnMUIpzfgTSj31ppg== X-Received: by 2002:a63:cd11:: with SMTP id i17mr536552pgg.345.1544741047649; Thu, 13 Dec 2018 14:44:07 -0800 (PST) Received: from linux-x7h9.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id n70sm4358503pfi.185.2018.12.13.14.44.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Dec 2018 14:44:06 -0800 (PST) From: Martin Xu To: dev@openvswitch.org Date: Thu, 13 Dec 2018 09:30:34 -0800 Message-Id: <20181213173034.53455-1-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 2.12.3 X-Spam-Status: No, score=-0.4 required=5.0 tests=BAYES_00, DATE_IN_PAST_03_06, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Flavio Leitner Subject: [ovs-dev] [PATCH v2] rhel: bug fix upgrade path in kmod fedora spec file X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This patch removes the "Conflicts" tag and adds "Obsoletes" tag. With the conflicts tag, when a user attempts to install or upgrade with the same version as already installed, the conflict kicks in. Otherwise, such is allowed with --replacepkgs. Obsoletes is needed for the upgrade path from kmod-openvswitch to openvswitch-kmod. Fixes: 22c33c3039 (rhel: support kmod build against mulitple kernel versions, fedora) VMware-BZ: #2249788 Signed-off-by: Martin Xu CC: Flavio Leitner CC: Yi-Hung Wei CC: Yifeng Sun CC: Zak Whittington CC: Ben Pfaff --- v1->v2: adds "Obsoletes" tag needed for upgrade after renaming adds more reviewers rhel/openvswitch-kmod-fedora.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index 8d54fd734..7913dbdb4 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -33,7 +33,7 @@ Source: openvswitch-%{version}.tar.gz #Source1: openvswitch-init Buildroot: /tmp/openvswitch-xen-rpm Provides: kmod-openvswitch -Conflicts: kmod-openvswitch +Obsoletes: kmod-openvswitch %description Open vSwitch provides standard network bridging functions augmented with