!144 添加sw架构

From: @robertxw 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-12-02 07:51:58 +00:00 committed by Gitee
commit bd2d4293cd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From a3e9c5c1e6646c133b7dbd6d996b4f38a44ae0aa Mon Sep 17 00:00:00 2001
From: wzx <wuzx1226@qq.com>
Date: Tue, 25 Oct 2022 09:06:08 +0800
Subject: [PATCH] Add sw64 architecture
Add sw64 architecture parallel to alpha architecture in file missing_fcntl.h to make it possible on sw64 servers.
Signed-off-by: wzx <wuzx1226@qq.com>
---
src/libnm-systemd-shared/src/basic/missing_fcntl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libnm-systemd-shared/src/basic/missing_fcntl.h b/src/libnm-systemd-shared/src/basic/missing_fcntl.h
index 00937d2..547891c 100644
--- a/src/libnm-systemd-shared/src/basic/missing_fcntl.h
+++ b/src/libnm-systemd-shared/src/basic/missing_fcntl.h
@@ -43,7 +43,7 @@
*/
#ifndef __O_TMPFILE
-#if defined(__alpha__)
+#if defined(__alpha__) || defined(__sw_64__)
#define __O_TMPFILE 0100000000
#elif defined(__parisc__) || defined(__hppa__)
#define __O_TMPFILE 0400000000
--
2.33.0

View File

@ -50,7 +50,7 @@
Name: NetworkManager Name: NetworkManager
Version: 1.32.12 Version: 1.32.12
Epoch: 1 Epoch: 1
Release: 13 Release: 14
Summary: Network Link Manager and User Applications Summary: Network Link Manager and User Applications
License: GPLv2+ License: GPLv2+
URL: https://www.gnome.org/projects/NetworkManager/ URL: https://www.gnome.org/projects/NetworkManager/
@ -67,6 +67,7 @@ Patch6001: backport-libnm-fix-crash-on-failure-of-nm_vpn_plugin_info_new_
Patch6002: backport-core-reload-config-for-active-devices.patch Patch6002: backport-core-reload-config-for-active-devices.patch
Patch6003: backport-libnm-fix-warning-when-setting-wrong-ethtool-ternary-value.patch Patch6003: backport-libnm-fix-warning-when-setting-wrong-ethtool-ternary-value.patch
Patch6004: fix-minor-written-mistake.patch Patch6004: fix-minor-written-mistake.patch
Patch6005: NetworkManager-Add-sw64-architecture.patch
BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel BuildRequires: dbus-devel dbus-glib-devel glib2-devel gobject-introspection-devel jansson-devel
@ -486,6 +487,12 @@ fi
%{_datadir}/gtk-doc/html/NetworkManager/* %{_datadir}/gtk-doc/html/NetworkManager/*
%changelog %changelog
* Fri Dec 2 2022 gaoxingwang <gaoxingwang1@huawei.com> - 1:1.32.12-14
- Type:feature
- CVE:NA
- SUG:NA
- DESC:Add sw64 architecture
* Tue Nov 15 2022 yuelg <yuelg@chinaunicom.cn> - 1:1.32.12-13 * Tue Nov 15 2022 yuelg <yuelg@chinaunicom.cn> - 1:1.32.12-13
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA