Merge pull request #1947 from beefcurtains/remove-systemd-fixed
Remove systemd (polkit + revdeps)
This commit is contained in:
beefcurtains
commit
79dd9ea347
13 changed files with 22 additions and 99 deletions
|
|
@ -1,8 +1,8 @@
|
|||
# Template file for 'ModemManager'
|
||||
pkgname=ModemManager
|
||||
version=1.4.8
|
||||
revision=2
|
||||
build_options="gir systemd"
|
||||
revision=3
|
||||
build_options="gir"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --sbindir=/usr/bin
|
||||
--with-udev-base-dir=/usr/lib/udev --with-polkit=permissive
|
||||
|
|
@ -10,7 +10,7 @@ configure_args="--disable-static --sbindir=/usr/bin
|
|||
hostmakedepends="pkg-config intltool glib-devel autoconf
|
||||
$(vopt_if gir 'vala-devel gobject-introspection')"
|
||||
makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel
|
||||
libmbim-devel ppp libqmi-devel $(vopt_if systemd systemd-devel)"
|
||||
libmbim-devel ppp libqmi-devel"
|
||||
depends="hicolor-icon-theme ppp"
|
||||
short_desc="Mobile broadband modem management service"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
# Template file for 'gdm'
|
||||
pkgname=gdm
|
||||
version=3.16.1.1
|
||||
revision=1
|
||||
revision=2
|
||||
patch_args="-Np1"
|
||||
build_style=gnu-configure
|
||||
configure_args="$(vopt_enable gir introspection)
|
||||
--disable-schemas-compile --disable-static --with-default-pam-config=arch
|
||||
--with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
|
||||
--with-screenshot-dir=/var/lib/gdm/greeter --sbindir=/usr/bin --without-plymouth
|
||||
--with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid"
|
||||
--with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid
|
||||
--with-console-kit --without-systemd --disable-systemd-journal --with-initial-vt=7"
|
||||
hostmakedepends="automake libtool pkg-config itstool intltool gnome-doc-utils
|
||||
$(vopt_if gir gobject-introspection)"
|
||||
makedepends="glib-devel iso-codes gettext-devel
|
||||
|
|
@ -35,20 +36,12 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*.*}/$pkgname-$version.tar.xz"
|
|||
checksum=2d2409fdc0a53b080377730a7775bc3239f8584829ff327d3465def0b20433db
|
||||
|
||||
# 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-systemd --enable-systemd-journal --with-initial-vt=1"
|
||||
configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
|
||||
makedepends+=" systemd-devel"
|
||||
else
|
||||
configure_args+=" --with-console-kit --without-systemd --disable-systemd-journal --with-initial-vt=7"
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
AUTOPOINT='intltoolize --automake -c' NOCONFIGURE=1 autoreconf -fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
[Unit]
|
||||
Description=K Display Manager
|
||||
After=systemd-user-sessions.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/kdm -nodaemon
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
|
|
@ -4,7 +4,7 @@ _kappversion=15.04.1
|
|||
|
||||
pkgname=kde-workspace
|
||||
version=4.11.19
|
||||
revision=1
|
||||
revision=2
|
||||
short_desc="Provides the interface and basic tools for the KDE workspace"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL, LGPL, FDL"
|
||||
|
|
@ -15,7 +15,7 @@ checksum=1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2
|
|||
build_style=cmake
|
||||
configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc
|
||||
-DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_NepomukCore=OFF -DWITH_Soprano=OFF
|
||||
$(vopt_if systemd '-DWITH-CkConnector=OFF' '-DWITH_CkConnector=ON')"
|
||||
-DWITH_CkConnector=ON"
|
||||
|
||||
# XXX prison.
|
||||
hostmakedepends="cmake automoc4 pkg-config"
|
||||
|
|
@ -27,7 +27,7 @@ makedepends="libressl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-de
|
|||
libXtst-devel libXft-devel glib-devel fontconfig-devel kdepimlibs-devel
|
||||
libsensors-devel wayland-devel MesaLib-devel pam-devel libusb-compat-devel
|
||||
NetworkManager-devel pciutils-devel libraw1394-devel python-devel libqalculate-devel
|
||||
akonadi-devel qjson-devel $(vopt_if systemd '' ConsoleKit-devel)"
|
||||
akonadi-devel qjson-devel ConsoleKit-devel"
|
||||
depends="kde-wallpapers>=${_kdeversion} kde-base-artwork>=${_kdeversion}"
|
||||
conf_files="
|
||||
/etc/kdm/kdmrc
|
||||
|
|
@ -41,7 +41,6 @@ make_dirs="
|
|||
/etc/kde/env 0755 root root
|
||||
/etc/kde/shutdown 0755 root root
|
||||
/var/lib/kdm 0755 kdm kdm"
|
||||
build_options="systemd"
|
||||
|
||||
pre_configure() {
|
||||
sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp
|
||||
|
|
@ -52,9 +51,6 @@ post_install() {
|
|||
for f in kde kde-np kscreensaver; do
|
||||
install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f}
|
||||
done
|
||||
if [ "$build_option_systemd" ]; then
|
||||
vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system
|
||||
fi
|
||||
vsv kdm
|
||||
vmkdir usr/share/xsessions
|
||||
ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
[Unit]
|
||||
Description=Light Display Manager
|
||||
Documentation=man:lightdm(1)
|
||||
Conflicts=getty@tty1.service
|
||||
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/lightdm
|
||||
Restart=always
|
||||
IgnoreSIGPIPE=no
|
||||
BusName=org.freedesktop.DisplayManager
|
||||
|
||||
[Install]
|
||||
Alias=display-manager.service
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
d /run/lightdm 0711 lightdm lightdm
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'lightdm'
|
||||
pkgname=lightdm
|
||||
version=1.14.2
|
||||
revision=1
|
||||
revision=2
|
||||
build_pie=yes
|
||||
build_style=gnu-configure
|
||||
configure_args="--sbindir=/usr/bin --with-greeter-session=lightdm-gtk-greeter
|
||||
|
|
@ -14,15 +14,12 @@ homepage="https://launchpad.net/lightdm"
|
|||
distfiles="https://launchpad.net/lightdm/${version%.*}/$version/+download/$pkgname-$version.tar.xz"
|
||||
checksum=28b078979870782aaa1a9167945e1dab19cc6d699747af3d0c0c9a3bdb8dbba1
|
||||
|
||||
# both install /etc/dbus-1/system.d/org.freedesktop.DisplayManager.conf
|
||||
conflicts="sddm>=0"
|
||||
|
||||
build_options="gir systemd"
|
||||
build_options="gir"
|
||||
hostmakedepends="pkg-config intltool itstool $(vopt_if gir gobject-introspection)"
|
||||
makedepends="dbus-glib-devel libxklavier-devel libxml2-devel
|
||||
gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel
|
||||
libgcrypt-devel accountsservice-devel $(vopt_if systemd systemd-devel)"
|
||||
depends="dbus accountsservice $(vopt_if systemd '' 'ConsoleKit2 upower0')"
|
||||
libgcrypt-devel accountsservice-devel"
|
||||
depends="dbus accountsservice ConsoleKit2 upower0"
|
||||
conf_files="
|
||||
/etc/lightdm/keys.conf
|
||||
/etc/lightdm/lightdm.conf
|
||||
|
|
@ -44,10 +41,6 @@ fi
|
|||
post_install() {
|
||||
# Remove provided init file and use our own.
|
||||
rm -rf ${DESTDIR}/etc/init
|
||||
if [ "$build_option_systemd" ]; then
|
||||
vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system
|
||||
vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf
|
||||
fi
|
||||
vsv lightdm
|
||||
vinstall ${FILESDIR}/lightdm.rules 644 usr/share/polkit-1/rules.d
|
||||
vinstall ${FILESDIR}/xsession 755 etc/lightdm Xsession
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
# Template file for 'lxdm'
|
||||
pkgname=lxdm
|
||||
version=0.5.1
|
||||
revision=5
|
||||
revision=6
|
||||
build_style=gnu-configure
|
||||
build_options="systemd"
|
||||
configure_args="--sbindir=/usr/bin $(vopt_if systemd --disable-consolekit --enable-consolekit) --with-pam"
|
||||
configure_args="--sbindir=/usr/bin --enable-consolekit --with-pam"
|
||||
hostmakedepends="automake gettext-devel libtool pkg-config intltool"
|
||||
makedepends="pam-devel gtk+-devel iso-codes $(vopt_if systemd '' ConsoleKit2-devel)"
|
||||
makedepends="pam-devel gtk+-devel iso-codes ConsoleKit2-devel"
|
||||
conf_files="
|
||||
/etc/lxdm/LoginReady
|
||||
/etc/lxdm/PostLogin
|
||||
|
|
@ -37,9 +36,7 @@ post_install() {
|
|||
rm -f ${DESTDIR}/etc/pam.d/lxdm
|
||||
vinstall ${FILESDIR}/lxdm.pam 644 etc/pam.d lxdm
|
||||
# use tty7 for X without systemd
|
||||
if [ -z "$build_option_systemd" ]; then
|
||||
sed -i 's,vt1,vt7,g' ${DESTDIR}/etc/lxdm/lxdm.conf
|
||||
fi
|
||||
sed -i 's,vt1,vt7,g' ${DESTDIR}/etc/lxdm/lxdm.conf
|
||||
sed -i 's,/usr/sbin,/usr/bin,g' ${DESTDIR}/usr/bin/lxdm
|
||||
vmkdir var/lib/lxdm
|
||||
echo 'GDK_CORE_DEVICE_EVENTS=true' > ${DESTDIR}/var/lib/lxdm/.pam_environment
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
[Unit]
|
||||
Description=Subversion protocol daemon
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/conf.d/svnserve
|
||||
ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1 +0,0 @@
|
|||
D /run/svnserve 0700 root root -
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'subversion'
|
||||
pkgname=subversion
|
||||
version=1.8.13
|
||||
revision=2
|
||||
revision=3
|
||||
short_desc="Enterprise-class centralized version control for the masses"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="Apache-2.0, BSD"
|
||||
|
|
@ -17,7 +17,6 @@ makedepends="db-devel perl python-devel swig apr-util-devel
|
|||
depends="ca-certificates"
|
||||
|
||||
nocross=yes
|
||||
build_options="systemd"
|
||||
|
||||
do_configure() {
|
||||
./configure ${configure_args} \
|
||||
|
|
@ -39,11 +38,6 @@ do_install() {
|
|||
swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
|
||||
install install-swig-py install-swig-pl
|
||||
|
||||
if [ "$build_option_systemd" ]; then
|
||||
vinstall ${FILESDIR}/svnserve.service 644 usr/lib/systemd/system
|
||||
vinstall ${FILESDIR}/svnserve.tmpfiles 644 usr/lib/tmpfiles.d svnserve.conf
|
||||
fi
|
||||
|
||||
rm -rf ${DESTDIR}/usr/lib/perl5/core_perl
|
||||
vmkdir usr/share/subversion
|
||||
install -d -m755 tools/hook-scripts ${DESTDIR}/usr/share/subversion/
|
||||
|
|
|
|||
Loading…
Reference in a new issue