fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 16:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'lr/version-dir'

Browse source 
https://github.com/NetworkManager/NetworkManager/pull/104
This commit is contained in:
Lubomir Rintel 2018-05-09 12:59:57 +02:00
commit 57e06bc0b8
17 changed files with 48 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile.am
View file

@ -20,7 +20,7 @@ sbin_PROGRAMS =
bin_PROGRAMS =
libexec_PROGRAMS =
lib_LTLIBRARIES =
pkglib_LTLIBRARIES =
plugin_LTLIBRARIES =
core_plugins =
service_DATA =
man_MANS =
@ -73,6 +73,8 @@ examplesdir = $(docdir)/examples
rundir=$(runstatedir)/NetworkManager
statedir=$(localstatedir)/lib/NetworkManager
plugindir=$(pkglibdir)/$(NM_DIST_VERSION)
dbusactivationdir = $(datadir)/dbus-1/system-services
servicedir = $(datadir)/dbus-1/system-services
@ -578,7 +580,7 @@ libnm_core_libnm_core_la_CPPFLAGS = \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
-DNMPLUGINDIR=\"$(pkglibdir)\" \
-DNMPLUGINDIR=\"$(plugindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
$(NULL)
@ -1173,7 +1175,7 @@ src_cppflags = \
\
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLOCALEDIR=\"$(datadir)/locale\" \
-DNMPLUGINDIR=\"$(pkglibdir)\" \
-DNMPLUGINDIR=\"$(plugindir)\" \
-DNMRUNDIR=\"$(nmrundir)\" \
-DNMSTATEDIR=\"$(nmstatedir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
@ -4656,7 +4658,7 @@ check_PROGRAMS += $(check_programs) $(check_programs_norun)
check_LTLIBRARIES += $(check_ltlibraries)
endif
pkglib_LTLIBRARIES += $(core_plugins)
plugin_LTLIBRARIES += $(core_plugins)
TESTS += $(check_programs)
@ -4756,7 +4758,7 @@ install-data-hook: $(install_data_hook)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN
$(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir)
uninstall-hook: $(uninstall_hook)

7
configure.ac
View file

@ -183,10 +183,9 @@ dnl
AC_ARG_WITH(dist-version,
AS_HELP_STRING([--with-dist-version=<NM-distribution-version>],
[Define the NM''s distribution version string]),
ac_distver=$withval, ac_distver="")
if ! test x"$ac_distver" = x""; then
AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string])
fi
ac_distver=$withval, ac_distver=$NM_VERSION)
AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string])
AC_SUBST(NM_DIST_VERSION, "$ac_distver")
AC_ARG_ENABLE(wifi, AS_HELP_STRING([--enable-wifi], [enable Wi-Fi support]))
if test "${enable_wifi}" != "no"; then

26
contrib/fedora/rpm/NetworkManager.spec
View file

