merge: branch 'ff/fix_install_debuginfo'

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1951

.gitlab-ci.yml

@@ -60,9 +60,9 @@ variables:
   # This is done by running `ci-fairy generate-template` and possibly bumping
   # ".default_tag".
   ALPINE_TAG:  'tag-75ecbb5bcef4'
-  CENTOS_TAG:  'tag-ea45f0a3f632'
+  CENTOS_TAG:  'tag-0de3c2e2d9ed'
   DEBIAN_TAG:  'tag-1ccef04c657b'
-  FEDORA_TAG:  'tag-ea45f0a3f632'
+  FEDORA_TAG:  'tag-0de3c2e2d9ed'
   UBUNTU_TAG:  'tag-1ccef04c657b'
 
   ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'

.gitlab-ci/fedora-install.sh

@@ -5,6 +5,7 @@ set -ex
 IS_FEDORA=0
 IS_CENTOS=0
 CENTOS_VERSION=0
+FEDORA_VERSION=0
 grep -q '^NAME=.*\(CentOS\)' /etc/os-release && IS_CENTOS=1
 grep -q '^NAME=.*\(Fedora\)' /etc/os-release && IS_FEDORA=1
 if [ $IS_CENTOS = 1 ]; then
@@ -45,9 +46,22 @@ yum install -y glibc-langpack-pl ccache clang
 # to generate proper documentation.
 yum reinstall -y --setopt='tsflags=' glib2-doc
 
+if [ $IS_FEDORA = 1 ]; then
+    FEDORA_VERSION=$(cat /etc/os-release | grep '^VERSION_ID=' | sed s\/"VERSION_ID="\/\/)
+fi
+
 if command -v dnf &>/dev/null; then
     dnf install -y python3-dnf-plugins-core
+    # Fedora 41 migrated to DNF5 and the debuginfo-install plugin is not implemented yet
+    # therefore we need to enable the repo and install the debuginfo subpackage manually
+    if [ $FEDORA_VERSION -lt "41" ]; then
         dnf debuginfo-install -y glib2
+    else
+        dnf install -y dnf5-plugins
+        dnf config-manager setopt fedora-debuginfo.enabled=1
+        dnf config-manager setopt rawhide-debuginfo.enabled=1 || true
+        dnf install -y glib2-debuginfo
+    fi
 else
     debuginfo-install -y glib2
 fi

.gitlab-ci/run-test.sh

@@ -40,7 +40,7 @@ uname -a
 meson --version
 
 ! command -v dpkg &>/dev/null || dpkg -l
-! command -v yum  &>/dev/null || yum list installed
+! command -v dnf  &>/dev/null || dnf list --installed
 ! command -v apk  &>/dev/null || apk -v info
 
 # We have a unit test that check that `ci-fairy generate-template`

src/core/devices/nm-device-bridge.c

@@ -299,13 +299,11 @@ typedef struct {
 } Option;
 
 #define OPTION(_name, _sysname, ...) \
-    {                                \
+    {.name    = ""_name              \
-        .name    = ""_name           \
                 "",                  \
      .sysname = ""_sysname           \
                 "",                  \
-        __VA_ARGS__                  \
+     __VA_ARGS__}
-    }
 
 #define OPTION_TYPE_INT(min, max, def) .nm_min = (min), .nm_max = (max), .nm_default = (def)
 

src/core/dhcp/nm-dhcp-options.c

