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

commit f13b0a7ed1848866ff7d42d230b95511e4cbb00a
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sun Nov 28 09:52:36 2010 +0100

systemd-15-7-i686

* Update Frugalware.diff.

diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index 2e6457f..5acab2a 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -5,11 +5,11 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"}

pkgname=systemd
pkgver=15
-pkgrel=6
+pkgrel=7
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 
Frugalware.diff \
-   functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 
rc.{de,en,hu,it}\
+       functions functions-{de,hu,it}.po inittab rc.4 rc.4-de.po rc.6 
rc.{de,en,hu,it}\
rc.functions rc.K rc.local rc.M rc.messages rc.reboot rc.reboot-{de,hu}.po \
rc.S rc.single rc.single-{de,hu}.po rc.sysvinit pidof console.conf)
up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
@@ -121,7 +121,7 @@ build()
}

sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \
-          'cc65287df736fc2f157e660850ce57df570e9581' \
+          '880de8cc30725ecb5f5f4852edaa9decb39ab359' \
'05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \
'2da5b17f95c2331eda19daa6aede672a4d872b73' \
'83e5879898d7750b157552606a62f0f7bf1f0c97' \
diff --git a/source/base/systemd/Frugalware.diff 
b/source/base/systemd/Frugalware.diff
index bf3894c..8c3e595 100644
--- a/source/base/systemd/Frugalware.diff
+++ b/source/base/systemd/Frugalware.diff
@@ -1,15 +1,41 @@
-From 83f62a23e97374af0bec8efeb7f8aa3faf1dfa4a Mon Sep 17 00:00:00 2001
+From 34208f15cbc2590e6fd07d91dd30a607f8ea9f5c Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmik...@frugalware.org>
Date: Wed, 24 Nov 2010 16:40:15 +0100
Subject: [PATCH] build-sys: frugalware linux support

---
+ Makefile.am          |    7 +++++++
configure.ac         |    8 ++++++++
src/hostname-setup.c |    4 ++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
+ src/service.c        |    2 +-
+ 4 files changed, 18 insertions(+), 3 deletions(-)

+diff --git a/Makefile.am b/Makefile.am
+index 694ec57..39a8c9f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -76,12 +76,19 @@ AM_CPPFLAGS += \
+       -DKBD_SETFONT=\"/usr/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+ else
++if TARGET_FRUGALWARE
++AM_CPPFLAGS += \
++      -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
++      -DKBD_SETFONT=\"/usr/bin/setfont\" \
++      -DDEFAULT_FONT=\"LatArCyrHeb-16\"
++else
+ AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+ endif
+ endif
++endif
+
+ rootbin_PROGRAMS = \
+       systemd \
diff --git a/configure.ac b/configure.ac
-index f9f5eee..4bf5c2e 100644
+index f9f5eee..fb19981 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,7 @@ if test "z$with_distro" = "z"; then
@@ -37,7 +63,7 @@ index f9f5eee..4bf5c2e 100644
AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
-+AM_CONDITIONAL(TARGET_FRUGLWARE, test x"$with_distro" = xfrugalware)
++AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)

AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog 
service name])

@@ -63,6 +89,19 @@ index ce7d2a1..0428a64 100644
return read_and_strip_hostname(FILENAME, hn);
#else
return -ENOENT;
+diff --git a/src/service.c b/src/service.c
+index 429b53d..6b6ce30 100644
+--- a/src/service.c
++++ b/src/service.c
+@@ -65,7 +65,7 @@ static const struct {
+         { "boot.d", SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
+ #endif
+
+-#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
++#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || 
defined(TARGET_FRUGALWARE)
+         /* Debian style rcS.d */
+         { "rcS.d",  SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
+ #endif
--
-1.7.3.2
+1.7.3.2.164.g6f10c.dirty
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to