From patchwork Fri Jul 29 00:09:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 653908 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3s0pyg1zmNz9t29 for ; Fri, 29 Jul 2016 10:10:19 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 12DF7113BE; Thu, 28 Jul 2016 17:10:13 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 38383113B3 for ; Thu, 28 Jul 2016 17:10:11 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id CA0C0420431 for ; Thu, 28 Jul 2016 18:10:10 -0600 (MDT) X-ASG-Debug-ID: 1469751009-09eadd7aea3481e0001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar5.cudamail.com with ESMTP id JtilMO7sA0HfZF1g (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 28 Jul 2016 18:10:09 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 29 Jul 2016 00:10:09 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.194 X-Barracuda-RBL-IP: 217.70.183.194 Received: from mfilter23-d.gandi.net (mfilter23-d.gandi.net [217.70.178.151]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id B3F1BC5A56; Fri, 29 Jul 2016 02:10:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter23-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter23-d.gandi.net (mfilter23-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id vuKJINFuzbz9; Fri, 29 Jul 2016 02:10:06 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from archer.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 0A39FC5A67; Fri, 29 Jul 2016 02:10:04 +0200 (CEST) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-727055564 X-CudaMail-DTE: 072816 X-CudaMail-Originating-IP: 217.70.183.194 Date: Thu, 28 Jul 2016 17:09:38 -0700 X-ASG-Orig-Subj: [##CM-V2-727055564##][PATCH 2/2] fedora: Prioritize OVS modules in weak-updates. Message-Id: <20160729000938.816-2-joe@ovn.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160729000938.816-1-joe@ovn.org> References: <20160729000938.816-1-joe@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1469751009 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: fbl@sysclose.org Subject: [ovs-dev] [PATCH 2/2] fedora: Prioritize OVS modules in weak-updates. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Out-of-tree modules are installed into the kernel's "extra" modules directory for the version that kmod-openvswitch is compiled against. For all other kernels on the system at install time, a symlink is created in the "weak-updates" directory. This provides a path for the same kernel module to be used when minor kernel updates are done on a system. However, without updating the depmod configuration the weak-update will not be prioritized, so modprobe will switch back to using upstream kernel modules when you upgrade. This patch introduces that depmod configuration to ensure that the out-of-tree module is always used when it is installed, regardless of kernel upgrades. Signed-off-by: Joe Stringer Acked-by: Pravin B Shelar Acked-by: Flavio Leitner --- rhel/openvswitch-kmod-fedora.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index ea89d15c8d87..93adb0330cbb 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -48,6 +48,8 @@ do modname="$(basename ${module})" echo "override ${modname%.ko} * extra" >> \ $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf + echo "override ${modname%.ko} * weak-updates" >> \ + $RPM_BUILD_ROOT/etc/depmod.d/kmod-openvswitch.conf done %clean