Commit graph

65 commits

Author SHA1 Message Date
Dan Winship
3d25d70461 clients: reorganize source tree, put all the installed clients together
Create a new clients/ subdirectory at the top level, and move cli/ and
tui/ into it, as well as nm-online.c (which was previously in test/,
which made no sense).

cli/ was split into two subdirectories, src/ and completion/. While
this does simplify things (given that the completion file and the
binary both need to be named "nmcli"), it bloats the source tree, and
we can work around it by just renaming the completion file at install
time. Then we can combine the two directories into one and just have
it all under clients/cli/.
2014-07-30 15:56:19 -04:00
Dan Williams
25dac5760b contrib/rpm: fix up sub-package dependencies
There are three fixes:

1) the config packages shouldn't require the main NetworkManager
package.  We explicitly make NetworkManager-glib not
depend on NM itself to ensure that clients can link to it (and thus
have an RPM dependency on -glib) without pulling in NetworkManager
itself.  The same should hold true for the config packages, since
consumers of NetworkManager may want to pull them in, but not
necessarily pull NetworkManager in.

For example, GNOME Shell wants to make use of NetworkManager's
connectivity detection *if NM is available*, and this requires
pulling in NM-config-connectivity-fedora, but that shouldn't
pull in NetworkManager itself.

Similarly, we had a problem with RHEL7 making sure that
NM-config-server was installed by default on Server variants but
not on other variants; removing the dependency from the -config
subpackage was the cleanest way to fix that.

Furthermore, nothing in the config sub-packages actually
requires NetworkManager anyway since they are simply config files.

2) nmtui doesn't care what architecture the running NM is since
it communicates solely over D-Bus.  So skip the %{?_isa}, just
like we do for other clients (nm-applet, GNOME Shell, etc)

