Magellan Linux

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

    Annotation of /trunk/systemd/patches/systemd-196-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1967 - (hide annotations) (download)
    Thu Nov 22 14:09:18 2012 UTC (11 years, 6 months ago) by niro
    File size: 7573 byte(s) 
    -re-diffed patches for systemd-196
    1 niro 1967 diff -Naur systemd-196/configure.ac systemd-196-magellan/configure.ac
    2     --- systemd-196/configure.ac 2012-11-21 00:41:19.920510613 +0100
    3     +++ systemd-196-magellan/configure.ac 2012-11-22 19:03:45.114640492 +0100
    4     @@ -640,7 +640,7 @@
    5    
    6     # ------------------------------------------------------------------------------
    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, 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, 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     @@ -693,6 +693,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     + AC_DEFINE_UNQUOTED(TTY_GID, [4], [Using GID '4' for the 'tty' group])
    23     + ;;
    24     slackware)
    25     SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
    26     AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
    27     @@ -769,6 +776,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-196/Makefile.am systemd-196-magellan/Makefile.am
    36     --- systemd-196/Makefile.am 2012-11-21 02:15:47.990885766 +0100
    37     +++ systemd-196-magellan/Makefile.am 2012-11-22 19:04:53.980639949 +0100
    38     @@ -172,6 +172,11 @@
    39     -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    40     -DKBD_SETFONT=\"/usr/bin/setfont\"
    41     else
    42     +if TARGET_MAGELLAN
    43     +AM_CPPFLAGS += \
    44     + -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    45     + -DKBD_SETFONT=\"/usr/bin/setfont\" \
    46     +else
    47     if TARGET_ARCH
    48     AM_CPPFLAGS += \
    49     -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
    50     @@ -203,6 +208,7 @@
    51     endif
    52     endif
    53     endif
    54     +endif
    55     endif
    56     endif
    57     endif
    58     diff -Naur systemd-196/src/core/hostname-setup.c systemd-196-magellan/src/core/hostname-setup.c
    59     --- systemd-196/src/core/hostname-setup.c 2012-11-09 15:55:35.887582229 +0100
    60     +++ systemd-196-magellan/src/core/hostname-setup.c 2012-11-22 19:06:06.389639430 +0100
    61     @@ -34,6 +34,8 @@
    62     #define FILENAME "/etc/sysconfig/network"
    63     #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    64     #define FILENAME "/etc/HOSTNAME"
    65     +#elif defined(TARGET_MAGELLAN)
    66     +#define FILENAME "/etc/hostname"
    67     #elif defined(TARGET_GENTOO)
    68     #define FILENAME "/etc/conf.d/hostname"
    69     #endif
    70     @@ -114,7 +116,7 @@
    71     finish:
    72     return r;
    73    
    74     -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
    75     +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_MAGELLAN)
    76     return read_and_strip_hostname(FILENAME, hn);
    77     #else
    78     return -ENOENT;
    79     diff -Naur systemd-196/src/core/locale-setup.c systemd-196-magellan/src/core/locale-setup.c
    80     --- systemd-196/src/core/locale-setup.c 2012-11-09 15:55:35.888582232 +0100
    81     +++ systemd-196-magellan/src/core/locale-setup.c 2012-11-22 19:06:33.733639284 +0100
    82     @@ -163,7 +163,7 @@
    83     log_warning("Failed to read /etc/default/locale: %s", strerror(-r));
    84     }
    85    
    86     -#elif defined(TARGET_GENTOO)
    87     +#elif defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN)
    88     /* Gentoo's openrc expects locale variables in /etc/env.d/
    89     * These files are later compiled by env-update into shell
    90     * export commands at /etc/profile.env, with variables being
    91     diff -Naur systemd-196/src/fsck/fsck.c systemd-196-magellan/src/fsck/fsck.c
    92     --- systemd-196/src/fsck/fsck.c 2012-07-26 12:45:14.484061294 +0200
    93     +++ systemd-196-magellan/src/fsck/fsck.c 2012-11-22 19:07:01.398639058 +0100
    94     @@ -128,7 +128,7 @@
    95     arg_skip = true;
    96     else if (startswith(w, "fsck"))
    97     log_warning("Invalid fsck parameter. Ignoring.");
    98     -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    99     +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    100     else if (strneq(w, "fastboot", l))
    101     arg_skip = true;
    102     else if (strneq(w, "forcefsck", l))
    103     diff -Naur systemd-196/src/quotacheck/quotacheck.c systemd-196-magellan/src/quotacheck/quotacheck.c
    104     --- systemd-196/src/quotacheck/quotacheck.c 2012-06-22 09:37:42.823398626 +0200
    105     +++ systemd-196-magellan/src/quotacheck/quotacheck.c 2012-11-22 19:07:41.119638797 +0100
    106     @@ -54,7 +54,7 @@
    107     arg_skip = true;
    108     else if (startswith(w, "quotacheck"))
    109     log_warning("Invalid quotacheck parameter. Ignoring.");
    110     -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    111     +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    112     else if (strneq(w, "forcequotacheck", l))
    113     arg_force = true;
    114     #endif
    115     @@ -65,8 +65,8 @@
    116     }
    117    
    118     static void test_files(void) {
    119     -#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
    120     - /* This exists only on Fedora, Mandriva or Mageia */
    121     +#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) || defined(TARGET_MAGELLAN)
    122     + /* This exists only on Fedora, Mandriva, Mageia or Magellan */
    123     if (access("/forcequotacheck", F_OK) >= 0)
    124     arg_force = true;
    125     #endif
    126     diff -Naur systemd-196/src/vconsole/vconsole-setup.c systemd-196-magellan/src/vconsole/vconsole-setup.c
    127     --- systemd-196/src/vconsole/vconsole-setup.c 2012-11-09 15:55:35.893582249 +0100
    128     +++ systemd-196-magellan/src/vconsole/vconsole-setup.c 2012-11-22 19:08:32.104638426 +0100
    129     @@ -304,6 +304,20 @@
    130     if (r < 0 && r != -ENOENT)
    131     log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
    132    
    133     +#elif defined(TARGET_MAGELLAN)
    134     + if ((r = parse_env_file("/etc/conf.d/keymap", NEWLINE,
    135     + "KEYMAP", &vc_keymap,
    136     + NULL)) < 0) {
    137     + if (r < 0 && r != -ENOENT)
    138     + log_warning("Failed to read /etc/conf.d/keymap: %s", strerror(-r));
    139     + }
    140     + if ((r = parse_env_file("/etc/conf.d/consolefont", NEWLINE,
    141     + "CONSOLEFONT", &vc_font,
    142     + NULL)) < 0) {
    143     + if (r < 0 && r != -ENOENT)
    144     + log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r));
    145     + }
    146     +
    147     #elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA)
    148    
    149     r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,