[Frugalware-git] fwonarm: Merge branch 'master' of genesis.frugalware.org:/pub/frugalware/frugalware-current

Elentir elentir at frugalware.org
Thu Mar 10 12:18:14 CET 2011


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwonarm.git;a=commitdiff;h=47782f95dd39c6be5f7c5d18b8fc13fabc0c3651

commit 47782f95dd39c6be5f7c5d18b8fc13fabc0c3651
Merge: a826efd 0b5d531
Author: Elentir <elentir at frugalware.org>
Date:   Thu Mar 10 12:09:58 2011 +0100

Merge branch 'master' of genesis.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/base/man/FrugalBuild

diff --cc source/base/systemd/FrugalBuild
index defad49,78ebd0d..698f7e2
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@@ -30,10 -30,10 +30,10 @@@ f
rodepends=("${depends[@]}"  'systemd-sysvinit')

groups=('base')
-archs=('i686' 'x86_64' 'ppc')
+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})
+ backup=(etc/{vconsole.conf,systemd/system.conf,machine-id})

if Fuse $USE_GUI; then
subpkgs=('systemd-gtk')


More information about the Frugalware-git mailing list