3) Requiring NetworkManager.%{?_isa} from the -devel package
has problems with multilib (see rh #1112367).  This is an issue
if you install a 32-bit development environment and try to build
something that uses NetworkManager.  Since the -devel package
requires the main package, you can end up either having *both*
NetworkManager.i686 and NetworkManager.x86_64 installed, or you
end up having NetworkManager.i686 replace NetworkManager.x86_64.
Neither one is good. So remove the %{?_isa} bit.
2014-07-30 09:35:02 -05:00
Elad Alfassa
9060e1ab1a contrib/rpm: set connectivity interval in 20-connectivity-fedora.conf (rh #1123772)
Without the interval, connectivity checking doesn't actually happen.

https://bugzilla.redhat.com/show_bug.cgi?id=1123772
2014-07-30 08:40:59 -05:00
Thomas Haller
40a3e20006 contrib/rpm: add --quick argument to build_clean.sh script
Before, build_clean.sh always required building all NetworkManager
and doing another `make distcheck` before calling rpmbuild.

That is still a good idea, to ensure that we get a proper build.
For some quick testing however, lets speed this up with a new
--dist argument that only calls `make dist`.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-07-04 19:59:08 +02:00
Thomas Haller
d2be2ac78d contrib/rpm: update spec file to make ppp_version dependent on fedora version
Fedora 21 (rawhide) needs ppp version 2.4.6.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-07-04 13:44:44 +02:00
Thomas Haller
3cfd8b8eec contrib/rpm: add new package NetworkManager-config-connectivity-fedora
Provides config file 20-connectivity-fedora.conf

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-07-04 12:25:51 +02:00
Thomas Haller
031142000a contrib/nm-live-vm: install required packages readline, gobject-introspection, and pygobject3
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
04591cfa2e contrib/nm-live-vm: fix run.sh script to into script directory
run.sh refers to the image file via relative path.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
c274725dc3 contrib/nm-live-vm: start the VM with less memory (1024 mb)
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
6a5c05e61a contrib/nm-live-vm: install wget and setup bashrc and git
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
acfb0b1bbf contrib/nm-live-vm: enable option main.debug for NM in VM
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
cd7c97eb1d contrib/nm-live-vm: write /etc/fstab
Everytime you call mock again, the fstab file will be reset.
So, we have to write it shortly before creating the image.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
0178d73699 contrib/nm-live-vm: disable rate limiting in the journal of the VM
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
0689efc768 contrib/nm-live-vm: don't remove the temporary directory with the extracted VM image
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
fe267b0fd2 contrib/nm-live-vm: enable ssh server and add port forward from localhost:10022
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
78f94726a7 contrib/nm-live-vm: share a directory with the live-vm
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
fbc9c41e96 contrib/nm-live-vm: include the NetworkManager source in the live-mv file for debugging
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
f2878b7633 contrib/nm-live-vm: compile live-vm build without compiler optimization
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Jiří Klimeš
ef052ead88 contrib/nm-live-vm: add dnsmasq to the VM 2014-06-30 17:42:09 +02:00
Jiří Klimeš
84b3e924df contrib/nm-live-vm: fix build - libndp-devel is now required 2014-06-30 17:42:09 +02:00
Jiří Klimeš
f20f706d34 contrib/nm-live-vm: also build nmtui 2014-06-30 17:42:09 +02:00
Jiří Klimeš
dc872b7e52 contrib/nm-live-vm: add rootfstype=ramfs kernel parameter to run.sh
Kernel changed default filesystem for roots from ramfs to tmpfs.
See http://lwn.net/Articles/559176/ for more information.
The change caused our initramfs to be mounted with size= parameter that equals
to the actual size of unpacked initramfs. That's why mounted / was full and no
space was available (without manual remounting: mount -o remount,size=100% /).

So we explicitly require usage of ramfs to have all RAM of the virtual machine
available for /.

Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
2014-06-30 17:42:09 +02:00
Jiří Klimeš
26626c75c3 contrib/nm-live-vm: put qemu network-related options into a variable
Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
2014-06-30 17:42:09 +02:00
Jiří Klimeš
9b3922390c contrib/nm-live-vm: update scripts to make VM based on Fedora 20
Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
e9ed87a920 contrib/nm-live-vm: adjust build script to enable DEBUG logging
Enable more logging when starting NM.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Thomas Haller
7b43e0526e contrib/nm-live-vm: change scripts to be run by unprevileged user
The user must still be member of the 'mock' group though.

Also, hack something, that the current git repositoy will be reused, so
that we don't have to fetch the entire repositoy from upstream.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-30 17:42:09 +02:00
Jiří Klimeš
b0f9302e1f contrib/nm-live-vm: add 'teamd' and 'libteam' packages to the VM for teaming to work 2014-06-30 17:42:09 +02:00
Jiří Klimeš
b22b063f97 contrib/nm-live-vm: add some debugging tools and useful utilities 2014-06-30 17:42:09 +02:00
Jiří Klimeš
c976724571 contrib/nm-live-vm: correct and simplify paths for configure 2014-06-30 17:42:08 +02:00
Jiří Klimeš
ebc1183542 contrib/nm-live-vm: documentation/man pages now depend on '--enable-gtk-doc' 2014-06-30 17:42:08 +02:00
Jiří Klimeš
f1c0a1a85b contrib/nm-live-vm: put the archive name explicitly inside the bundled script
Getting the archive name from the bundled script file name is fragile.
2014-06-30 17:42:08 +02:00
Jiří Klimeš
514d594e9d contrib/nm-live-vm: add 'gdb' to the VM
It is very helful for testing the size doesn't hurt (~ 2 MB)
2014-06-30 17:42:08 +02:00
Jiří Klimeš
39fdae3799 contrib/nm-live-vm: set of scripts for building a live initramfs for NM testing
The scripts use Fedora to build a Fedora 18 (i386) live image, and pack
it into a single self-extracting script, that can be easily distributed.

$ sudo ./build [-n name] [-b branch/commit]
will create name-bundle.sh with NM built of a specified NM branch(commit).
(defaults are: name="nm-live-vm"; branch="master")

Resulting nm-live-vm-bundle.sh can be run with almost any distro.
The only requirement is qemu-kvm (and VNC (tigervnc) on RHEL).
2014-06-30 17:42:08 +02:00
Thomas Haller
38a83e15a2 team: make team support a plugin
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-27 13:27:01 +02:00
Thomas Haller
adb3e37c74 contrib/rpm: cleanup of NetworkManager.spec by adding %{epoch_version} and %{git_sha_version}
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-25 22:11:57 +02:00
Thomas Haller
ca85ecd145 contrib/rpm: fix typo in spec file (wrong option --enable-teamdctl)
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-19 12:49:14 +02:00
Thomas Haller
bf0b08ad55 contrib/rpm: improve usage output of build_clean.sh script
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-18 10:49:51 +02:00
Dan Williams
7c256586da contrib/rpm: misc specfile updates
Unify the obsoletes so they don't have to be changed every time.

Clarify the WWAN package description, since it really applies to
2G/3G/4G devices, not just 3G.

Also sync the glib and dbus-glib required versions with actual
NetworkManager requirements from configure.ac.
2014-06-09 10:45:29 -05:00
Jiří Klimeš
3dccef6631 contrib/rpm: update NetworkManager description in spec file
Text by dcbw.
2014-06-09 11:07:00 +02:00
Thomas Haller
fb88ec99f1 build: create dispatcher directories pre-down.d and pre-up.d
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-07 01:17:16 +02:00
Dan Williams
4cc13befd3 dispatcher: rename executable to 'nm-dispatcher' 2014-06-06 13:43:45 -05:00
Thomas Haller
69dc3f96c5 contrib/build: require readline library for nmcli in NetworkManager.spec
This is needed since commit 13b10607d4.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-06-04 12:05:03 +02:00
Thomas Haller
070e19dc31 contrib/build: cleanup build.sh script and improve build_clean.sh
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 19:27:42 +02:00
Thomas Haller
7857043195 contrib/build: cleanup build.sh script by adding write_changelog() function
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 19:27:42 +02:00
Thomas Haller
dbed9e5378 contrib/build: remove external NMTUI source from build.sh
nmtui is long part of the NM main source. Remove the code from the build.sh
script to add 'nmtui' from an external tarball.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 19:27:38 +02:00
Thomas Haller
c98b3fcd52 contrib/build: fix spec file after creating network-online.target.wants link in Makefile
Fix NetworkManager.spec file after changing `make install` in commit
afd30f5f3b.

https://bugzilla.gnome.org/show_bug.cgi?id=728965

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-31 14:55:52 +02:00
Jiří Klimeš
5aefa120f8 contrib/rpm: own some missing directories (rh #1099789)
https://bugzilla.redhat.com/show_bug.cgi?id=1099789

Based on hint from jpopelka@redhat.com
2014-05-21 16:23:23 +02:00
Thomas Haller
0d09472e45 contrib/rpm: adjust required bluez version in SPEC file for NetworkManager-bluetooth plugin
rhel-7.0 comes with bluez4, not bluez5

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-20 13:58:49 +02:00
Dan Williams
93fb403e10 contrib/rpm: clean up dependencies and plugins in NetworkManager.spec
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-19 18:55:59 +02:00
Tore Anderson
c2e99b181f contrib/rpm: force POSIX changelog date locale
Ensure the date in the generated changelog entry is in the POSIX locale
format. Otherwise rpmbuild might fail with "bad date in %changelog" due
to it not liking localised date formats.

https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00034.html

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-19 14:51:48 +02:00