From patchwork Mon Oct 21 19:23:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 2000080 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XXQHP4NQYz1xwf for ; Tue, 22 Oct 2024 06:24:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 116B44058B; Mon, 21 Oct 2024 19:24:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id OWjgzM_yMX0W; Mon, 21 Oct 2024 19:24:46 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=2605:bc80:3010:104::8cd3:938; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org B5E024058C Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id B5E024058C; Mon, 21 Oct 2024 19:24:46 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 85232C08A6; Mon, 21 Oct 2024 19:24:46 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 07B5DC08A6 for ; Mon, 21 Oct 2024 19:24:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id F04FB607F3 for ; Mon, 21 Oct 2024 19:24:40 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qILR8NjAxKOM for ; Mon, 21 Oct 2024 19:24:40 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.128.66; helo=mail-wm1-f66.google.com; envelope-from=i.maximets.ovn@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 9BBE6607F5 Authentication-Results: smtp3.osuosl.org; dmarc=none (p=none dis=none) header.from=ovn.org DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9BBE6607F5 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9BBE6607F5 for ; Mon, 21 Oct 2024 19:24:39 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id 5b1f17b1804b1-4316cce103dso31174945e9.3 for ; Mon, 21 Oct 2024 12:24:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729538677; x=1730143477; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wAjPmKe2b3s7L93IYN46Zb0khJbF0EIl1ngMNIzqqDs=; b=U7KvLLjmKvX+nukN3+r/rfJ9Jn/RxCdXtyjeCjPieluXu3njugARrVTdY4jILTlBPH djEFlrxMYlpUatxqanlwPXKUhJf6973TW3cSLV8dqFJv+aj5nlvCvRJ1axVkwaA2RlBX 3/neaDOulPlrILXeTfygabqhybkokWbo6ShDi2MdmJ9UCL4tDNxFmq27sC0njk6xSSem ENVLn4tu0QITcj5F2tHFhvsjHW8kmjALsVHc30LYgsAs6kvsmYQjPfS/qFMl3lYzOJla 25Es2uJzo/Qcg5GJ7avRok7GTj1BHoA/Z7zicSk6D68NZStAQVT3IaHfM4MTv+taYnsn YJDw== X-Gm-Message-State: AOJu0YwbqXTn+MJ7OcYE8/k77FBGycaCLIJiUXDbLz6BCxcDttEsfpE6 PbktpDSlj8wPDmDKPs9fTRfEickw8hbT3Jsa5O5atyQfdTOeZK6dSfUwe7xw X-Google-Smtp-Source: AGHT+IHHHRDR/cq+yQipOPptfJzfYZ5Q8xLlPztKaFKhipqKIUgjOq7b2mPun8Olv2VtiHrrTyVcmA== X-Received: by 2002:adf:f708:0:b0:37d:7e71:67a0 with SMTP id ffacd0b85a97d-37ea21c3026mr11123727f8f.9.1729538677451; Mon, 21 Oct 2024 12:24:37 -0700 (PDT) Received: from im-t490s.redhat.com (ip-86-49-44-151.bb.vodafone.cz. [86.49.44.151]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a91598f29sm245267366b.190.2024.10.21.12.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2024 12:24:37 -0700 (PDT) From: Ilya Maximets To: ovs-dev@openvswitch.org Date: Mon, 21 Oct 2024 21:23:57 +0200 Message-ID: <20241021192427.1549951-4-i.maximets@ovn.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241021192427.1549951-1-i.maximets@ovn.org> References: <20241021192427.1549951-1-i.maximets@ovn.org> MIME-Version: 1.0 Subject: [ovs-dev] [PATCH 3/3] debian, rhel: Move ovs-flowviz and the man page to appropriate places. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilya Maximets Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" ovs-flowviz script should be shipped in bindir in fedora and the man pages should be shipped in the same python3-openvswitch package for both debian and fedora. Signed-off-by: Ilya Maximets Acked-by: Eelco Chaudron --- debian/automake.mk | 1 + debian/python3-openvswitch.install | 1 + rhel/openvswitch-fedora.spec.in | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 debian/python3-openvswitch.install diff --git a/debian/automake.mk b/debian/automake.mk index 5fcefea91..fe8febdd3 100644 --- a/debian/automake.mk +++ b/debian/automake.mk @@ -58,6 +58,7 @@ EXTRA_DIST += \ debian/ovs-systemd-reload \ debian/patches/ovs-ctl-ipsec.patch \ debian/patches/series \ + debian/python3-openvswitch.install \ debian/rules \ debian/source/format \ debian/source/lintian-overrides \ diff --git a/debian/python3-openvswitch.install b/debian/python3-openvswitch.install new file mode 100644 index 000000000..e1e8c3a6e --- /dev/null +++ b/debian/python3-openvswitch.install @@ -0,0 +1 @@ +usr/share/man/man8/ovs-flowviz.8 diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 1706d65b2..3f42a5536 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -246,6 +246,9 @@ install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib} cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \ $RPM_BUILD_ROOT%{python3_sitelib} +mv $RPM_BUILD_ROOT%{python3_sitelib}/ovs/flowviz/ovs-flowviz \ + $RPM_BUILD_ROOT/%{_bindir}/ovs-flowviz + rm -rf $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/ install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch @@ -399,6 +402,8 @@ fi %{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp %files -n python3-openvswitch +%{_bindir}/ovs-flowviz +%{_mandir}/man8/ovs-flowviz.8* %{python3_sitelib}/ovs %files test @@ -501,7 +506,6 @@ fi %{_mandir}/man8/ovs-ctl.8* %{_mandir}/man8/ovs-dpctl.8* %{_mandir}/man8/ovs-dpctl-top.8* -%{_mandir}/man8/ovs-flowviz.8* %{_mandir}/man8/ovs-kmod-ctl.8* %{_mandir}/man8/ovs-ofctl.8* %{_mandir}/man8/ovs-pki.8*