From patchwork Thu Jul 12 17:35:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 943150 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="Xt1cHVJn"; 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 41RNRQ29yXz9rxs for ; Fri, 13 Jul 2018 03:37:06 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 777B4DCE; Thu, 12 Jul 2018 17:37:01 +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 AC70AD81 for ; Thu, 12 Jul 2018 17:37:00 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f41.google.com (mail-pl0-f41.google.com [209.85.160.41]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 238D0773 for ; Thu, 12 Jul 2018 17:37:00 +0000 (UTC) Received: by mail-pl0-f41.google.com with SMTP id s24-v6so10970212plq.6 for ; Thu, 12 Jul 2018 10:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WnXhbrbtrbDyixQ3TSifx2ywptcC0SCLaL0T3Bi8hDw=; b=Xt1cHVJnh8KAVbEc7QQK9mYUfNX6Ii15Wp4gWNdNvqcSAOgE1AzJWdLcQfb7udnEsq /Z5/1hmohpJJZCgLU5//JmWA1EvCkmAmO49Jh46EZxGopRwB87uNB5s1Wm2ELrExJ3Gb Tk77JwwJF2h2p3JMoqNXffBPO3ZRk1y16rNx+9GZDGboZtNtLDxMkSzegQnn8oaRYkD1 fvTLx43iXppJYIGEnU3nBgMUxuvNi7PKqdto/j3AUubSghJiqz0JbgYZBCGSKyXLt2NA lijt04UaJXSwFrJRzguGxmrvR1PFm6p1IOJahxXnQFXdKEEMYYW/AxvWOWxHTl0A2by1 iETQ== 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:in-reply-to :references; bh=WnXhbrbtrbDyixQ3TSifx2ywptcC0SCLaL0T3Bi8hDw=; b=Y/ZvQZqrUCocd1Ek8Ev8rmr16h7keAo7mNgOZ2nHvSfPAjD5oqdijQe3w8REFvZH5R VjO7tzRwiXHM4GWm4rTvgOhz6i2w0GLQ6ymICj7U6vDiQz3j9GIc7d8VORIqi0lOvlNT yfoFvAlUr5ovmUSXE+pMR0dJwXIibsQhofHNkpFLGQRNlVTSDbKgdlfauiFbTEtQq8Q3 Jyh5b93AkaI/Hv2CYAyHfa2V6+PH7FogAICFSN9hyEztbGYQVw9yM8EDHg8mihBAu4o1 5cnlDf2ToFmHnDE1EG65m38qQPU1nFsWEsu7GYfCX4i66kIAfzY2Z3kAP2rIFfThWuL0 CsNg== X-Gm-Message-State: AOUpUlEB/lJ1JB+DrQalEtZr3NG9ny64uThVLDwV6aNi8JUk/PIBaTZ9 vprxu1VnixZsDfesZZwkH+nfKZR7 X-Google-Smtp-Source: AAOMgpd9CN5jk6GjtMwGMK5WTvVYqgKD+R07c60sU+qBGH+cli4vEV5Vag4GSmKeOLcZZh9qEMH70w== X-Received: by 2002:a17:902:59da:: with SMTP id d26-v6mr3085004plj.42.1531417019611; Thu, 12 Jul 2018 10:36:59 -0700 (PDT) Received: from martinx-a01.vmware.com.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id j23-v6sm35500894pfi.137.2018.07.12.10.36.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 10:36:59 -0700 (PDT) From: Martin Xu To: dev@openvswitch.org Date: Thu, 12 Jul 2018 10:35:55 -0700 Message-Id: <20180712173556.40703-2-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) In-Reply-To: <20180712173556.40703-1-martinxu9.ovs@gmail.com> References: <20180712173556.40703-1-martinxu9.ovs@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham 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 v3 2/3] rhel: remove openvswitch-kmod package from build, rhel6 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 only affects rhel6 spec file. Previouly the kernel_module_package macro is used to generate spec file template to build kmod-openvswitch RPM. The main package only contains the openvswitch.conf for depmod. The macro is now removed. Everything is built in the main package instead. This effectively removes the redudant openvswitch-kmod package from the build. Signed-off-by: Martin Xu CC: Greg Rose CC: Ben Pfaff CC: Flavio Leitner CC: Aaron Conole --- rhel/automake.mk | 1 - rhel/kmod-openvswitch-rhel6.spec.in | 32 ++++++++++++++++---------------- rhel/openvswitch-kmod.files | 3 --- 3 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 rhel/openvswitch-kmod.files diff --git a/rhel/automake.mk b/rhel/automake.mk index 82a450831..180419427 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -17,7 +17,6 @@ EXTRA_DIST += \ rhel/openvswitch-dkms.spec.in \ rhel/kmod-openvswitch-rhel6.spec \ rhel/kmod-openvswitch-rhel6.spec.in \ - rhel/openvswitch-kmod.files \ rhel/openvswitch-kmod-fedora.spec \ rhel/openvswitch-kmod-fedora.spec.in \ rhel/openvswitch.spec \ diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in index daa3dade1..7b9424968 100644 --- a/rhel/kmod-openvswitch-rhel6.spec.in +++ b/rhel/kmod-openvswitch-rhel6.spec.in @@ -1,7 +1,7 @@ # Spec file for Open vSwitch kernel modules on Red Hat Enterprise # Linux 6. -# Copyright (C) 2011, 2012 Nicira, Inc. +# Copyright (C) 2011, 2012, 2018 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -10,7 +10,7 @@ %define oname openvswitch -Name: %{oname}-kmod +Name: kmod-%{oname} Version: @VERSION@ Release: 1%{?dist} Summary: Open vSwitch kernel module @@ -19,23 +19,22 @@ Group: System/Kernel License: GPLv2 URL: http://openvswitch.org/ Source0: %{oname}-%{version}.tar.gz -Source1: %{oname}-kmod.files BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: %kernel_module_package_buildreqs # Without this we get an empty openvswitch-debuginfo package (whose name # conflicts with the openvswitch-debuginfo package for OVS userspace). %undefine _enable_debug_packages +%define kernel_source_extended() /usr/src/kernels/%{2}$([ %{1} = default ] || echo ".%{1}") + +# By default, build against the latest installed kernel-devel +%{!?kversion:%global kversion %(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}' `rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1)} # Use -D 'kversion 2.6.32-131.6.1.el6.x86_64' to build package # for specified kernel version. -%{?kversion:%define kernel_version %kversion} # Use -D 'kflavors default debug kdump' to build packages for # specified kernel variants. -%{!?kflavors:%define kflavors default} - -%kernel_module_package -n %{oname} -f %{SOURCE1} %kflavors +%{!?kflavors:%global kflavors default} %description Open vSwitch Linux kernel module. @@ -45,24 +44,24 @@ Open vSwitch Linux kernel module. %setup -n %{oname}-%{version} %build -for flavor in %flavors_to_build; do +for flavor in %{kflavors} ; do mkdir _$flavor - (cd _$flavor && ../configure --with-linux="%{kernel_source $flavor}") + (cd _$flavor && ../configure --with-linux="%{kernel_source_extended $flavor %{kversion}}") %{__make} -C _$flavor/datapath/linux %{?_smp_mflags} done %install export INSTALL_MOD_PATH=$RPM_BUILD_ROOT export INSTALL_MOD_DIR=extra/%{oname} -for flavor in %flavors_to_build ; do - make -C %{kernel_source $flavor} modules_install \ +for flavor in %{kflavors} ; do + make -C %{kernel_source_extended $flavor %{kversion}} modules_install \ M="`pwd`"/_$flavor/datapath/linux # Cleanup unnecessary kernel-generated module dependency files. find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; done install -d %{buildroot}%{_sysconfdir}/depmod.d/ -for module in %{buildroot}/lib/modules/%{kernel_version}/$INSTALL_MOD_DIR/*.ko; +for module in %{buildroot}/lib/modules/%{kversion}/$INSTALL_MOD_DIR/*.ko; do modname="$(basename ${module})" echo "override ${modname%.ko} * extra/%{oname}" >> %{oname}.conf @@ -78,7 +77,7 @@ done if [ -x "/sbin/weak-modules" ]; then for m in openvswitch vport-gre vport-stt vport-geneve \ vport-lisp vport-vxlan; do - echo "/lib/modules/%{kernel}/extra/$m.ko" + echo "/lib/modules/%{kversion}/extra/$m.ko" done | /sbin/weak-modules --add-modules fi @@ -90,14 +89,15 @@ if [ "$1" = 0 ]; then # Erase, not upgrade if [ -x "/sbin/weak-modules" ]; then for m in openvswitch vport-gre vport-stt vport-geneve \ vport-lisp vport-vxlan; do - echo "/lib/modules/%{kernel}/extra/$m.ko" + echo "/lib/modules/%{kversion}/extra/$m.ko" done | /sbin/weak-modules --remove-modules fi fi %files -%defattr(644,root,root) +%defattr(644,root,root,755) /etc/depmod.d/%{oname}.conf +/lib/modules/ %clean rm -rf $RPM_BUILD_ROOT diff --git a/rhel/openvswitch-kmod.files b/rhel/openvswitch-kmod.files deleted file mode 100644 index 357c2e8b7..000000000 --- a/rhel/openvswitch-kmod.files +++ /dev/null @@ -1,3 +0,0 @@ -%defattr(644,root,root,755) -/lib/modules/%2-%1 -/etc/depmod.d/openvswitch.conf