MeeGo: Remove build support for MeeGo distribution.

The MeeGo distribution is still a supported distribution, but
will probably not see an updated version of systemd anymore.

Most of the development is focussing on Tizen now, and the
generic support for building --with-distro=other is more than
adequate enough.

This patch removes the support as a custom configuration build
target in systemd. People who are still building this for
the MeeGo distribution should build as "other" distro.

diff --git a/Makefile.am b/Makefile.am
index 6cf776031b926705e608e1f268cd74001a3e90f4..70b8b091e1e2d3305a0bfed76837f93c3a7cebeb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,12 +173,6 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MEEGO
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-else
 if TARGET_ANGSTROM
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -201,7 +195,6 @@ endif
 endif
 endif
 endif
-endif
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -3396,20 +3389,6 @@ systemd-install-data-hook:
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_MEEGO
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f network.target && \
-               $(LN_S) $(systemunitdir)/network.target network.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f * )
-endif
 
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \

diff --git a/configure.ac b/configure.ac
index dfa34c8dd5ee111f414907384889f5a1f4040bed..bb60ecc16689227f9d238e1960d8b771983975e5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -500,7 +500,7 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "$have_manpages" = "yes"])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
 
-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]))
+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]))
 if test "z$with_distro" = "z"; then
         if test "$cross_compiling" = yes; then
                 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)])
@@ -573,12 +573,6 @@ case $with_distro in
                 AC_DEFINE(TARGET_MANDRIVA, [], [Target is Mandriva])
                 M4_DEFINES=-DTARGET_MANDRIVA=1
                 ;;
-        meego)
-                SYSTEM_SYSVINIT_PATH=
-                SYSTEM_SYSVRCND_PATH=
-                AC_DEFINE(TARGET_MEEGO, [], [Target is MeeGo])
-                M4_DEFINES=-DTARGET_MEEGO=1
-                ;;
         angstrom)
                 SYSTEM_SYSVRCND_PATH=/etc
                 AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
@@ -639,7 +633,6 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
 AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
 AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
-AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego)
 AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
 AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia)
 

diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index e3ea5fe767f8a8440f0a895087622d153510ea2c..25ea09c733d3070e2e5479d43ad499be8a9f24ad 100644 (file)
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "log.h"
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
 #define FILENAME "/etc/sysconfig/network"
 #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
 #define FILENAME "/etc/HOSTNAME"
@@ -65,7 +65,7 @@ static int read_and_strip_hostname(const char *path, char **hn) {
 
 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) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
         int r;
         FILE *f;
 

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index aab454e83b1042f5b62f09a0ec960f96d3b9e4c2..25eb13474a3fecb482fe532251773a84f9cf2c7a 100644 (file)
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -74,7 +74,7 @@ int locale_setup(void) {
 
         if (detect_container(NULL) <= 0)
                 if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
-#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
+#if defined(TARGET_FEDORA)
                                         "LANG",                     &variables[VARIABLE_LANG],
 #endif
                                         "locale.LANG",              &variables[VARIABLE_LANG],
@@ -121,7 +121,7 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO)
+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
         if (r <= 0 &&
             (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                 "LANG", &variables[VARIABLE_LANG],

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 8279f08d5750fb7e16e7af3fc7f9676535b891d9..c89920bccbe7f7cbc0c9acfeb184018a63d9899b 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3921,7 +3921,7 @@ finish:
 static int enable_sysv_units(char **args) {
         int r = 0;
 
-#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_MEEGO) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
+#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
         const char *verb = args[0];
         unsigned f = 1, t = 1;
         LookupPaths paths;

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index aa5fa18525ac8aff9eb2643eb5610646f6ea019b..7679d446e30a063076ff300312e9d0ef404ab5a9 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -253,7 +253,7 @@ int main(int argc, char **argv) {
         }
 
         if (r <= 0) {
-#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
+#if defined(TARGET_FEDORA)
                 r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                    "SYSFONT", &vc_font,
                                    "SYSFONTACM", &vc_font_map,

diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index 9d09062b1a54bb9c40772be05a14709a4dff8d9e..2c6e0ec671f749c34f74c841b884c91831382a6b 100644 (file)
--- a/units/rescue.service.m4.in
+++ b/units/rescue.service.m4.in
@@ -27,10 +27,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 m4_ifdef(`TARGET_MAGEIA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-m4_ifdef(`TARGET_MEEGO',
-`EnvironmentFile=/etc/sysconfig/init
-ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin'))))
+`ExecStart=-/sbin/sulogin')))
 ExecStopPost=-@SYSTEMCTL@ --fail --no-block default
 Type=idle
 StandardInput=tty-force