Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=a3dd40eb9308a83035c7e0b812c271f97995b2d5
commit a3dd40eb9308a83035c7e0b812c271f97995b2d5 Author: Michel Hermier <herm...@frugalware.org> Date: Sun Nov 28 16:16:54 2010 +0100 systemd-15-9-i686 * Add support for tty console font. diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index dfe8a10..5551c89 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -5,7 +5,7 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} pkgname=systemd pkgver=15 -pkgrel=8 +pkgrel=9 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 \ @@ -23,14 +23,14 @@ groups=('base') archs=('i686' 'x86_64' 'ppc') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd -backup=(etc/{inittab,rc.d/rc.local} etc/systemd/system.conf) +backup=(etc/{inittab,rc.d/rc.local,vconsole.conf} etc/systemd/system.conf) replaces=('sysvinit') provides=('sysvinit') conflicts=('sysvinit') Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware --with-pamlibdir=/lib/security \ - --with-rootdir= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ + --with-rootdir="" --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ --with-dbusinterfacedir=/usr/share/dbus-1/interfaces" subpkgs=('systemd-gtk') subdescs=('Graphical front-end for systemd.') @@ -121,7 +121,7 @@ build() } sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \ - 'd6f9cb532c0d2a726ecda32b564dcfaa4d188312' \ + '6bb289f43930f7b9dfca980936c91ac414821733' \ '05a469d19798c45bb0b8e477992d3c5f56e7ea7e' \ '2da5b17f95c2331eda19daa6aede672a4d872b73' \ '83e5879898d7750b157552606a62f0f7bf1f0c97' \ diff --git a/source/base/systemd/Frugalware.diff b/source/base/systemd/Frugalware.diff index 9ccadc3..461961f 100644 --- a/source/base/systemd/Frugalware.diff +++ b/source/base/systemd/Frugalware.diff @@ -1,4 +1,4 @@ -From 34208f15cbc2590e6fd07d91dd30a607f8ea9f5c Mon Sep 17 00:00:00 2001 +From 9b54dd3ac4ba309afc778ffd43386670cea58b7e 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 @@ -8,7 +8,8 @@ Subject: [PATCH] build-sys: frugalware linux support configure.ac | 8 ++++++++ src/hostname-setup.c | 4 ++-- src/service.c | 2 +- - 4 files changed, 18 insertions(+), 3 deletions(-) + src/vconsole-setup.c | 13 +++++++++++++ + 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 694ec57..39a8c9f 100644 @@ -102,22 +103,30 @@ index 429b53d..6b6ce30 100644 /* Debian style rcS.d */ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, #endif - ---- systemd/src/vconsole-setup.c.old 2010-11-28 11:49:16.000000000 +0100 -+++ systemd/src/vconsole-setup.c 2010-11-28 11:49:24.000000000 +0100 -@@ -314,6 +314,14 @@ - if (r != -ENOENT) - log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r)); +diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c +index 27e4178..d05c277 100644 +--- a/src/vconsole-setup.c ++++ b/src/vconsole-setup.c +@@ -267,6 +267,19 @@ int main(int argc, char **argv) { + log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); } + +#elif defined(TARGET_FRUGALWARE) -+ if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE, ++ if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE, + "keymap", &vc_keymap, + NULL)) < 0) { -+ + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/keymap: %s", strerror(-r)); + } - #endif - } - ++ if ((r = parse_env_file("/etc/sysconfig/font", NEWLINE, ++ "font", &vc_font, ++ NULL)) < 0) { ++ if (r != -ENOENT) ++ log_warning("Failed to read /etc/sysconfig/font: %s", strerror(-r)); ++ } + #elif defined(TARGET_GENTOO) + if ((r = parse_env_file("/etc/rc.conf", NEWLINE, + "unicode", &vc_unicode, +-- +1.7.3.2
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git