NetworkManager: remove systemd build option (#1736)
This commit is contained in:
parent
b248ff1f9f
commit
142e7e8641
|
@ -1,3 +0,0 @@
|
|||
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'
|
||||
pkgname=NetworkManager
|
||||
version=1.0.2
|
||||
revision=4
|
||||
revision=5
|
||||
build_style=gnu-configure
|
||||
configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
|
||||
--with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
|
||||
|
@ -10,6 +10,7 @@ configure_args="--without-dhcpcd --with-dhclient=/usr/bin/dhclient
|
|||
--with-kernel-firmware-dir=/usr/lib/firmware --disable-wimax
|
||||
--with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 --enable-modify-system
|
||||
--with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf
|
||||
--with-session-tracking=consolekit --with-suspend-resume=upower
|
||||
--enable-polkit-agent --enable-tests=no --sbindir=/usr/bin LDFLAGS=
|
||||
ac_cv_file__etc_redhat_release=no ac_cv_file__etc_gentoo_release=no
|
||||
ac_cv_file__etc_fedora_release=no ac_cv_file__etc_mandriva_release=no
|
||||
|
@ -39,20 +40,12 @@ make_dirs="
|
|||
"
|
||||
|
||||
# Package build options
|
||||
build_options="gir systemd"
|
||||
build_options="gir"
|
||||
# Disable gir for cross builds.
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
build_options_default+=" gir"
|
||||
fi
|
||||
|
||||
if [ "$build_option_systemd" ]; then
|
||||
configure_args+=" --with-session-tracking=systemd --with-suspend-resume=systemd"
|
||||
configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
|
||||
makedepends+=" systemd-devel"
|
||||
else
|
||||
configure_args+=" --with-session-tracking=consolekit --with-suspend-resume=upower"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
NOCONFIGURE=1 ./autogen.sh
|
||||
|
||||
|
@ -62,9 +55,6 @@ pre_configure() {
|
|||
|
||||
post_install() {
|
||||
vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname}
|
||||
if [ "$build_option_systemd" ]; then
|
||||
vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf
|
||||
fi
|
||||
# remove unused stuff
|
||||
rm -rf ${DESTDIR}/etc/init.d
|
||||
vsv ${pkgname}
|
||||
|
|
Loading…
Reference in New Issue