@@ -13,7 +13,9 @@
 
 #define REQ(_num, _name, _include)                      \
     {                                                   \
-        .name = NM_DHCP_OPTION_REQPREFIX ""_name, .option_num = _num, .include = _include, \
+        .name       = NM_DHCP_OPTION_REQPREFIX ""_name, \
+        .option_num = _num,                             \
+        .include    = _include,                         \
     }
 
 const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = {

src/core/platform/tests/test-common.c

@@ -60,9 +60,7 @@ typedef struct {
 } IPTunnelModInfo;
 
 #define INF(_module_name, _iftype, _ifname, ...) \
-    {                                                                                      \
+    {.module_name = ""_module_name, .iftype = _iftype, .ifname = ""_ifname, __VA_ARGS__}
-        .module_name = ""_module_name, .iftype = _iftype, .ifname = ""_ifname, __VA_ARGS__ \
-    }
 
 static const IPTunnelModInfo ip_tunnel_mod_infos[] = {
     INF("ip_gre", NM_LINK_TYPE_GRE, "gre0"),

src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c

@@ -702,7 +702,8 @@ nms_ifcfg_rh_utils_is_numbered_tag_impl(const char *key,
 
 #define _KEY_TYPE(key, flags)                                     \
     {                                                             \
-        .key_name = "" key "", .key_flags = ((NMS_IFCFG_KEY_TYPE_WELL_KNOWN) | (flags)), \
+        .key_name  = "" key "",                                   \
+        .key_flags = ((NMS_IFCFG_KEY_TYPE_WELL_KNOWN) | (flags)), \
     }
 
 const NMSIfcfgKeyTypeInfo nms_ifcfg_well_known_keys[] = {

src/core/supplicant/nm-supplicant-settings-verify.c

@@ -22,19 +22,28 @@ typedef gboolean (*validate_func)(const struct Opt *, const char *, const guint3
 
 #define OPT_INT(_key, _int_low, _int_high) \
     {                                      \
-        .key = _key, .type = NM_SUPPL_OPT_TYPE_INT, .int_high = _int_high, .int_low = _int_low, \
+        .key      = _key,                  \
+        .type     = NM_SUPPL_OPT_TYPE_INT, \
+        .int_high = _int_high,             \
+        .int_low  = _int_low,              \
     }
 #define OPT_BYTES(_key, _int_high)           \
     {                                        \
-        .key = _key, .type = NM_SUPPL_OPT_TYPE_BYTES, .int_high = _int_high, \
+        .key      = _key,                    \
+        .type     = NM_SUPPL_OPT_TYPE_BYTES, \
+        .int_high = _int_high,               \
     }
 #define OPT_UTF8(_key, _int_high)           \
     {                                       \
-        .key = _key, .type = NM_SUPPL_OPT_TYPE_UTF8, .int_high = _int_high, \
+        .key      = _key,                   \
+        .type     = NM_SUPPL_OPT_TYPE_UTF8, \
+        .int_high = _int_high,              \
     }
 #define OPT_KEYWORD(_key, _str_allowed)           \
     {                                             \
-        .key = _key, .type = NM_SUPPL_OPT_TYPE_KEYWORD, .str_allowed = _str_allowed, \
+        .key         = _key,                      \
+        .type        = NM_SUPPL_OPT_TYPE_KEYWORD, \
+        .str_allowed = _str_allowed,              \
     }
 
 static const struct Opt opt_table[] = {

src/libnm-client-impl/nm-libnm-utils.h

@@ -379,11 +379,10 @@ typedef struct {
 } NMLDBusMetaProperty;
 
 #define NML_DBUS_META_PROPERTY_INIT(v_dbus_property_name, v_dbus_type, v_obj_properties_idx, ...) \
-    {                                                                                             \
+    {.dbus_property_name = "" v_dbus_property_name "",                                            \
-        .dbus_property_name = "" v_dbus_property_name "",                                         \
      .dbus_type          = NM_G_VARIANT_TYPE("" v_dbus_type ""),                                  \
-        .obj_properties_idx = v_obj_properties_idx, ##__VA_ARGS__                                 \
+     .obj_properties_idx = v_obj_properties_idx,                                                  \
-    }
+     ##__VA_ARGS__}
 
 #define _NML_DBUS_META_PROPERTY_INIT_DEFAULT(v_dbus_type,          \
                                              v_exp_type,           \
@@ -568,10 +567,10 @@ struct _NMLDBusMetaIface {
         (sizeof((const NMLDBusMetaProperty[]){__VA_ARGS__}) / sizeof(NMLDBusMetaProperty))
 
 #define NML_DBUS_META_IFACE_INIT(v_dbus_iface_name, v_get_type_fcn, v_interface_prio, ...) \
-    {                                                                                      \
+    {.dbus_iface_name = "" v_dbus_iface_name "",                                           \
-        .dbus_iface_name = "" v_dbus_iface_name "", .get_type_fcn = v_get_type_fcn,        \
+     .get_type_fcn    = v_get_type_fcn,                                                    \
-        .interface_prio = v_interface_prio, ##__VA_ARGS__                                  \
+     .interface_prio  = v_interface_prio,                                                  \
-    }
+     ##__VA_ARGS__}
 
 #define NML_DBUS_META_IFACE_INIT_PROP(v_dbus_iface_name, v_get_type_fcn, v_interface_prio, ...) \
     NML_DBUS_META_IFACE_INIT(v_dbus_iface_name,                                                 \

src/libnm-client-impl/tests/test-libnm.c

@@ -59,7 +59,9 @@ _test_fixup_string(const TestFixupData *data, guint n_data, char *(*func)(const
 
 #define T_DATA(_desc, _expected) \
     {                            \
-        .desc = _desc, .expected = _expected, .line = __LINE__, \
+        .desc     = _desc,       \
+        .expected = _expected,   \
+        .line     = __LINE__,    \
     }
 
 static void

src/libnm-core-impl/nm-setting-private.h

@@ -484,10 +484,7 @@ void _nm_setting_class_commit(NMSettingClass             *setting_class,
 
 #define NM_SETT_INFO_SETT_DETAIL(...) (&((const NMSettInfoSettDetail){__VA_ARGS__}))
 
-#define NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(_dbus_type, ...) \
+#define NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(_dbus_type, ...) {.dbus_type = _dbus_type, __VA_ARGS__}
-    {                                                        \
-        .dbus_type = _dbus_type, __VA_ARGS__                 \
-    }
 
 #define NM_SETT_INFO_PROPERT_TYPE_GPROP_INIT(_dbus_type, ...)                                  \
     NM_SETT_INFO_PROPERT_TYPE_DBUS_INIT(_dbus_type,                                            \

src/libnm-core-impl/nm-utils.c

@@ -331,7 +331,8 @@ typedef const char *const StrvArray4Type[4];
 
 #define LL(l, ...)                    \
     {                                 \
-        .name = l, .value = {__VA_ARGS__, NULL}, \
+        .name  = l,                   \
+        .value = {__VA_ARGS__, NULL}, \
     }
 
 /* 5-letter language codes */

src/libnm-glib-aux/nm-prioq.h

@@ -27,7 +27,8 @@ typedef struct {
 
 #define NM_PRIOQ_ZERO                 \
     {                                 \
-        ._priv = {                \
+        ._priv =                      \
+            {                         \
                 .compare_func = NULL, \
             },                        \
     }

src/libnm-glib-aux/nm-shared-utils.h

@@ -198,7 +198,8 @@ typedef struct {
 
 #define _NM_ETHER_ADDR_INIT(a0, a1, a2, a3, a4, a5) \
     {                                               \
-        .ether_addr_octet = {                       \
+        .ether_addr_octet =                         \
+            {                                       \
                 (a0),                               \
                 (a1),                               \
                 (a2),                               \
@@ -806,7 +807,8 @@ typedef struct {
 
 #define NM_UTILS_FLAGS2STR(f, n) \
     {                            \
-        .flag = f, .name = "" n, \
+        .flag = f,               \
+        .name = "" n,            \
     }
 
 #define NM_UTILS_FLAGS2STR_DEFINE(fcn_name, flags_type, ...)                    \
@@ -1749,10 +1751,7 @@ typedef struct {
     };
 } NMUtilsNamedValue;
 
-#define NM_UTILS_NAMED_VALUE_INIT(n, v) \
+#define NM_UTILS_NAMED_VALUE_INIT(n, v) {.name = (n), .value_ptr = (v)}
-    {                                   \
-        .name = (n), .value_ptr = (v)   \
-    }
 
 NMUtilsNamedValue *nm_utils_hash_to_array_full(GHashTable         *hash,
                                                guint              *out_len,
@@ -2444,10 +2443,7 @@ int     nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po
         __VA_ARGS__ NULL,                                   \
     }))
 
-#define NM_DEFINE_GDBUS_SIGNAL_INFO_INIT(name_, ...) \
+#define NM_DEFINE_GDBUS_SIGNAL_INFO_INIT(name_, ...) {.ref_count = -1, .name = name_, __VA_ARGS__}
-    {                                                \
-        .ref_count = -1, .name = name_, __VA_ARGS__  \
-    }
 
 #define NM_DEFINE_GDBUS_SIGNAL_INFO(name_, ...) \
     ((GDBusSignalInfo *) (&(                    \
@@ -2458,10 +2454,7 @@ int     nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po
         __VA_ARGS__ NULL,                               \
     }))
 
-#define NM_DEFINE_GDBUS_METHOD_INFO_INIT(name_, ...) \
+#define NM_DEFINE_GDBUS_METHOD_INFO_INIT(name_, ...) {.ref_count = -1, .name = name_, __VA_ARGS__}
-    {                                                \
-        .ref_count = -1, .name = name_, __VA_ARGS__  \
-    }
 
 #define NM_DEFINE_GDBUS_METHOD_INFO(name_, ...) \
     ((GDBusMethodInfo *) (&(                    \
@@ -2473,9 +2466,7 @@ int     nm_utils_fd_read_loop_exact(int fd, void *buf, size_t nbytes, bool do_po
     }))
 
 #define NM_DEFINE_GDBUS_INTERFACE_INFO_INIT(name_, ...) \
-    {                                                   \
+    {.ref_count = -1, .name = name_, __VA_ARGS__}
-        .ref_count = -1, .name = name_, __VA_ARGS__     \
-    }
 
 #define NM_DEFINE_GDBUS_INTERFACE_INFO(name_, ...) \
     ((GDBusInterfaceInfo *) (&(                    \

src/libnm-platform/nm-platform-utils.c

@@ -70,7 +70,8 @@ typedef struct {
 
 #define SOCKET_HANDLE_INIT(_ifindex) \
     {                                \
-        .fd = -1, .ifindex = (_ifindex), \
+        .fd      = -1,               \
+        .ifindex = (_ifindex),       \
     }
 
 static void
@@ -432,7 +433,8 @@ ethtool_get_stringset_index(SocketHandle *shandle, int stringset_id, const char
 static const NMEthtoolFeatureInfo _ethtool_feature_infos[_NM_ETHTOOL_ID_FEATURE_NUM] = {
 #define ETHT_FEAT(eid, ...)                                     \
     {                                                           \
-        .ethtool_id = eid, .n_kernel_names = NM_NARG(__VA_ARGS__), \
+        .ethtool_id     = eid,                                  \
+        .n_kernel_names = NM_NARG(__VA_ARGS__),                 \
         .kernel_names   = ((const char *const[]){__VA_ARGS__}), \
     }
 

src/libnm-platform/nmp-object.c

@@ -2002,7 +2002,8 @@ _vt_dedup_obj_clone(const NMDedupMultiObj *obj)
 
 #define DEDUP_MULTI_OBJ_CLASS_INIT()                                                       \
     {                                                                                      \
-        .obj_clone = _vt_dedup_obj_clone, .obj_destroy = _vt_dedup_obj_destroy,            \
+        .obj_clone   = _vt_dedup_obj_clone,                                                \
+        .obj_destroy = _vt_dedup_obj_destroy,                                              \
         .obj_full_hash_update =                                                            \
             (void (*)(const NMDedupMultiObj *obj, NMHashState *h)) nmp_object_hash_update, \
         .obj_full_equal = (gboolean(*)(const NMDedupMultiObj *obj_a,                       \

src/libnm-platform/nmp-object.h

@@ -40,7 +40,8 @@ G_STATIC_ASSERT(sizeof(NMSockAddrUnion) == sizeof(((NMSockAddrUnion *) NULL)->in
 
 #define NM_SOCK_ADDR_UNION_INIT_UNSPEC    \
     {                                     \
-        .in6 = {                       \
+        .in6 =                            \
+            {                             \
                 .sin6_family = AF_UNSPEC, \
             },                            \
     }

src/nmcli/nmcli.c

@@ -37,7 +37,8 @@
 
 #define _NMC_COLOR_PALETTE_INIT()                                  \
     {                                                              \
-        .ansi_seq = {                                          \
+        .ansi_seq =                                                \
+            {                                                      \
                 [NM_META_COLOR_CONNECTION_ACTIVATED]     = "32",   \
                 [NM_META_COLOR_CONNECTION_ACTIVATING]    = "33",   \
                 [NM_META_COLOR_CONNECTION_DISCONNECTING] = "31",   \