Commit graph

793 commits

Author SHA1 Message Date
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
Thomas Haller 66164c480d contrib/rpm: update build_clean.sh script to work with older version of git
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-14 15:19:24 +02:00
Thomas Haller 08e8b3bd13 contrib/rpm: update spec file adding new wifi plugin NetworkManager-wifi
Commit a544aa374e extracts the wifi device
into a shared library. Update the (currently broken) default spec file to
build the new package NetworkManager-wifi.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-14 14:31:57 +02:00
Thomas Haller a2430f01d6 contrib/rpm: update spec file to exclude disabled plugin files
When plugins are disabled (which is configurable), the additional files
must be excluded. Otherwise rpmbuild fails with:
  Installed (but unpackaged) file(s) found:

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-14 14:31:02 +02:00
Thomas Haller 4e8a91e6f8 Revert "contrib: fix "Illegal sequence '..' in Fedora specfile Release"
This reverts commit 8f44bf047f.

This spec file is not intended to be passed directly to rpmbuild,
because it contains placeholders that are substituted by the build.sh
script.

As such, the version we want to get is
  NetworkManager-0.9.9.1-7922.66eb52b53d.fc20.src.rpm
instead of
  NetworkManager-0.9.9.1-792266eb52b53d.fc20.src.rpm

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-12 13:00:27 +02:00
poma 8f44bf047f contrib: fix "Illegal sequence '..' in Fedora specfile Release
$ rpmbuild -bp NetworkManager.spec
error: line 47: Illegal sequence ".." in: Release: 10.git20140508..429023b.fc21

Signed-off-by: poma <pomidorabelisima@gmail.com>
2014-05-09 11:56:30 -05:00
Thomas Haller fb8a5f7ac9 contrib/rpm: update spec file to explicitly --disable-gtk-doc
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:37 +02:00
Thomas Haller b322642a03 contrib/rpm: add script build_clean.sh to create clean RPM files 2014-05-07 18:16:36 +02:00
Thomas Haller 886366d0fd contrib/rpm: update spec file after renaming NM plugins
Rename NetworkManager-atm to NetworkManager-adsl
and NetworkManager-bt to NetworkManager-bluetooth.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:36 +02:00
Thomas Haller f9229a33c7 contrib/rpm: modify spec file to create packages for NM plugins
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:36 +02:00
Thomas Haller b057d5179e contrib/rpm: build.sh uses the number of git commits as RELEASE_VERSION
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:36 +02:00
Thomas Haller a9ed313956 contrib/rpm: fix release version in rpm change log
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:36 +02:00
Thomas Haller 6db1d68e3f contrib/rpm: update NetworkManager.spec
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 18:16:13 +02:00
Thomas Haller 8b6966bfe7 contrib/rpm: fix spec file for fc20
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 17:14:36 +02:00
Thomas Haller 8871aad554 contrib/rpm: update spec file to build nmtui from in-tree source
Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 17:14:36 +02:00
Thomas Haller cc45fe0a7e contrib/rpm: add spec file and script to build a RPM package
This one spec file is intended to build packages for F18, F19, F20, and
rhel-7.0.

The build script can be tweaked by setting environment variables, but it
is supposed to choose the right default values on it's own.

Signed-off-by: Thomas Haller <thaller@redhat.com>
2014-05-07 17:14:36 +02:00