@ -26,6 +26,7 @@
%global systemd_dir %{_prefix}/lib/systemd/system
%global nmlibdir %{_prefix}/lib/%{name}
%global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
%global _hardened_build 1
@ -528,7 +529,7 @@ ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/n
rm -f %{buildroot}%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
rm -f %{buildroot}%{_libdir}/NetworkManager/*.la
rm -f %{buildroot}%{nmplugindir}/*.la
# Ensure the documentation timestamps are constant to avoid multilib conflicts
find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+
@ -604,8 +605,9 @@ fi
%{_libexecdir}/nm-dhcp-helper
%{_libexecdir}/nm-dispatcher
%{_libexecdir}/nm-iface-helper
%dir %{_libdir}/NetworkManager
%{_libdir}/NetworkManager/libnm-settings-plugin*.so
%dir %{_libdir}/%{name}
%dir %{nmplugindir}
%{nmplugindir}/libnm-settings-plugin*.so
%if %{with nmtui}
%exclude %{_mandir}/man1/nmtui*
%endif
@ -635,35 +637,35 @@ fi
%if %{with adsl}
%files adsl
%{_libdir}/%{name}/libnm-device-plugin-adsl.so
%{nmplugindir}/libnm-device-plugin-adsl.so
%else
%exclude %{_libdir}/%{name}/libnm-device-plugin-adsl.so
%exclude %{nmplugindir}/libnm-device-plugin-adsl.so
%endif
%if %{with bluetooth}
%files bluetooth
%{_libdir}/%{name}/libnm-device-plugin-bluetooth.so
%{nmplugindir}/libnm-device-plugin-bluetooth.so
%endif
%if %{with team}
%files team
%{_libdir}/%{name}/libnm-device-plugin-team.so
%{nmplugindir}/libnm-device-plugin-team.so
%endif
%if %{with wifi}
%files wifi
%{_libdir}/%{name}/libnm-device-plugin-wifi.so
%{nmplugindir}/libnm-device-plugin-wifi.so
%endif
%if %{with wwan}
%files wwan
%{_libdir}/%{name}/libnm-device-plugin-wwan.so
%{_libdir}/%{name}/libnm-wwan.so
%{nmplugindir}/libnm-device-plugin-wwan.so
%{nmplugindir}/libnm-wwan.so
%endif
%if %{with ovs}
%files ovs
%{_libdir}/%{name}/libnm-device-plugin-ovs.so
%{nmplugindir}/libnm-device-plugin-ovs.so
%{systemd_dir}/NetworkManager.service.d/NetworkManager-ovs.conf
%{_mandir}/man7/nm-openvswitch.7*
%endif
@ -671,7 +673,7 @@ fi
%if %{with ppp}
%files ppp
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
%{_libdir}/%{name}/libnm-ppp-plugin.so
%{nmplugindir}/libnm-ppp-plugin.so
%endif
%if %{with libnm_glib}

2
libnm-core/meson.build
View file

@ -141,7 +141,7 @@ cflags = [
'-DLOCALEDIR="@0@"'.format(nm_localedir),
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
'-DNMLIBDIR="@0@"'.format(nm_pkglibdir),
'-DNMPLUGINDIR="@0@"'.format(nm_pkglibdir)
'-DNMPLUGINDIR="@0@"'.format(nm_plugindir)
]
if enable_json_validation

2
libnm-glib/meson.build
View file

@ -287,7 +287,7 @@ pkg.generate(
variables: [
'exec_prefix=${prefix}',
'libgnome_serverdir=' + nm_libexecdir,
'plugindir=' + nm_pkglibdir,
'plugindir=' + nm_plugindir,
'configdir=' + nm_pkgconfdir
]
)

16
meson.build
View file

@ -25,6 +25,12 @@ nm_id_prefix = 'NM'
nm_gir_version = '1.0'
# Distribution version string
dist_version = get_option('dist_version')
if dist_version == ''
dist_version = nm_version
endif
nm_prefix = get_option('prefix')
nm_bindir = join_paths(nm_prefix, get_option('bindir'))
nm_datadir = join_paths(nm_prefix, get_option('datadir'))
@ -42,9 +48,10 @@ nm_pkgsbindir = join_paths(nm_sbindir, nm_name)
nm_pkgconfdir = join_paths(nm_sysconfdir, nm_name)
nm_pkgdatadir = join_paths(nm_datadir, nm_name)
nm_pkgincludedir = join_paths(nm_includedir, nm_name)
nm_pkglibdir = join_paths(nm_libdir, nm_name)
nm_pkglibdir = join_paths(nm_prefix, 'lib', nm_name)
nm_pkgrundir = join_paths(nm_runstatedir, nm_name)
nm_pkgstatedir = join_paths(nm_localstatedir, nm_name)
nm_plugindir = join_paths(nm_libdir, nm_name, dist_version)
libnm_name = 'libnm'
@ -258,11 +265,7 @@ if config_plugins_default == ''
endif
config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default)
# Distribution version string
dist_version = get_option('dist_version')
if dist_version != ''
config_h.set('NM_DIST_VERSION', dist_version)
endif
config_h.set_quoted('NM_DIST_VERSION', dist_version)
enable_wifi = get_option('wifi')
config_h.set10('WITH_WIFI', enable_wifi)
@ -886,6 +889,7 @@ output += ' nmlibdir: ' + nm_pkglibdir + '\n'
output += ' nmdatadir: ' + nm_pkgdatadir + '\n'
output += ' nmstatedir: ' + nm_pkgstatedir + '\n'
output += ' nmrundir: ' + nm_pkgrundir + '\n'
output += ' nmplugindir: ' + nm_plugindir + '\n'
output += '\nPlatform:\n'
output += ' session tracking: ' + ','.join(session_trackers) + '\n'
output += ' suspend/resume: ' + suspend_resume + '\n'

2
src/devices/adsl/meson.build
View file

@ -15,7 +15,7 @@ libnm_device_plugin_adsl = shared_module(
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_device_plugin_adsl

2
src/devices/bluetooth/meson.build
View file

@ -26,7 +26,7 @@ libnm_device_plugin_bluetooth = shared_module(
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_device_plugin_bluetooth

2
src/devices/ovs/meson.build
View file

@ -19,7 +19,7 @@ libnm_device_plugin_ovs = shared_module(
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_device_plugin_ovs

2
src/devices/team/meson.build
View file

@ -16,7 +16,7 @@ libnm_device_plugin_team = shared_module(
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_device_plugin_team

2
src/devices/wifi/meson.build
View file

@ -28,7 +28,7 @@ libnm_device_plugin_wifi = shared_module(
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_device_plugin_wifi

4
src/devices/wwan/meson.build
View file

@ -25,7 +25,7 @@ libnm_wwan = shared_module(
],
link_depends: linker_script,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
libnm_wwan_dep = declare_dependency(
@ -54,7 +54,7 @@ libnm_device_plugin_wwan = shared_module(
link_args: ldflags_linker_script_devices,
link_depends: linker_script_devices,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_device_plugin_wwan

2
src/meson.build
View file

@ -29,7 +29,7 @@ cflags = nm_cflags + [
'-DRUNDIR="@0@"'.format(nm_pkgrundir),
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
'-DNMPLUGINDIR="@0@"'.format(nm_pkglibdir),
'-DNMPLUGINDIR="@0@"'.format(nm_plugindir),
'-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
'-DNMSTATEDIR="@0@"'.format(nm_pkgstatedir),
'-DNMLIBDIR="@0@"'.format(nm_pkglibdir)

2
src/ppp/meson.build
View file

@ -37,5 +37,5 @@ core_plugins += shared_module(
],
link_depends: linker_script,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)

2
src/settings/plugins/ibft/meson.build
View file

@ -26,7 +26,7 @@ libnm_settings_plugin_ibft = shared_module(
link_args: ldflags_linker_script_settings,
link_depends: linker_script_settings,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_settings_plugin_ibft

2
src/settings/plugins/ifcfg-rh/meson.build
View file

@ -55,7 +55,7 @@ libnm_settings_plugin_ifcfg_rh = shared_module(
link_args: ldflags_linker_script_settings,
link_depends: linker_script_settings,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_settings_plugin_ifcfg_rh

2
src/settings/plugins/ifupdown/meson.build
View file

@ -31,7 +31,7 @@ libnm_settings_plugin_ifupdown = shared_module(
link_args: ldflags_linker_script_settings,
link_depends: linker_script_settings,
install: true,
install_dir: nm_pkglibdir
install_dir: nm_plugindir
)
core_plugins += libnm_settings_plugin_ifupdown