From 11eb4b4b0e599f6fa5c3c146d4281721a8a7f15f Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 15:12:40 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E9=97=A8=E7=A6=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openvswitch.spec | 289 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 openvswitch.spec diff --git a/openvswitch.spec b/openvswitch.spec new file mode 100644 index 0000000..d83c2c1 --- /dev/null +++ b/openvswitch.spec @@ -0,0 +1,289 @@ +Name: openvswitch +Summary: Production Quality, Multilayer Open Virtual Switch +URL: http://www.openvswitch.org/ +Version: 2.14.2 +License: ASL 2.0 and ISC +Release: 9 +Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz +Buildroot: /tmp/openvswitch-rpm +patch: openvswitch-2.14.2-20250408.patch +#patch: openvswitch-2.14.2-20250117.patch +#patch: openvswitch-2.14.2-20241009.patch + +Requires: %{name}-help +Requires: logrotate hostname python >= 2.7 python2-six selinux-policy-targeted libsepol >= 3.1 +BuildRequires: python2-six, openssl-devel checkpolicy selinux-policy-devel autoconf automake libtool python-sphinx unbound-devel +Provides: openvswitch-selinux-policy = %{version}-%{release} +Obsoletes: openvswitch-selinux-policy < %{version}-%{release} + +%bcond_without check +%bcond_with check_datapath_kernel + +%description +Open vSwitch is a production quality, multilayer virtual switch licensed under +the open source Apache 2.0 license. + +%package devel +Summary: Development tools for Open vSwitch + +%description devel +Libraries, header files, and other development tools for Open vSwitch. + +%package help +Summary: Helpful information for Open vSwitch + +%description help +Documents and helpful information for Open vSwitch. + +%package -n python3-openvswitch +Summary: Open vSwitch python3 bindings +Requires: python3 python3-six +obsoletes: python-openvswitch < 2.10.0-6 +Provides: python-openvswitch = %{version}-%{release} + +%description -n python3-openvswitch +Python bindings for the Open vSwitch database + +%prep +#%autosetup +%setup -q +%patch -P 2 + + +%build +autoreconf +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=%{_localstatedir} \ + --libdir=%{_libdir} \ + --enable-ssl \ + --enable-shared \ + --with-pkidir=%{_sharedstatedir}/openvswitch/pki \ + PYTHON=%{__python2} + +build-aux/dpdkstrip.py \ + --nodpdk \ + < rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \ + > rhel/usr_lib_systemd_system_ovs-vswitchd.service + +%make_build +make selinux-policy + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch + +install -p -D -m 0644 \ + rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \ + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/openvswitch +for service in openvswitch ovsdb-server ovs-vswitchd; do + install -p -D -m 0644 \ + rhel/usr_lib_systemd_system_${service}.service \ + $RPM_BUILD_ROOT%{_unitdir}/${service}.service +done + +install -m 0755 rhel/etc_init.d_openvswitch $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/openvswitch.init +install -D -m 0644 rhel/etc_logrotate.d_openvswitch $RPM_BUILD_ROOT/etc/logrotate.d/openvswitch +install -D -m 0644 rhel/etc_openvswitch_default.conf $RPM_BUILD_ROOT/%{_sysconfdir}/openvswitch/default.conf +install -D -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ovs +install -D -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifdown-ovs +install -D -m 0644 rhel/usr_share_openvswitch_scripts_sysconfig.template $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/sysconfig.template + +install -p -m 644 -D selinux/openvswitch-custom.pp \ + $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp + +rm \ + $RPM_BUILD_ROOT/usr/bin/ovs-testcontroller \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-testcontroller.8 \ + $RPM_BUILD_ROOT/usr/bin/ovs-test \ + $RPM_BUILD_ROOT/usr/bin/ovs-l3ping \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-l3ping.8 \ + $RPM_BUILD_ROOT/usr/sbin/ovs-vlan-bug-workaround \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-vlan-bug-workaround.8 \ + $RPM_BUILD_ROOT/usr/bin/ovn-* \ + $RPM_BUILD_ROOT/usr/share/man/man?/ovn-* \ + $RPM_BUILD_ROOT/usr/share/openvswitch/ovn-* \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn* +(cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la) +(cd "$RPM_BUILD_ROOT" && rm -rf usr/include) + +install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT/var/lib/openvswitch + +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/openflow +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/openvswitch +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse/arpa +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse/netinet +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse/sys +install -d -m 0755 $RPM_BUILD_ROOT/%{_includedir}/openvswitch/lib +install -m 0644 include/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch +install -m 0644 include/openflow/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/openflow +install -m 0644 include/openvswitch/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/openvswitch +install -m 0644 include/sparse/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse +install -m 0644 include/sparse/arpa/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse/arpa +install -m 0644 include/sparse/netinet/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse/netinet +install -m 0644 include/sparse/sys/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/sparse/sys +install -m 0644 lib/*.h $RPM_BUILD_ROOT/%{_includedir}/openvswitch/lib + +install -D -m 0644 lib/.libs/libopenvswitch.a \ + $RPM_BUILD_ROOT/%{_libdir}/libopenvswitch.a + +install -d -m 0755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch + +install -d -m 0755 $RPM_BUILD_ROOT%{python3_sitelib} +cp -a $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* \ + $RPM_BUILD_ROOT%{python3_sitelib} + +pushd python +( +export CPPFLAGS="-I ../include" +export LDFLAGS="%{__global_ldflags} -L $RPM_BUILD_ROOT%{_libdir}" +%py3_build +%py3_install +[ -f "$RPM_BUILD_ROOT/%{python3_sitearch}/ovs/_json$(python3-config --extension-suffix)" ] +) +popd + +touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/conf.db +touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/.conf.db.~lock~ +touch $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch/system-id.conf + +install -d $RPM_BUILD_ROOT%{_prefix}/lib/firewalld/services/ + +install -p -D -m 0755 \ + rhel/usr_share_openvswitch_scripts_ovs-systemd-reload \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-systemd-reload + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +%selinux_relabel_pre -s targeted + +%preun +%if 0%{?systemd_preun:1} + %systemd_preun %{name}.service +%else + if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || : + /bin/systemctl stop %{name}.service >/dev/null 2>&1 || : + fi +%endif + +%post +%if 0%{?systemd_post:1} + # This may not enable openvswitch service or do daemon-reload. + %systemd_post %{name}.service +%else + # Package install, not upgrade + if [ $1 -eq 1 ]; then + /bin/systemctl daemon-reload >dev/null || : + fi +%endif + +%selinux_modules_install -s targeted /usr/share/selinux/packages/%{name}/openvswitch-custom.pp + +%postun +%if 0%{?systemd_postun:1} + %systemd_postun %{name}.service +%else + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +%endif + +if [ $1 -eq 0 ] ; then + %selinux_modules_uninstall -s targeted openvswitch-custom +fi +exit 0 + +%posttrans +%selinux_relabel_post -s targeted + +%files +%defattr(-,root,root) +%dir /etc/openvswitch +/etc/bash_completion.d/ovs-appctl-bashcomp.bash +/etc/bash_completion.d/ovs-vsctl-bashcomp.bash +%config(noreplace) /etc/logrotate.d/openvswitch +/etc/sysconfig/network-scripts/ifup-ovs +/etc/sysconfig/network-scripts/ifdown-ovs +/usr/bin/ovs-appctl +/usr/bin/ovs-dpctl +/usr/bin/ovs-dpctl-top +/usr/bin/ovs-docker +/usr/bin/ovs-ofctl +/usr/bin/ovs-parse-backtrace +/usr/bin/ovs-pcap +/usr/bin/ovs-pki +/usr/bin/ovs-tcpdump +/usr/bin/ovs-tcpundump +/usr/bin/ovs-vlan-test +/usr/bin/ovs-vsctl +/usr/bin/ovsdb-client +/usr/bin/ovsdb-tool +/usr/bin/vtep-ctl +%{_libdir}/lib*.so.* +/usr/sbin/ovs-bugtool +/usr/sbin/ovs-vswitchd +/usr/sbin/ovsdb-server +%{python3_sitelib}/ovs +%{python3_sitelib}/ovstest +/usr/share/openvswitch/bugtool-plugins/ +/usr/share/openvswitch/python/ +/usr/share/openvswitch/scripts/ovs-bugtool-* +/usr/share/openvswitch/scripts/ovs-check-dead-ifs +/usr/share/openvswitch/scripts/ovs-ctl +/usr/share/openvswitch/scripts/ovs-kmod-ctl +/usr/share/openvswitch/scripts/ovs-lib +/usr/share/openvswitch/scripts/ovs-save +/usr/share/openvswitch/scripts/ovs-vtep +/usr/share/openvswitch/scripts/sysconfig.template +/usr/share/openvswitch/scripts/ovs-monitor-ipsec +%{_sysconfdir}/openvswitch/default.conf +%config %ghost %{_sysconfdir}/openvswitch/conf.db +%ghost %{_sysconfdir}/openvswitch/.conf.db.~lock~ +%config %ghost %{_sysconfdir}/openvswitch/system-id.conf +%config(noreplace) %{_sysconfdir}/sysconfig/openvswitch +%defattr(-,root,root) +%{_unitdir}/openvswitch.service +%{_unitdir}/ovsdb-server.service +%{_unitdir}/ovs-vswitchd.service +/usr/share/openvswitch/scripts/openvswitch.init +/usr/share/openvswitch/scripts/ovs-systemd-reload +/usr/share/openvswitch/vswitch.ovsschema +/usr/share/openvswitch/vtep.ovsschema +%doc NOTICE +/var/lib/openvswitch +/var/log/openvswitch +%{_datadir}/selinux/packages/%{name}/openvswitch-custom.pp + +%files devel +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%{_libdir}/pkgconfig +%{_includedir}/openvswitch/* + +%files help +/usr/share/man/man1/* +/usr/share/man/man5/* +/usr/share/man/man7/* +/usr/share/man/man8/* +%doc README.rst NEWS rhel/README.RHEL.rst + +%files -n python3-openvswitch +%{python3_sitearch}/ovs +%{python3_sitearch}/ovs-*.egg-info +%doc LICENSE + +%changelog +* The Apr 09 2025 zry6666 -2.14.2 +- 24.1.0 330tr6 patch归档 +* The Jan 21 2025 zry6666 -2.14.2 +- 修改文件名字 \ No newline at end of file -- Gitee From d14b46ec5536b70eee72526cf4f14c5f378a05b9 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:11:05 +0800 Subject: [PATCH 02/15] fix --- openvswitch.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index d83c2c1..1d1f864 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -6,9 +6,9 @@ License: ASL 2.0 and ISC Release: 9 Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm -patch: openvswitch-2.14.2-20250408.patch -#patch: openvswitch-2.14.2-20250117.patch -#patch: openvswitch-2.14.2-20241009.patch +Patch0: openvswitch-2.14.2-20241009.patch +Patch1: openvswitch-2.14.2-20250117.patch +Patch2: openvswitch-2.14.2-20250408.patch Requires: %{name}-help Requires: logrotate hostname python >= 2.7 python2-six selinux-policy-targeted libsepol >= 3.1 @@ -47,7 +47,7 @@ Python bindings for the Open vSwitch database %prep #%autosetup %setup -q -%patch -P 2 +%patch2 -P 2 %build @@ -283,6 +283,8 @@ exit 0 %doc LICENSE %changelog +* The Apr 14 2025 zry6666 -2.14.2 +- 门禁修复 * The Apr 09 2025 zry6666 -2.14.2 - 24.1.0 330tr6 patch归档 * The Jan 21 2025 zry6666 -2.14.2 -- Gitee From 503bb191f9e89e200bff183779736a4d014157a5 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:14:15 +0800 Subject: [PATCH 03/15] fix --- openvswitch.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 1d1f864..6d45521 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,9 +283,9 @@ exit 0 %doc LICENSE %changelog -* The Apr 14 2025 zry6666 -2.14.2 +* The Apr 14 2025 zry6666 -2.14.2-r9 - 门禁修复 -* The Apr 09 2025 zry6666 -2.14.2 +* The Apr 09 2025 zry6666 -2.14.2-r9 - 24.1.0 330tr6 patch归档 -* The Jan 21 2025 zry6666 -2.14.2 +* The Jan 21 2025 zry6666 -2.14.2-r9 - 修改文件名字 \ No newline at end of file -- Gitee From d78e291e586a6559d79a6cbf7effbb118297e15b Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:17:52 +0800 Subject: [PATCH 04/15] fix --- openvswitch.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 6d45521..87a7c52 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,9 +283,7 @@ exit 0 %doc LICENSE %changelog -* The Apr 14 2025 zry6666 -2.14.2-r9 -- 门禁修复 -* The Apr 09 2025 zry6666 -2.14.2-r9 +* The Apr 09 2025 zry6666 -2.14.2-2 - 24.1.0 330tr6 patch归档 -* The Jan 21 2025 zry6666 -2.14.2-r9 +* The Jan 21 2025 zry6666 -2.14.2-1 - 修改文件名字 \ No newline at end of file -- Gitee From 5967942fcfb48d68c8e42c145e011091456b1a8e Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:24:28 +0800 Subject: [PATCH 05/15] fix --- openvswitch.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 87a7c52..85dc4c4 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,7 +283,7 @@ exit 0 %doc LICENSE %changelog -* The Apr 09 2025 zry6666 -2.14.2-2 +* The Apr 09 2025 zry6666 -2.14.2-r10 - 24.1.0 330tr6 patch归档 -* The Jan 21 2025 zry6666 -2.14.2-1 +* The Jan 21 2025 zry6666 -2.14.2-r9 - 修改文件名字 \ No newline at end of file -- Gitee From 1974c574ca39aa814093a429165b157df3228b45 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:28:40 +0800 Subject: [PATCH 06/15] fix --- openvswitch.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 85dc4c4..5d72620 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,7 +283,19 @@ exit 0 %doc LICENSE %changelog -* The Apr 09 2025 zry6666 -2.14.2-r10 +* The Apr 09 2025 zry6666 -2.14.2-8 - 24.1.0 330tr6 patch归档 -* The Jan 21 2025 zry6666 -2.14.2-r9 +* The Jan 21 2025 zry6666 -2.14.2-7 +- 修改文件名字 +* The Jan 20 2025 zry6666 -2.14.2-6 +- 修改文件名字 +* The Jan 19 2025 zry6666 -2.14.2-5 +- 修改文件名字 +* The Jan 18 2025 zry6666 -2.14.2-4 +- 修改文件名字 +* The Jan 17 2025 zry6666 -2.14.2-3 +- 修改文件名字 +* The Jan 16 2025 zry6666 -2.14.2-2 +- 修改文件名字 +* The Jan 15 2025 zry6666 -2.14.2-1 - 修改文件名字 \ No newline at end of file -- Gitee From 063511a254694187d73457fd11e555ca7e2d2472 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:31:52 +0800 Subject: [PATCH 07/15] fix --- openvswitch.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 5d72620..01ef9bb 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,9 +283,13 @@ exit 0 %doc LICENSE %changelog -* The Apr 09 2025 zry6666 -2.14.2-8 +* The Apr 09 2025 zry6666 -2.14.2-10 - 24.1.0 330tr6 patch归档 -* The Jan 21 2025 zry6666 -2.14.2-7 +* The Jan 21 2025 zry6666 -2.14.2-9 +- 修改文件名字 +* The Jan 20 2025 zry6666 -2.14.2-8 +- 修改文件名字 +* The Jan 19 2025 zry6666 -2.14.2-7 - 修改文件名字 * The Jan 20 2025 zry6666 -2.14.2-6 - 修改文件名字 -- Gitee From 18d2b81f4a2b5843dbc753c7f523704968f01fd9 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:36:25 +0800 Subject: [PATCH 08/15] fix weeks --- openvswitch.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 01ef9bb..6c11888 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,23 +283,23 @@ exit 0 %doc LICENSE %changelog -* The Apr 09 2025 zry6666 -2.14.2-10 +* WED Apr 09 2025 zry6666 -2.14.2-10 - 24.1.0 330tr6 patch归档 -* The Jan 21 2025 zry6666 -2.14.2-9 +* TUE Jan 21 2025 zry6666 -2.14.2-9 - 修改文件名字 -* The Jan 20 2025 zry6666 -2.14.2-8 +* TUE Jan 20 2025 zry6666 -2.14.2-8 - 修改文件名字 -* The Jan 19 2025 zry6666 -2.14.2-7 +* TUE Jan 19 2025 zry6666 -2.14.2-7 - 修改文件名字 -* The Jan 20 2025 zry6666 -2.14.2-6 +* TUE Jan 20 2025 zry6666 -2.14.2-6 - 修改文件名字 -* The Jan 19 2025 zry6666 -2.14.2-5 +* TUE Jan 19 2025 zry6666 -2.14.2-5 - 修改文件名字 -* The Jan 18 2025 zry6666 -2.14.2-4 +* TUE Jan 18 2025 zry6666 -2.14.2-4 - 修改文件名字 -* The Jan 17 2025 zry6666 -2.14.2-3 +* TUE Jan 17 2025 zry6666 -2.14.2-3 - 修改文件名字 -* The Jan 16 2025 zry6666 -2.14.2-2 +* TUE Jan 16 2025 zry6666 -2.14.2-2 - 修改文件名字 -* The Jan 15 2025 zry6666 -2.14.2-1 +* TUE Jan 15 2025 zry6666 -2.14.2-1 - 修改文件名字 \ No newline at end of file -- Gitee From 9bb44c31e93f3fd3e700a25a5db2d6925fb02131 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:40:52 +0800 Subject: [PATCH 09/15] fix weeks --- openvswitch.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index 6c11888..d80e408 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,11 +283,9 @@ exit 0 %doc LICENSE %changelog -* WED Apr 09 2025 zry6666 -2.14.2-10 +* WED Apr 09 2025 zry6666 -2.14.2-9 - 24.1.0 330tr6 patch归档 -* TUE Jan 21 2025 zry6666 -2.14.2-9 -- 修改文件名字 -* TUE Jan 20 2025 zry6666 -2.14.2-8 +* TUE Jan 21 2025 zry6666 -2.14.2-8 - 修改文件名字 * TUE Jan 19 2025 zry6666 -2.14.2-7 - 修改文件名字 -- Gitee From 2f85e29704fe6d1b120e8abbd5fb3ff5b7afd430 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 17:44:25 +0800 Subject: [PATCH 10/15] fix changlog --- openvswitch.spec | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index d80e408..fc4e743 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -283,21 +283,7 @@ exit 0 %doc LICENSE %changelog -* WED Apr 09 2025 zry6666 -2.14.2-9 +* WED Apr 09 2025 zry6666 -2.14.2-2 - 24.1.0 330tr6 patch归档 -* TUE Jan 21 2025 zry6666 -2.14.2-8 -- 修改文件名字 -* TUE Jan 19 2025 zry6666 -2.14.2-7 -- 修改文件名字 -* TUE Jan 20 2025 zry6666 -2.14.2-6 -- 修改文件名字 -* TUE Jan 19 2025 zry6666 -2.14.2-5 -- 修改文件名字 -* TUE Jan 18 2025 zry6666 -2.14.2-4 -- 修改文件名字 -* TUE Jan 17 2025 zry6666 -2.14.2-3 -- 修改文件名字 -* TUE Jan 16 2025 zry6666 -2.14.2-2 -- 修改文件名字 -* TUE Jan 15 2025 zry6666 -2.14.2-1 +* TUE Jan 21 2025 zry6666 -2.14.2-1 - 修改文件名字 \ No newline at end of file -- Gitee From 0b60c45646667f8e12613393d18ebae5c50bc59f Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 21:12:29 +0800 Subject: [PATCH 11/15] fix_changelog --- openvswitch.spec | 17 ++++++++++++++++- test.patch | 0 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test.patch diff --git a/openvswitch.spec b/openvswitch.spec index fc4e743..286d734 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -9,6 +9,7 @@ Buildroot: /tmp/openvswitch-rpm Patch0: openvswitch-2.14.2-20241009.patch Patch1: openvswitch-2.14.2-20250117.patch Patch2: openvswitch-2.14.2-20250408.patch +Patch3: test.patch Requires: %{name}-help Requires: logrotate hostname python >= 2.7 python2-six selinux-policy-targeted libsepol >= 3.1 @@ -283,7 +284,21 @@ exit 0 %doc LICENSE %changelog -* WED Apr 09 2025 zry6666 -2.14.2-2 +* WED Apr 09 2025 zry6666 -2.14.2-9 - 24.1.0 330tr6 patch归档 +* TUE Jan 21 2025 zry6666 -2.14.2-8 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-7 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-6 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-5 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-4 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-3 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-2 +- 修改文件名字 * TUE Jan 21 2025 zry6666 -2.14.2-1 - 修改文件名字 \ No newline at end of file diff --git a/test.patch b/test.patch new file mode 100644 index 0000000..e69de29 -- Gitee From 60a7661b18c719ea7bf40ccd0b3b851997de33d0 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Mon, 14 Apr 2025 21:14:00 +0800 Subject: [PATCH 12/15] fix changelog --- openvswitch.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openvswitch.spec b/openvswitch.spec index 286d734..2ff2e57 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -284,6 +284,8 @@ exit 0 %doc LICENSE %changelog +* MON Apr 14 2025 zry6666 -2.14.2-10 +- 24.1.0 330tr6 patch归档 * WED Apr 09 2025 zry6666 -2.14.2-9 - 24.1.0 330tr6 patch归档 * TUE Jan 21 2025 zry6666 -2.14.2-8 -- Gitee From d19a8d77991fbf8390eeccaefd7f71ff0de6264a Mon Sep 17 00:00:00 2001 From: zry6666 Date: Tue, 15 Apr 2025 10:05:48 +0800 Subject: [PATCH 13/15] fix changelog --- openvswitch.spec | 24 +++--------------------- test.patch | 0 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 test.patch diff --git a/openvswitch.spec b/openvswitch.spec index 2ff2e57..a989bfe 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -3,7 +3,7 @@ Summary: Production Quality, Multilayer Open Virtual Switch URL: http://www.openvswitch.org/ Version: 2.14.2 License: ASL 2.0 and ISC -Release: 9 +Release: 1 Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm Patch0: openvswitch-2.14.2-20241009.patch @@ -284,23 +284,5 @@ exit 0 %doc LICENSE %changelog -* MON Apr 14 2025 zry6666 -2.14.2-10 -- 24.1.0 330tr6 patch归档 -* WED Apr 09 2025 zry6666 -2.14.2-9 -- 24.1.0 330tr6 patch归档 -* TUE Jan 21 2025 zry6666 -2.14.2-8 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-7 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-6 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-5 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-4 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-3 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-2 -- 修改文件名字 -* TUE Jan 21 2025 zry6666 -2.14.2-1 -- 修改文件名字 \ No newline at end of file +* MON Apr 14 2025 zry6666 -2.14.2-1 +- 24.1.0 330tr6 patch归档 \ No newline at end of file diff --git a/test.patch b/test.patch deleted file mode 100644 index e69de29..0000000 -- Gitee From 1166874ea90a9802d1a8b724e395f961514bd415 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Tue, 15 Apr 2025 10:10:34 +0800 Subject: [PATCH 14/15] fix --- openvswitch.spec | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/openvswitch.spec b/openvswitch.spec index a989bfe..aeaee2c 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -3,13 +3,12 @@ Summary: Production Quality, Multilayer Open Virtual Switch URL: http://www.openvswitch.org/ Version: 2.14.2 License: ASL 2.0 and ISC -Release: 1 +Release: 10 Source: https://www.openvswitch.org/releases/openvswitch-%{version}.tar.gz Buildroot: /tmp/openvswitch-rpm -Patch0: openvswitch-2.14.2-20241009.patch -Patch1: openvswitch-2.14.2-20250117.patch -Patch2: openvswitch-2.14.2-20250408.patch -Patch3: test.patch +Patch0: openvswitch-2.14.2-20241009.patch +Patch1: openvswitch-2.14.2-20250117.patch +Patch2: openvswitch-2.14.2-20250408.patch Requires: %{name}-help Requires: logrotate hostname python >= 2.7 python2-six selinux-policy-targeted libsepol >= 3.1 @@ -284,5 +283,23 @@ exit 0 %doc LICENSE %changelog -* MON Apr 14 2025 zry6666 -2.14.2-1 -- 24.1.0 330tr6 patch归档 \ No newline at end of file +* MON Apr 14 2025 zry6666 -2.14.2-10 +- 门禁修复 +* WED Apr 09 2025 zry6666 -2.14.2-9 +- 24.1.0 330tr6 patch归档 +* TUE Jan 21 2025 zry6666 -2.14.2-8 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-7 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-6 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-5 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-4 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-3 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-2 +- 修改文件名字 +* TUE Jan 21 2025 zry6666 -2.14.2-1 +- 修改文件名字 \ No newline at end of file -- Gitee From ee16516081a7816c1daf436d291c79c991cfe772 Mon Sep 17 00:00:00 2001 From: zry6666 Date: Tue, 15 Apr 2025 10:34:44 +0800 Subject: [PATCH 15/15] fix build --- openvswitch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openvswitch.spec b/openvswitch.spec index aeaee2c..c95306a 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -51,14 +51,17 @@ Python bindings for the Open vSwitch database %build -autoreconf +sh boot.sh ./configure \ + CFLAGS='-g -O0 -march=armv8-a+lse+crc -fstack-protector-all -fstack-protector-strong' \ + CXXFLAGS='-O0 -march=armv8-a+lse+crc -fstack-protector-all -fstack-protector-strong' \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=%{_localstatedir} \ --libdir=%{_libdir} \ --enable-ssl \ --enable-shared \ + --enable-hwoff \ --with-pkidir=%{_sharedstatedir}/openvswitch/pki \ PYTHON=%{__python2} -- Gitee