From patchwork Fri Jul 8 16:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1654254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LoMK9di2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Lfddq5xwxz9s07 for ; Sat, 9 Jul 2022 02:14:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 621148482E; Fri, 8 Jul 2022 16:14:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 621148482E Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LoMK9di2 X-Virus-Scanned: amavisd-new at osuosl.org 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 P9rAgncTyGI8; Fri, 8 Jul 2022 16:14:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id DCB198481C; Fri, 8 Jul 2022 16:14:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org DCB198481C Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0AE40C0080; Fri, 8 Jul 2022 16:14:34 +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 392A5C0033 for ; Fri, 8 Jul 2022 16:14:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id ECE3A84806 for ; Fri, 8 Jul 2022 16:14:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org ECE3A84806 X-Virus-Scanned: amavisd-new at osuosl.org 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 M3gars6_OJOk for ; Fri, 8 Jul 2022 16:14:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9087B84802 Received: from mail-oo1-xc30.google.com (mail-oo1-xc30.google.com [IPv6:2607:f8b0:4864:20::c30]) by smtp1.osuosl.org (Postfix) with ESMTPS id 9087B84802 for ; Fri, 8 Jul 2022 16:14:30 +0000 (UTC) Received: by mail-oo1-xc30.google.com with SMTP id v33-20020a4a9764000000b0035f814bb06eso4100951ooi.11 for ; Fri, 08 Jul 2022 09:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8gQrnWDOj/vhVtY59OvL5xUvRlML8rN4jn6g4eu22+c=; b=LoMK9di2AbFshv9XhN4j0++p53yM4myWZzTRDreu7VST5mZn4ipOLhNnJiG7YJ3pxk 0pli4RIu+QqJcam9zKJOhknote12txcbyAcIihmcGh/pKdLViTErzncyX2W1QlumJgLH SDc0A5pGioMVevgz7GqETRszzIdHmMj0Uj4xugajzMHV70B72EcAq0Fo6ArpqYBYS9RB JZDPTMEDvmBjasCvp4xRqjrglw7d15wjzQmjH9mfx/4fvv1K8s179DC1SwNnimO+UFXv vNDWYaMbTMK/AjH5INe7nDq8mij2X/jgW6DFpGYEUrPcEBN2V9RzY24drePBkeqN/JZP e+ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8gQrnWDOj/vhVtY59OvL5xUvRlML8rN4jn6g4eu22+c=; b=7G2cYHYQrpjgRtHoRo3ZgswMbQIZyOxOUer606/giey7zXlsQ8ywBPlWIZhfWvNTKA nBnTvh9YBosvuOBMKGkyYlY9dAEgOR8/wxNTj+V4c3ecIzHWKtLhaIgAzZvnwuYDuTqw fpUSg1uen/bjGcmSG5TQLF3ULsfM1p9KAFcmA9ov7wKP6NI3OwTzUVbMSVZ6MEMCp1Om KfjU+YnkWF8REr5/VfKl9Hzq9kf6TC3qDopm46f/DnjQmu0uCQuyTC30Y0gY6b/aq13P qVtwIVvI2ZUv0Hp1arrQCwI1y3Og5D00ywmzgMSH3Nugu6ju8EOd4VWdh+4wNjekW1Py F27w== X-Gm-Message-State: AJIora9kJTwb2bIahIMRbK3ipax0EbLcMTSXovkr02Hs0QnjXxzcWEGI 19VfK/iQER65JCwnP9WgMg8uS7xaRWk= X-Google-Smtp-Source: AGRyM1sSGbCw9EvXZcXohgCkxyqcgvP8pEMA9fjT5VEHUIgXXR6ZBS/szmPWtPFufKUDjegeKgK5ww== X-Received: by 2002:a4a:c3c1:0:b0:425:9f38:8af3 with SMTP id e1-20020a4ac3c1000000b004259f388af3mr1726560ooq.7.1657296869259; Fri, 08 Jul 2022 09:14:29 -0700 (PDT) Received: from VMware-box.domain ([97.115.145.232]) by smtp.googlemail.com with ESMTPSA id l21-20020a544515000000b00326cb6225f8sm16685885oil.44.2022.07.08.09.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jul 2022 09:14:29 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Fri, 8 Jul 2022 09:14:12 -0700 Message-Id: <20220708161417.12438-4-gvrose8192@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220708161417.12438-1-gvrose8192@gmail.com> References: <20220708161417.12438-1-gvrose8192@gmail.com> Subject: [ovs-dev] [PATCH V2 3/8] rhel: Remove RHEL 6 kernel module spec 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: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Remove the RHEL 6 kernel driver module specification. Signed-off-by: Greg Rose --- Documentation/intro/install/rhel.rst | 18 ---- poc/playbook-centos-builder.yml | 8 -- rhel/automake.mk | 10 --- rhel/kmod-openvswitch-rhel6.spec.in | 123 --------------------------- 4 files changed, 159 deletions(-) delete mode 100644 rhel/kmod-openvswitch-rhel6.spec.in diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst index b21b274b7..d1fc42021 100644 --- a/Documentation/intro/install/rhel.rst +++ b/Documentation/intro/install/rhel.rst @@ -194,24 +194,6 @@ the unit tests, run:: /lib/modules/2.6.32-279.el6.x86_64/build doesn't exist`` or similar, then the kernel-devel package is missing or buggy. -Kernel Module -~~~~~~~~~~~~~ - -On RHEL 6, to build the Open vSwitch kernel module run:: - - $ rpmbuild -bb rhel/kmod-openvswitch-rhel6.spec - -You might have to specify a kernel version and/or variants, e.g.:: - - $ rpmbuild -bb \ - -D "kversion 2.6.32-131.6.1.el6.x86_64" \ - -D "kflavors default debug kdump" \ - rhel/kmod-openvswitch-rhel6.spec - -This produces an "kmod-openvswitch" RPM for each kernel variant, in this -example: "kmod-openvswitch", "kmod-openvswitch-debug", and -"kmod-openvswitch-kdump". - .. _rhel-script-integrations: Red Hat Network Scripts Integration diff --git a/poc/playbook-centos-builder.yml b/poc/playbook-centos-builder.yml index e902db75d..b38a6c4ef 100644 --- a/poc/playbook-centos-builder.yml +++ b/poc/playbook-centos-builder.yml @@ -41,13 +41,11 @@ chdir: /git/ovs/rhel with_items: - openvswitch.spec - - kmod-openvswitch-rhel6.spec - name: Install build dependencies specified from spec files shell: echo "y" | yum-builddep /tmp/{{item}} with_items: - openvswitch.spec - - kmod-openvswitch-rhel6.spec - name: Create rpm dev tree command: rpmdev-setuptree @@ -81,18 +79,12 @@ line: "Release: {{ ansible_local.builder.release }}" with_items: - openvswitch.spec - - kmod-openvswitch-rhel6.spec - name: Build Open vSwitch user space rpms command: rpmbuild -bb --without check rhel/openvswitch.spec args: chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" - - name: Build Open vSwitch kmod rpms (only for currently loaded kernel) - command: rpmbuild -bb --without check rhel/kmod-openvswitch-rhel6.spec - args: - chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" - - name: Copy RPM packages to /var/www/html command: cp -r /root/rpmbuild/RPMS/ /var/www/html diff --git a/rhel/automake.mk b/rhel/automake.mk index 235779b49..51ee9b961 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -13,10 +13,6 @@ EXTRA_DIST += \ rhel/etc_openvswitch_default.conf \ rhel/etc_sysconfig_network-scripts_ifdown-ovs \ rhel/etc_sysconfig_network-scripts_ifup-ovs \ - rhel/openvswitch-dkms.spec \ - rhel/openvswitch-dkms.spec.in \ - rhel/kmod-openvswitch-rhel6.spec \ - rhel/kmod-openvswitch-rhel6.spec.in \ rhel/openvswitch.spec \ rhel/openvswitch.spec.in \ rhel/openvswitch-fedora.spec \ @@ -39,12 +35,6 @@ update_rhel_spec = \ < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi -$(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in $(top_builddir)/config.status - $(update_rhel_spec) - -$(srcdir)/rhel/kmod-openvswitch-rhel6.spec: rhel/kmod-openvswitch-rhel6.spec.in $(top_builddir)/config.status - $(update_rhel_spec) - $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status $(update_rhel_spec) diff --git a/rhel/kmod-openvswitch-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in deleted file mode 100644 index de69863d7..000000000 --- a/rhel/kmod-openvswitch-rhel6.spec.in +++ /dev/null @@ -1,123 +0,0 @@ -# Spec file for Open vSwitch kernel modules on Red Hat Enterprise -# Linux 6. - -# 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 -# notice and this notice are preserved. This file is offered as-is, -# without warranty of any kind. - -%define oname openvswitch -%{!?release_number:%define release_number 1} - -Name: kmod-%{oname} -Version: @VERSION@ -Release: %{release_number}%{?dist} -Summary: Open vSwitch kernel module - -Group: System/Kernel -License: GPLv2 -URL: http://openvswitch.org/ -Source0: %{oname}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -# 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}") - -# Use -D 'kversion 2.6.32-131.6.1.el6.x86_64' to build package -# for specified kernel version. -# Use -D 'kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64' -# to build package for mulitple kernel versions in the same package -# This only works for kernel 3.10.0 major revision 693 (RHEL 7.4) -# and major revision 327 (RHEL 7.2) -# By default, build against the latest installed kernel-devel -%{!?kversion:%global kversion %(rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1| sed "s/^kernel.*-devel-//")} - -# Use -D 'kflavors default debug kdump' to build packages for -# specified kernel variants. -%{!?kflavors:%global kflavors default} - -%description -Open vSwitch Linux kernel module. - -%prep - -%setup -n %{oname}-%{version} - -%build -for kv in %{kversion}; do - for flavor in %{kflavors}; do - mkdir -p _$flavor/_$kv - (cd _$flavor/_$kv && ../../configure --with-linux="%{kernel_source_extended $flavor $kv}") - %{__make} -C _$flavor/_$kv/datapath/linux %{?_smp_mflags} - done -done - -%install -export INSTALL_MOD_PATH=$RPM_BUILD_ROOT -export INSTALL_MOD_DIR=extra/%{oname} -for kv in %{kversion}; do - for flavor in %{kflavors} ; do - make -C %{kernel_source_extended $flavor $kv} modules_install \ - M="`pwd`"/_$flavor/_$kv/datapath/linux - # Cleanup unnecessary kernel-generated module dependency files. - find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \; - done -done -install -d %{buildroot}%{_sysconfdir}/depmod.d/ -for kv in %{kversion}; do - for module in %{buildroot}/lib/modules/$kv/$INSTALL_MOD_DIR/*.ko; - do - modname="$(basename ${module})" - grep -qsPo "^\s*override ${modname%.ko} \* extra\/%{oname}" %{oname}.conf || \ - echo "override ${modname%.ko} * extra/%{oname}" >> %{oname}.conf - grep -qsPo "^\s*override ${modname%.ko} \* weak-updates\/%{oname}" %{oname}.conf || \ - echo "override ${modname%.ko} * weak-updates/%{oname}" >> %{oname}.conf - done -done -install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/ -install -d -m 0755 $RPM_BUILD_ROOT/usr/share/%{oname}/scripts -install -p -m 0755 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh \ - $RPM_BUILD_ROOT/usr/share/%{oname}/scripts/ovs-kmod-manage.sh - -%post -current_kernel=$(uname -r) -IFS=. read installed_major installed_minor installed_micro installed_arch \ - installed_build <<<"${current_kernel##*-}" -if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then - # Workaround for RHEL 7.2 and 7.4 - if [ -x "/usr/share/%{oname}/scripts/ovs-kmod-manage.sh" ]; then - /usr/share/%{oname}/scripts/ovs-kmod-manage.sh - fi -else - # Ensure that modprobe will find our modules. - for k in $(cd /lib/modules && /bin/ls); do - [ -d "/lib/modules/$k/kernel/" ] && /sbin/depmod -a "$k" - done - if [ -x "/sbin/weak-modules" ]; then - rpm -ql kmod-%{oname} | grep '\.ko$' | \ - /sbin/weak-modules --add-modules - fi -fi - -%postun -if [ "$1" = 0 ]; then # Erase, not upgrade - for kname in `ls -d /lib/modules/*` - do - rm -rf $kname/weak-updates/openvswitch - done -fi -/sbin/depmod -a - -%files -%defattr(644,root,root,755) -/etc/depmod.d/%{oname}.conf -/lib/modules/ -%attr(755,root,root) /usr/share/%{oname}/scripts/ovs-kmod-manage.sh - -%clean -rm -rf $RPM_BUILD_ROOT