Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/systemd/patches/systemd-185-magellan.patch

    Contents of /trunk/systemd/patches/systemd-185-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1811 - (show annotations) (download)
    Tue Jun 26 13:34:57 2012 UTC (11 years, 10 months ago) by niro
    File size: 7391 byte(s) 
    -rediffed patches for systemd-185
    1 diff -Naur systemd-185/configure.ac systemd-185-magellan/configure.ac
    2 --- systemd-185/configure.ac 2012-06-04 20:06:13.704620269 +0200
    3 +++ systemd-185-magellan/configure.ac 2012-06-26 16:03:20.226982674 +0200
    4 @@ -494,7 +494,7 @@
    5 AC_PATH_PROG([XSLTPROC], [xsltproc])
    6 AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
    7
    8 -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other]))
    9 +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, magellan, slackware, altlinux, mandriva, meego, mageia, angstrom or other]))
    10 if test "z$with_distro" = "z"; then
    11 if test "$cross_compiling" = yes; then
    12 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
    13 @@ -550,6 +550,13 @@
    14 AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
    15 M4_DEFINES=-DTARGET_GENTOO=1
    16 ;;
    17 + magellan)
    18 + SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
    19 + SYSTEM_SYSVRCND_PATH=/etc/rc.d
    20 + AC_DEFINE(TARGET_MAGELLAN, [], [Target is Magellan])
    21 + M4_DEFINES=-DTARGET_MAGELLAN=1
    22 + have_plymouth=yes
    23 + ;;
    24 slackware)
    25 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
    26 AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
    27 @@ -641,6 +648,7 @@
    28 AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu)
    29 AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
    30 AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
    31 +AM_CONDITIONAL(TARGET_MAGELLAN, test x"$with_distro" = xmagellan)
    32 AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
    33 AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
    34 AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
    35 diff -Naur systemd-185/Makefile.am systemd-185-magellan/Makefile.am
    36 --- systemd-185/Makefile.am 2012-06-04 20:14:57.703501056 +0200
    37 +++ systemd-185-magellan/Makefile.am 2012-06-26 16:04:38.444982768 +0200
    38 @@ -153,6 +153,12 @@
    39 -DKBD_SETFONT=\"/usr/bin/setfont\" \
    40 -DDEFAULT_FONT=\"LatArCyrHeb-16\"
    41 else
    42 +if TARGET_MAGELLAN
    43 +AM_CPPFLAGS += \
    44 + -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    45 + -DKBD_SETFONT=\"/usr/bin/setfont\" \
    46 + -DDEFAULT_FONT=\"LatArCyrHeb-16\"
    47 +else
    48 if TARGET_ARCH
    49 AM_CPPFLAGS += \
    50 -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    51 @@ -196,6 +202,7 @@
    52 endif
    53 endif
    54 endif
    55 +endif
    56 endif
    57 endif
    58 endif
    59 diff -Naur systemd-185/src/core/hostname-setup.c systemd-185-magellan/src/core/hostname-setup.c
    60 --- systemd-185/src/core/hostname-setup.c 2012-05-21 19:23:02.751293222 +0200
    61 +++ systemd-185-magellan/src/core/hostname-setup.c 2012-06-26 16:08:41.560982822 +0200
    62 @@ -34,6 +34,8 @@
    63 #define FILENAME "/etc/sysconfig/network"
    64 #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    65 #define FILENAME "/etc/HOSTNAME"
    66 +#elif defined(TARGET_MAGELLAN)
    67 +#define FILENAME "/etc/hostname"
    68 #elif defined(TARGET_ARCH)
    69 #define FILENAME "/etc/rc.conf"
    70 #elif defined(TARGET_GENTOO)
    71 @@ -117,7 +119,7 @@
    72 fclose(f);
    73 return r;
    74
    75 -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    76 +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_MAGELLAN)
    77 return read_and_strip_hostname(FILENAME, hn);
    78 #else
    79 return -ENOENT;
    80 diff -Naur systemd-185/src/core/locale-setup.c systemd-185-magellan/src/core/locale-setup.c
    81 --- systemd-185/src/core/locale-setup.c 2012-04-12 01:04:30.612222912 +0200
    82 +++ systemd-185-magellan/src/core/locale-setup.c 2012-06-26 16:11:06.075983329 +0200
    83 @@ -173,7 +173,7 @@
    84 log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
    85 }
    86
    87 -#elif defined(TARGET_GENTOO)
    88 +#elif defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN)
    89 /* Gentoo's openrc expects locale variables in /etc/env.d/
    90 * These files are later compiled by env-update into shell
    91 * export commands at /etc/profile.env, with variables being
    92 diff -Naur systemd-185/src/fsck/fsck.c systemd-185-magellan/src/fsck/fsck.c
    93 --- systemd-185/src/fsck/fsck.c 2012-04-12 17:54:42.016667199 +0200
    94 +++ systemd-185-magellan/src/fsck/fsck.c 2012-06-26 16:06:03.926982686 +0200
    95 @@ -127,7 +127,7 @@
    96 arg_skip = true;
    97 else if (startswith(w, "fsck.mode"))
    98 log_warning("Invalid fsck.mode= parameter. Ignoring.");
    99 -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    100 +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    101 else if (strneq(w, "fastboot", l))
    102 arg_skip = true;
    103 else if (strneq(w, "forcefsck", l))
    104 diff -Naur systemd-185/src/quotacheck/quotacheck.c systemd-185-magellan/src/quotacheck/quotacheck.c
    105 --- systemd-185/src/quotacheck/quotacheck.c 2012-04-12 17:54:42.017667199 +0200
    106 +++ systemd-185-magellan/src/quotacheck/quotacheck.c 2012-06-26 16:13:20.141982550 +0200
    107 @@ -54,7 +54,7 @@
    108 arg_skip = true;
    109 else if (startswith(w, "quotacheck.mode"))
    110 log_warning("Invalid quotacheck.mode= parameter. Ignoring.");
    111 -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    112 +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    113 else if (strneq(w, "forcequotacheck", l))
    114 arg_force = true;
    115 #endif
    116 @@ -65,8 +65,8 @@
    117 }
    118
    119 static void test_files(void) {
    120 -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    121 - /* This exists only on Fedora, Mandriva or Mageia */
    122 +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    123 + /* This exists only on Fedora, Mandriva, Mageia or Magellan */
    124 if (access("/forcequotacheck", F_OK) >= 0)
    125 arg_force = true;
    126 #endif
    127 diff -Naur systemd-185/src/vconsole/vconsole-setup.c systemd-185-magellan/src/vconsole/vconsole-setup.c
    128 --- systemd-185/src/vconsole/vconsole-setup.c 2012-05-03 22:03:17.886325106 +0200
    129 +++ systemd-185-magellan/src/vconsole/vconsole-setup.c 2012-06-26 16:16:08.339982793 +0200
    130 @@ -163,6 +163,20 @@
    131 #ifdef TARGET_GENTOO
    132 char *vc_unicode = NULL;
    133 #endif
    134 +#ifdef TARGET_MAGELLAN
    135 + if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
    136 + "KEYMAP", &vc_keymap,
    137 + NULL)) < 0) {
    138 + if (r != -ENOENT)
    139 + log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r));
    140 + }
    141 + if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
    142 + "CONSOLEFONT", &vc_font,
    143 + NULL)) < 0) {
    144 + if (r != -ENOENT)
    145 + log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r));
    146 + }
    147 +#endif
    148 #if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    149 char *vc_keytable = NULL;
    150 #endif