NetworkManager: added gir build option for cross compilation; use tmpfiles.d(5).
This commit is contained in:
parent
92d2a0eaef
commit
91d48e13f3
2 changed files with 33 additions and 18 deletions
3
srcpkgs/NetworkManager/files/tmpfilesd
Normal file
3
srcpkgs/NetworkManager/files/tmpfilesd
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
d /etc/NetworkManager/dispatcher.d 0755 root root -
|
||||||
|
d /etc/NetworkManager/system-connections 0755 root root -
|
||||||
|
d /var/lib/NetworkManager 0700 root root -
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'NetworkManager'
|
# Template file for 'NetworkManager'
|
||||||
pkgname=NetworkManager
|
pkgname=NetworkManager
|
||||||
version=0.9.8.8
|
version=0.9.8.8
|
||||||
revision=2
|
revision=3
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
|
configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
|
||||||
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
|
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
|
||||||
|
@ -19,20 +19,41 @@ license="GPL-2"
|
||||||
distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
|
distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz"
|
||||||
checksum=8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55
|
checksum=8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55
|
||||||
|
|
||||||
hostmakedepends="pkg-config intltool gobject-introspection"
|
hostmakedepends="pkg-config intltool"
|
||||||
makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
|
makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
|
||||||
libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel
|
libnl3-devel polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel
|
||||||
ModemManager-devel dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant bluez>5
|
ModemManager-devel dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant bluez>5
|
||||||
mobile-broadband-provider-info"
|
mobile-broadband-provider-info"
|
||||||
|
|
||||||
|
depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
|
||||||
|
conf_files="/etc/${pkgname}/${pkgname}.conf"
|
||||||
|
systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
|
||||||
|
|
||||||
|
# Package build options
|
||||||
|
build_options="gir"
|
||||||
|
desc_option_gir="Enable support for building gobject introspection data"
|
||||||
|
|
||||||
|
# Disable gir for cross builds.
|
||||||
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
build_options_default="gir"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$build_option_gir" ]; then
|
||||||
|
configure_args+=" --enable-introspection"
|
||||||
|
hostmakedepends+=" gobject-introspection"
|
||||||
|
else
|
||||||
|
configure_args+=" --disable-introspection"
|
||||||
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
# Full switch to /run to not depend on /var/run being a symlink.
|
# Full switch to /run to not depend on /var/run being a symlink.
|
||||||
sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
|
sed -e 's,^nmrundir=.*$,nmrundir=\"/run/\$PACKAGE\",' -i configure
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
# Install config file.
|
|
||||||
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
|
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
|
||||||
|
vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
|
||||||
|
# remove unused stuff
|
||||||
rm -rf ${DESTDIR}/etc/init.d
|
rm -rf ${DESTDIR}/etc/init.d
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +62,9 @@ libnm_package() {
|
||||||
short_desc+=" - shared libraries"
|
short_desc+=" - shared libraries"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove "usr/lib/*.so.*"
|
vmove "usr/lib/*.so.*"
|
||||||
vmove "usr/lib/girepository-*"
|
if [ "$build_option_gir" ]; then
|
||||||
|
vmove usr/lib/girepository-1.0
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,20 +75,9 @@ NetworkManager-devel_package() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
vmove usr/lib/pkgconfig
|
vmove usr/lib/pkgconfig
|
||||||
vmove "usr/lib/*.so"
|
vmove "usr/lib/*.so"
|
||||||
|
if [ "$build_option_gir" ]; then
|
||||||
vmove usr/share/gir-1.0
|
vmove usr/share/gir-1.0
|
||||||
|
fi
|
||||||
vmove usr/share/gtk-doc
|
vmove usr/share/gtk-doc
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NetworkManager_package() {
|
|
||||||
make_dirs="
|
|
||||||
/etc/${pkgname}/dispatcher.d 0755 root root
|
|
||||||
/etc/${pkgname}/system-connections 0755 root root
|
|
||||||
/var/lib/${pkgname} 0700 root root"
|
|
||||||
depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
|
|
||||||
conf_files="/etc/${pkgname}/${pkgname}.conf"
|
|
||||||
systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
|
|
||||||
pkg_install() {
|
|
||||||
vmove all
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue