colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,307 Commits 4 Branches 0 Tags
b3d4bc578d2c60746df16a29a44839c5fc3b9b4c
Commit Graph

16307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Haller
4b965d0cf6 build: exclude building src/platform/tests/monitor for --enable-tests=no 
src/platform/tests/monitor is more a test-program. If should not
be compiled in a non-test build.
 2016-10-23 10:52:57 +02:00
Thomas Haller
b5aec6b7e7 config: cleanup ownership handling of @keyfile in read_entire_config() 2016-10-23 10:52:57 +02:00
Thomas Haller
f8c4a33f25 config: add run-configs to description string 2016-10-23 10:52:57 +02:00
Martin Pitt
49fcfcdfae config: skip shadowed run-config files in read_entire_config() 
https://bugzilla.gnome.org/show_bug.cgi?id=773069
 2016-10-23 10:52:57 +02:00
Mathieu Trudel-Lapierre
feff60ef3e config: read /run/NetworkManager/conf.d files 
This is useful for configuration that gets auto-generated from another source.
These are then not primary configuration files and thus should not be put into
/etc.

This mirrors the structure of udev rules or systemd units, which can also be in
/usr, /run/, or /etc/.

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>

https://bugzilla.gnome.org/show_bug.cgi?id=773069
 2016-10-23 10:52:57 +02:00
Thomas Haller
9cb2bbe658 build: merge branch 'th/build-cleanup' 
Some cleanup of the toplevel Makefile.am.

The aim it to build every source file only once. That saves compilation
time, but more importantly it guarantees that there are no differing CFLAGS
and all users use exactly the same binary.
 2016-10-22 17:56:32 +02:00
Thomas Haller
5cb60e7099 build: combine CPPFLAGS for src/tests 2016-10-22 17:55:44 +02:00
Thomas Haller
7b73951b1b build: buld nm-dhcp-manager.c as part of libNetworkMangerBase 
NetworkManager and nm-iface-helper compiled nm-dhcp-manager.c twice,
the latter with setting -DNM_DHCP_INTERNAL_ONLY to only enable the
internal plugin.

Change that to compile nm-dhcp-manager.c once for both users
by putting it into libNetworkManagerBase.
 2016-10-22 17:55:15 +02:00
Thomas Haller
f9bd72c337 build: build src/platform/tests/test-common.c as part of libNetworkManagerTest.la 
Instead having a base test-library libNetworkManagerTest.la and a separate
libnm-platform-tests.la, merge them together.
 2016-10-22 17:16:17 +02:00
Thomas Haller
58916ff30a build: refactor intermediate NetworkManager libraries during build 
nm-iface-helper re-compiled a number of source files that are already
compiled for NetworkManager. Prepare those files as libNetworkManagerBase.la.
 2016-10-22 17:16:17 +02:00
Thomas Haller
002f17c25d src: drop generated nm-src-enum-types.h 
We only needed proper glib enum types for having properties
and signal arguments. These got all converted to plain int,
so no longer generate such an enum type.
 2016-10-22 17:16:17 +02:00
Thomas Haller
3bbc55fd9c core: don't use generated glib enum for platform types 2016-10-22 17:16:17 +02:00
Thomas Haller
931a5b4f1c core: don't use generated glib enum for NMAuthSubjectType 2016-10-22 17:16:17 +02:00
Thomas Haller
5657d4dffb build: reuse common CPPFLAGS via dflt_cppflags_libnm_core variable 2016-10-22 17:16:17 +02:00
Thomas Haller
f5c5dba4f5 build: don't link libnm-wwan.la against introspection/libnmdbus.la 
Also, the $(top_builddir) was wrong.
 2016-10-22 17:15:50 +02:00
Thomas Haller
6375c54679 travis: build additional settings plugin in travis-ci 
Although the build environment is Ubuntu, we still can build the
non-native settings plugins to test the build.
 2016-10-22 17:15:50 +02:00
Thomas Haller
4450215ad1 build: fix out-of-tree build for libnm-core/tests 2016-10-22 17:12:06 +02:00
Thomas Haller
548a5440e9 ifcfg-rh: fix signature of link_changed() callback 
Depending on how arguments are passed to the called function,
this could lead to a crash.

