Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=b388b44f35b5da67b156ee39a3b9c3e8a8bc3b97

commit b388b44f35b5da67b156ee39a3b9c3e8a8bc3b97
Author: Elentir <[email protected]>
Date:   Sun Oct 30 23:41:03 2011 +0100

systemd-37-2-arm

* add arm to systemd-gtk subpkg
* remove useless USE_GUI variable

diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index ea3d0d6..7f06940 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -4,11 +4,6 @@
USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"}
USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"}
USE_TCP=${USE_TCP:-"n"}
-if [ "$CARCH" == "arm" ]; then
-       USE_GUI=${USE_GUI:-"n"}
-else
-       USE_GUI=${USE_GUI:-"y"}
-fi

pkgname=systemd
pkgver=37
@@ -40,19 +35,15 @@ archs=('i686' 'x86_64' 'ppc' 'arm')
#TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd
backup=(etc/{vconsole.conf,systemd/system.conf,machine-id,machine-info,locale.conf})

-if Fuse $USE_GUI; then
-       subpkgs=('systemd-gtk')
-       subdescs=('Graphical frontend for systemd')
-       subrodepends=("$pkgname=$pkgver")
-       subdepends=('dbus-glib gtk+2 polkit libnotify>0.7')
-       subgroups=('xapps-extra')
-       subarchs=('i686 x86_64 ppc')
-       subprovides=('')
-       subreplaces=('gservice')
-       subconflicts=('')
-else
-       replaces=("${replaces[@]}"  'systemd-gtk')
-fi
+subpkgs=('systemd-gtk')
+subdescs=('Graphical frontend for systemd')
+subrodepends=("$pkgname=$pkgver")
+subdepends=('dbus-glib gtk+2 polkit libnotify>0.7')
+subgroups=('xapps-extra')
+subarchs=('i686 x86_64 ppc arm')
+subprovides=('')
+subreplaces=('gservice')
+subconflicts=('')

subpkgs=("${subpkgs[@]}" 'systemd-sysvinit' 'systemd-plymouth')
subdescs=("${subdescs[@]}" 'systemd System V init tools' 'Plymouth integration 
for systemd')
@@ -135,14 +126,13 @@ build()
Fmkdir lib/systemd/system/dbus.target.wants
Fmkdir lib/systemd/system/syslog.target.wants

-       if Fuse $USE_GUI; then
-               #split gtk fronted
-               # TODO : Added .desktop for start fronted
-               Fsplit systemd-gtk usr/bin/systemadm
-               Fsplit systemd-gtk usr/bin/systemd-gnome-ask-password-agent
-               Fsplit systemd-gtk 
usr/share/polkit-1/actions/org.freedesktop.systemd1.policy
-               Fsplit systemd-gtk usr/share/man/man1/systemadm.*
-       fi
+       #split gtk fronted
+       # TODO : Added .desktop for start fronted
+       Fsplit systemd-gtk usr/bin/systemadm
+       Fsplit systemd-gtk usr/bin/systemd-gnome-ask-password-agent
+       Fsplit systemd-gtk 
usr/share/polkit-1/actions/org.freedesktop.systemd1.policy
+       Fsplit systemd-gtk usr/share/man/man1/systemadm.*
+
Fsplit systemd-plymouth lib/systemd/system/plymouth-*.service
Fsplit systemd-plymouth lib/systemd/system/*.wants/plymouth-*.service
Fsplit systemd-plymouth /lib/systemd/system/systemd-ask-password-plymouth.*
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to