Commit 92fa4a1c authored by Mateusz's avatar Mateusz

Systemd Update

parent d20cba33
......@@ -4,13 +4,13 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=systemd
pkgver=37
pkgver=40
pkgrel=1
pkgdesc="Session and Startup manager"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2')
depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172')
depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'acl')
makedepends=('docbook-xsl' 'gperf' 'libxslt' 'cryptsetup' 'intltool' 'libnotify')
optdepends=('cryptsetup: required for encrypted block devices'
'dbus-python: systemd-analyze'
......@@ -30,11 +30,11 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
etc/systemd/user.conf
etc/systemd/systemd-logind.conf)
install=systemd.install
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
"os-release" "systemd-add-chakra.patch" )
md5sums=('1435f23be79c8c38d1121c6b150510f3'
md5sums=('8880180f54dac8618ef70c46492fd8d9'
'68cf3e12b0e98a51efde9811e5fc713c'
'd7cbae2627bb60360a6b1c03dd0fd90a')
'7f4415f93512049d1b797f81ae0363d5')
build() {
cd "$srcdir/$pkgname-$pkgver"
......@@ -80,5 +80,3 @@ package() {
done
}
diff -Npur systemd-29.orig/config.h.in systemd-29/config.h.in
--- systemd-29.orig/config.h.in 2011-06-16 13:19:00.000000000 +0200
+++ systemd-29/config.h.in 2011-06-17 18:33:06.000000000 +0200
@@ -115,6 +115,9 @@
diff -Npur systemd-40.orig/config.h.in systemd-40/config.h.in
--- systemd-40.orig/config.h.in 2011-06-16 13:19:00.000000000 +0200
+++ systemd-40/config.h.in 2011-06-17 18:33:06.000000000 +0200
@@ -127,6 +127,9 @@
/* Target is ArchLinux */
#undef TARGET_ARCH
......@@ -11,10 +11,10 @@ diff -Npur systemd-29.orig/config.h.in systemd-29/config.h.in
/* Target is Debian */
#undef TARGET_DEBIAN
diff -Npur systemd-29.orig/configure systemd-29/configure
--- systemd-29.orig/configure 2011-06-16 13:18:08.000000000 +0200
+++ systemd-29/configure 2011-06-17 18:39:15.000000000 +0200
@@ -703,6 +703,8 @@ TARGET_GENTOO_FALSE
diff -Npur systemd-40.orig/configure systemd-40/configure
--- systemd-40.orig/configure 2011-06-16 13:18:08.000000000 +0200
+++ systemd-40/configure 2011-06-17 18:39:15.000000000 +0200
@@ -708,6 +708,8 @@ TARGET_GENTOO_FALSE
TARGET_GENTOO_TRUE
TARGET_ARCH_FALSE
TARGET_ARCH_TRUE
......@@ -23,18 +23,18 @@ diff -Npur systemd-29.orig/configure systemd-29/configure
TARGET_DEBIAN_OR_UBUNTU_FALSE
TARGET_DEBIAN_OR_UBUNTU_TRUE
TARGET_UBUNTU_FALSE
@@ -1569,7 +1571,7 @@ Optional Packages:
@@ -1659,7 +1661,7 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
(or the compiler's sysroot if not specified).
--with-distro=DISTRO Specify the distribution to target: One of fedora,
- suse, debian, ubuntu, arch, gentoo, slackware,
+ suse, debian, ubuntu, arch, chakra, gentoo, slackware,
altlinux or other
--with-sysvinit-path=PATH
Specify the path to where the SysV init scripts are
@@ -14495,6 +14497,14 @@ $as_echo "#define TARGET_ARCH /**/" >>co
--with-sysvinit-path=PATH
Specify the path to where the SysV init scripts are
@@ -15635,6 +15635,14 @@ $as_echo "#define TARGET_ARCH /**/" >>confdefs.h
M4_DISTRO_FLAG=-DTARGET_ARCH=1
M4_DEFINES=-DTARGET_ARCH=1
;;
+ chakra)
+ SYSTEM_SYSVINIT_PATH=/etc/rc.d
......@@ -73,9 +73,9 @@ diff -Npur systemd-29.orig/configure systemd-29/configure
if test -z "${TARGET_GENTOO_TRUE}" && test -z "${TARGET_GENTOO_FALSE}"; then
as_fn_error $? "conditional \"TARGET_GENTOO\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff -Npur systemd-29.orig/configure.ac systemd-29/configure.ac
--- systemd-29.orig/configure.ac 2011-06-16 13:17:38.000000000 +0200
+++ systemd-29/configure.ac 2011-06-17 18:41:07.000000000 +0200
diff -Npur systemd-40.orig/configure.ac systemd-40/configure.ac
--- systemd-40.orig/configure.ac 2011-06-16 13:17:38.000000000 +0200
+++ systemd-40/configure.ac 2011-06-17 18:41:07.000000000 +0200
@@ -280,7 +280,7 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XS
AC_PATH_PROG([M4], [m4])
......@@ -114,9 +114,9 @@ diff -Npur systemd-29.orig/configure.ac systemd-29/configure.ac
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
diff -Npur systemd-29.orig/Makefile.am systemd-29/Makefile.am
--- systemd-29.orig/Makefile.am 2011-06-16 13:16:25.000000000 +0200
+++ systemd-29/Makefile.am 2011-06-17 18:41:53.000000000 +0200
diff -Npur systemd-40.orig/Makefile.am systemd-40/Makefile.am
--- systemd-40.orig/Makefile.am 2011-06-16 13:16:25.000000000 +0200
+++ systemd-40/Makefile.am 2011-06-17 18:41:53.000000000 +0200
@@ -78,6 +78,12 @@ AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
......@@ -139,10 +139,10 @@ diff -Npur systemd-29.orig/Makefile.am systemd-29/Makefile.am
rootbin_PROGRAMS = \
systemd \
diff -Npur systemd-29.orig/Makefile.in systemd-29/Makefile.in
--- systemd-29.orig/Makefile.in 2011-06-16 13:18:10.000000000 +0200
+++ systemd-29/Makefile.in 2011-06-17 18:44:49.000000000 +0200
@@ -64,30 +64,35 @@ host_triplet = @host@
diff -Npur systemd-40/Makefile.in systemd-40.orig/Makefile.in
--- systemd-40/Makefile.in 2012-02-07 02:38:40.273001769 +0000
+++ systemd-40.orig/Makefile.in 2012-02-07 16:58:55.521446257 +0000
@@ -65,35 +65,35 @@ host_triplet = @host@
@TARGET_ARCH_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_SETFONT=\"/usr/bin/setfont\" \
@TARGET_ARCH_TRUE@@TARGET_GENTOO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
......@@ -166,45 +166,50 @@ diff -Npur systemd-29.orig/Makefile.in systemd-29/Makefile.in
-@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/usr/bin/setfont\" \
-@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_7 = \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_GENTOO_FALSE@am__append_3 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_GENTOO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@am__append_4 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_7 = \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_8 = \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@am__append_3 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_TRUE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@am__append_5 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@am__append_4 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@ -DKBD_SETFONT=\"/bin/setfont\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@am__append_6 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@am__append_5 = \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@ -DKBD_SETFONT=\"/bin/setfont\" \
+@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+
+@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_7 = \
+@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_6 = \
+@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_8 = \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/bin/setfont\" \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_7 = \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/bin/setfont\" \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_8 = \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DKBD_SETFONT=\"/bin/setfont\" \
+@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_CHAKRA_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@ -DDEFAULT_FONT=\"latarcyrheb-sun16\"
rootbin_PROGRAMS = systemd$(EXEEXT) systemctl$(EXEEXT) \
systemd-notify$(EXEEXT) systemd-ask-password$(EXEEXT) \
diff -Npur systemd-29.orig/src/hostname-setup.c systemd-29/src/hostname-setup.c
--- systemd-29.orig/src/hostname-setup.c 2011-04-20 15:56:33.000000000 +0200
+++ systemd-29/src/hostname-setup.c 2011-06-17 18:25:18.000000000 +0200
diff -Npur systemd-40.orig/src/hostname-setup.c systemd-40/src/hostname-setup.c
--- systemd-40.orig/src/hostname-setup.c 2011-04-20 15:56:33.000000000 +0200
+++ systemd-40/src/hostname-setup.c 2011-06-17 18:25:18.000000000 +0200
@@ -34,7 +34,7 @@
#define FILENAME "/etc/sysconfig/network"
#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE)
......@@ -218,15 +223,15 @@ diff -Npur systemd-29.orig/src/hostname-setup.c systemd-29/src/hostname-setup.c
static int read_distro_hostname(char **hn) {
-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_CHAKRA) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
int r;
FILE *f;
diff -Npur systemd-29.orig/src/locale-setup.c systemd-29/src/locale-setup.c
--- systemd-29.orig/src/locale-setup.c 2011-05-09 23:50:16.000000000 +0200
+++ systemd-29/src/locale-setup.c 2011-06-17 18:24:22.000000000 +0200
@@ -167,6 +167,16 @@ int locale_setup(void) {
diff -Npur systemd-40/src/locale-setup.c systemd-40.orig/src/locale-setup.c
--- systemd-40/src/locale-setup.c 2011-12-30 21:27:36.446528996 +0000
+++ systemd-40.orig/src/locale-setup.c 2012-02-07 17:25:30.979301758 +0000
@@ -172,6 +172,16 @@ int locale_setup(void) {
if (r != -ENOENT)
log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
}
......@@ -243,24 +248,25 @@ diff -Npur systemd-29.orig/src/locale-setup.c systemd-29/src/locale-setup.c
#elif defined(TARGET_GENTOO)
/* Gentoo's openrc expects locale variables in /etc/env.d/
diff -Npur systemd-29.orig/src/vconsole-setup.c systemd-29/src/vconsole-setup.c
--- systemd-29.orig/src/vconsole-setup.c 2011-05-09 22:30:27.000000000 +0200
+++ systemd-29/src/vconsole-setup.c 2011-06-17 18:26:01.000000000 +0200
@@ -292,6 +292,17 @@ int main(int argc, char **argv) {
diff -Npur systemd-40/src/vconsole/vconsole-setup.c systemd-40.orig/src/vconsole/vconsole-setup.c
--- systemd-40/src/vconsole/vconsole-setup.c 2011-12-31 18:45:41.716469221 +0000
+++ systemd-40.orig/src/vconsole/vconsole-setup.c 2012-02-07 17:05:01.512476312 +0000
@@ -291,7 +291,18 @@ int main(int argc, char **argv) {
if (r != -ENOENT)
log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
}
+
+
+#elif defined(TARGET_CHAKRA)
+ if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
+ "KEYMAP", &vc_keymap,
+ "CONSOLEFONT", &vc_font,
+ "CONSOLEMAP", &vc_font_map,
+ NULL)) < 0) {
+
+ if (r != -ENOENT)
+ log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
+ }
+
#elif defined(TARGET_FRUGALWARE)
if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE,
"keymap", &vc_keymap,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment