build-sys: drop TARGET_UBUNTU
TARGET_UBUNTU is effectively the same as TARGET_DEBIAN. Given the Ubuntu is unlikely to use systemd anytime soon there's no point in keeping this separate.
This commit is contained in:
parent
92134489ab
commit
0979f2855c
|
@ -4111,12 +4111,6 @@ if TARGET_MANDRIVA
|
||||||
$(LN_S) rescue.service single.service )
|
$(LN_S) rescue.service single.service )
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if TARGET_DEBIAN_OR_UBUNTU
|
|
||||||
( cd $(DESTDIR)$(systemunitdir) && \
|
|
||||||
rm -f runlevel5.target && \
|
|
||||||
$(LN_S) multi-user.target runlevel5.target )
|
|
||||||
endif
|
|
||||||
|
|
||||||
if TARGET_SUSE
|
if TARGET_SUSE
|
||||||
( cd $(DESTDIR)$(systemunitdir) && \
|
( cd $(DESTDIR)$(systemunitdir) && \
|
||||||
rm -f local.service && \
|
rm -f local.service && \
|
||||||
|
|
|
@ -640,7 +640,7 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
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]))
|
AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other]))
|
||||||
if test "z$with_distro" = "z"; then
|
if test "z$with_distro" = "z"; then
|
||||||
if test "$cross_compiling" = yes; 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)])
|
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)])
|
||||||
|
@ -676,11 +676,6 @@ case $with_distro in
|
||||||
AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian])
|
AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian])
|
||||||
M4_DEFINES=-DTARGET_DEBIAN=1
|
M4_DEFINES=-DTARGET_DEBIAN=1
|
||||||
;;
|
;;
|
||||||
ubuntu)
|
|
||||||
SYSTEM_SYSVRCND_PATH=/etc
|
|
||||||
AC_DEFINE(TARGET_UBUNTU, [], [Target is Ubuntu])
|
|
||||||
M4_DEFINES=-DTARGET_UBUNTU=1
|
|
||||||
;;
|
|
||||||
arch)
|
arch)
|
||||||
SYSTEM_SYSVINIT_PATH=
|
SYSTEM_SYSVINIT_PATH=
|
||||||
SYSTEM_SYSVRCND_PATH=
|
SYSTEM_SYSVRCND_PATH=
|
||||||
|
@ -765,8 +760,6 @@ AC_ARG_WITH([tty-gid],
|
||||||
AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
|
AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
|
||||||
AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
|
AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
|
||||||
AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
|
AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
|
||||||
AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu)
|
|
||||||
AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu)
|
|
||||||
AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
|
AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
|
||||||
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
|
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
|
||||||
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
|
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
|
||||||
|
|
|
@ -141,7 +141,7 @@ int locale_setup(void) {
|
||||||
log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
|
log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
|
#elif defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM)
|
||||||
if (r <= 0) {
|
if (r <= 0) {
|
||||||
r = parse_env_file("/etc/default/locale", NEWLINE,
|
r = parse_env_file("/etc/default/locale", NEWLINE,
|
||||||
"LANG", &variables[VARIABLE_LANG],
|
"LANG", &variables[VARIABLE_LANG],
|
||||||
|
|
|
@ -321,7 +321,7 @@ static char *sysv_translate_name(const char *name) {
|
||||||
if (!(r = new(char, strlen(name) + sizeof(".service"))))
|
if (!(r = new(char, strlen(name) + sizeof(".service"))))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
|
#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM)
|
||||||
if (endswith(name, ".sh"))
|
if (endswith(name, ".sh"))
|
||||||
/* Drop Debian-style .sh suffix */
|
/* Drop Debian-style .sh suffix */
|
||||||
strcpy(stpcpy(r, name) - 3, ".service");
|
strcpy(stpcpy(r, name) - 3, ".service");
|
||||||
|
@ -368,7 +368,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
|
||||||
"x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE,
|
"x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE,
|
||||||
"null", NULL,
|
"null", NULL,
|
||||||
|
|
||||||
#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
|
#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM)
|
||||||
"mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
|
"mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -990,7 +990,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
|
||||||
|
|
||||||
/* For SysV services we strip the rc.* and *.sh
|
/* For SysV services we strip the rc.* and *.sh
|
||||||
* prefixes/suffixes. */
|
* prefixes/suffixes. */
|
||||||
#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
|
#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM)
|
||||||
if (endswith(name, ".sh.service"))
|
if (endswith(name, ".sh.service"))
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
#endif
|
#endif
|
||||||
|
@ -1013,7 +1013,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
|
||||||
|
|
||||||
r = service_load_sysv_path(s, path);
|
r = service_load_sysv_path(s, path);
|
||||||
|
|
||||||
#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
|
#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM)
|
||||||
if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
|
if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
|
||||||
/* Try Debian style *.sh source'able init scripts */
|
/* Try Debian style *.sh source'able init scripts */
|
||||||
strcat(path, ".sh");
|
strcat(path, ".sh");
|
||||||
|
|
Loading…
Reference in New Issue