Maybe not on 32 bit machines where the size of the pointer is
the size of an int.

Maybe not on x86_64, where the arguments are passed in registers.

Fixes: b88c309167
 2016-10-22 16:12:58 +02:00
Thomas Haller
9f11610606 build: fix out-of-tree build for dispatcher 2016-10-22 16:12:46 +02:00
Thomas Haller
75f29b8a9c build: fix out-of-tree build for libnm/tests/libnm-vpnplugin-utils-test.la 2016-10-22 16:07:46 +02:00
Thomas Haller
67cc67ce46 build: merge branch 'th/non-recursive-make-bgo772985' 
https://bugzilla.gnome.org/show_bug.cgi?id=772985
 2016-10-21 19:17:27 +02:00
Thomas Haller
6c90b529a1 build: fix make always re-making vapigen target 
Reproduce:

  make
  touch libnm-util/NetworkManager-1.0.gir
  make
  make
  # rebuilds "VAPIGEN vapi/libnm-util.vapi" every time.

  ls -la libnm-util/NetworkManager-1.0.gir vapi/libnm-util.vapi
  # note that vapi/libnm-util.vapi was not touched.

See-also: https://git.gnome.org/browse/vala/tree/ccode/valaccodewriter.vala?id=f52b484954d3297ae4c3230fbe969db18eb08841#n117
See-also: https://bugzilla.gnome.org/show_bug.cgi?id=773325
 2016-10-21 18:46:03 +02:00
Thomas Haller
351851cf27 build: merge "examples/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
b648772fc4 build: merge "examples/C/qt/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
742d36c476 build: merge "examples/C/glib/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
14b5309af3 build: merge "vapi/Makefile.am" into toplevel Makefile 
There is an strange automake warning

    Makefile.vapigen:49: warning: $(1) was already defined in condition TRUE, which includes condition ENABLE_VAPIGEN ...
    Makefile.am:4:   'Makefile.vapigen' included from here
    Makefile.glib:124: ... '$(1)' previously defined here
    Makefile.am:1:   'Makefile.glib' included from here

when having

    if ENABLE_VAPIGEN
    include Makefile.vapigen
    endif

That is worked around by removing the "if", which however
requires us to remove the error check in Makefile.vapigen.
 2016-10-21 17:37:57 +02:00
Thomas Haller
b0f4e25782 build: merge "docs/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
03e88d92a6 build: move nm.mk into main Makefile.am 2016-10-21 17:37:57 +02:00
Thomas Haller
2296db22c8 build: merge "man/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
0f09b1d1cc build: merge "libnm-glib/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
8027e09be4 build: merge "libnm-glib/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
7c66a6be17 build: merge "libnm-util/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
fa0acb2042 build: merge "libnm-util/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
8fa3314736 build: merge "data/Makefile.am" into toplevel Makefile 2016-10-21 17:37:57 +02:00
Thomas Haller
586e830e05 build: merge "clients/tui/Makefile.am" into toplevel Makefile 2016-10-21 17:37:56 +02:00
Thomas Haller
2238ccb48b travis: run tests in parallel 2016-10-21 17:37:56 +02:00
Thomas Haller
c8a25001f4 build: merge "clients/cli/Makefile.am" into toplevel Makefile 2016-10-21 17:37:56 +02:00
Thomas Haller
f63a5a2a0d build: merge "clients/Makefile.am" into toplevel Makefile 2016-10-21 17:37:56 +02:00
Thomas Haller
7fab25711a build: merge "dispatcher/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:37:56 +02:00
Thomas Haller
6f19ccdd58 build: merge "dispatcher/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
7bf4a15504 build: merge "src/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
1d8934e705 build: merge "src/tests/config/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
a0bb990f39 build: merge "src/supplicant-manager/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
e52a5e1146 build: merge "src/rdisc/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
f3437707e3 build: merge "src/devices/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
04eb0afd28 build: merge "src/platform/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
123b66b9f4 build: merge "src/dnsmasq-manager/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
ecb9f140cf build: merge "src/devices/team/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
eecd05b5bf build: merge "src/devices/wifi/tests/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00
Thomas Haller
da006929dd build: merge "src/devices/wifi/Makefile.am" into toplevel Makefile 2016-10-21 17:04:06 +02:00