Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2015-11-24 22:33:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2015-11-02 12:54:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2015-11-24 22:33:23.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 12 09:56:36 UTC 2015 - [email protected] + +- Modify patch handle-root_uses_lang-value-in-etc-sysconfig-language.patch + to handle locale at boot time well (boo#927250) +- Be able to use build service environments several times + +------------------------------------------------------------------- +Tue Nov 10 18:06:43 UTC 2015 - [email protected] + +- 1096-new-udev-root-symlink-generator.patch: fix substitution in + ExecStart value + +------------------------------------------------------------------- systemd.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.PJ6Y22/_old 2015-11-24 22:33:25.000000000 +0100 +++ /var/tmp/diff_new_pack.PJ6Y22/_new 2015-11-24 22:33:25.000000000 +0100 @@ -658,6 +658,16 @@ esac set +o noclobber } + +# +# Be sure that fresh build libudev is linked as otherwise no errors are found +# +sed -ri '/^systemd_cryptsetup_CFLAGS/,/^systemd_cryptsetup_LDADD/{ /^$/a\ +systemd_cryptsetup_LDFLAGS = \\\ + $(AM_LDFLAGS) \\\ + -Wl,-rpath-link=$(top_srcdir)/.libs\ + +}' Makefile.am sh autogen.sh export V=e ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.PJ6Y22/_old 2015-11-24 22:33:25.000000000 +0100 +++ /var/tmp/diff_new_pack.PJ6Y22/_new 2015-11-24 22:33:25.000000000 +0100 @@ -653,6 +653,16 @@ esac set +o noclobber } + +# +# Be sure that fresh build libudev is linked as otherwise no errors are found +# +sed -ri '/^systemd_cryptsetup_CFLAGS/,/^systemd_cryptsetup_LDADD/{ /^$/a\ +systemd_cryptsetup_LDFLAGS = \\\ + $(AM_LDFLAGS) \\\ + -Wl,-rpath-link=$(top_srcdir)/.libs\ + +}' Makefile.am sh autogen.sh export V=e ++++++ 1096-new-udev-root-symlink-generator.patch ++++++ --- /var/tmp/diff_new_pack.PJ6Y22/_old 2015-11-24 22:33:25.000000000 +0100 +++ /var/tmp/diff_new_pack.PJ6Y22/_new 2015-11-24 22:33:25.000000000 +0100 @@ -94,19 +94,6 @@ + return 0; +} --- /dev/null -+++ systemd-222/units/systemd-udev-root-symlink.service -@@ -0,0 +1,10 @@ -+[Unit] -+Description=Rule generator for /dev/root symlink -+Before=systemd-udevd.service -+DefaultDependencies=no -+ConditionPathIsReadWrite=/run/udev -+ -+[Service] -+Type=oneshot -+RemainAfterExit=yes -+ExecStart=/usr/lib/udev/rootsymlink-generator ---- /dev/null +++ systemd-222/units/systemd-udev-root-symlink.service.in @@ -0,0 +1,10 @@ +[Unit] @@ -118,4 +105,4 @@ +[Service] +Type=oneshot +RemainAfterExit=yes -+ExecStart=@udevlibexec@/rootsymlink-generator ++ExecStart=@udevlibexecdir@/rootsymlink-generator ++++++ handle-root_uses_lang-value-in-etc-sysconfig-language.patch ++++++ --- /var/tmp/diff_new_pack.PJ6Y22/_old 2015-11-24 22:33:25.000000000 +0100 +++ /var/tmp/diff_new_pack.PJ6Y22/_new 2015-11-24 22:33:25.000000000 +0100 @@ -11,42 +11,55 @@ =================================================================== --- systemd-221.orig/src/core/locale-setup.c +++ systemd-221/src/core/locale-setup.c -@@ -34,6 +34,11 @@ int locale_setup(char ***environment) { +@@ -34,6 +34,10 @@ int locale_setup(char ***environment) { char **add; char *variables[_VARIABLE_LC_MAX] = {}; int r = 0, i; +#ifdef HAVE_SYSV_COMPAT -+ char _cleanup_free_ *root_uses_lang; -+ -+ zero(root_uses_lang); ++ char _cleanup_free_ *rc_lang = NULL, *rc_lc_ctype = NULL; ++ char _cleanup_free_ *root_uses_lang = NULL; +#endif if (detect_container(NULL) <= 0) { r = parse_env_file("/proc/cmdline", WHITESPACE, -@@ -80,6 +85,27 @@ int locale_setup(char ***environment) { +@@ -80,6 +85,41 @@ int locale_setup(char ***environment) { if (r < 0 && r != -ENOENT) log_warning_errno(r, "Failed to read /etc/locale.conf: %m"); } +#ifdef HAVE_SYSV_COMPAT -+ if (r <= 0 && -+ (r = parse_env_file("/etc/sysconfig/language", NEWLINE, -+ "ROOT_USES_LANG", &root_uses_lang, -+ "RC_LANG", &variables[VARIABLE_LANG], -+ NULL)) < 0) { -+ if (r != -ENOENT) -+ log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r)); ++ r = parse_env_file("/etc/sysconfig/language", NEWLINE, ++ "RC_LANG", &rc_lang, ++ "RC_LC_CTYPE", &rc_lc_ctype, ++ "ROOT_USES_LANG", &root_uses_lang, ++ NULL); + -+ } else { -+ if (!root_uses_lang || (root_uses_lang && !strcaseeq(root_uses_lang,"yes"))) { -+ if (root_uses_lang && strcaseeq(root_uses_lang,"ctype")) -+ variables[VARIABLE_LC_CTYPE]=variables[VARIABLE_LANG]; -+ else -+ free(variables[VARIABLE_LANG]); ++ if (r < 0 && r != -ENOENT) ++ log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r)); + -+ variables[VARIABLE_LANG]=strdup("POSIX"); ++ /* ++ * Use the values of the interactive locale configuration in /etc/sysconfig/language ++ * as fallback if /etc/locale.conf does not exist and no locale was specified on the ++ * kernel's command line. The special case ROOT_USES_LANG=ctype allows to set LC_CTYPE ++ * even if LANG for root is set to e.g. POSIX. But do this only if no LC_CTYPE has been ++ * set in /etc/locale.conf and on the kernel's command line. ++ */ ++ if (root_uses_lang) { ++ if (strcaseeq(root_uses_lang, "yes") && !variables[VARIABLE_LANG]) { ++ variables[VARIABLE_LANG] = rc_lang; ++ rc_lang = NULL; ++ } ++ if (strcaseeq(root_uses_lang, "ctype") && !variables[VARIABLE_LC_CTYPE]) { ++ if (variables[VARIABLE_LANG]) ++ variables[VARIABLE_LC_CTYPE] = strdup(variables[VARIABLE_LANG]); ++ else if (rc_lc_ctype && *rc_lc_ctype) { ++ variables[VARIABLE_LC_CTYPE] = rc_lc_ctype; ++ rc_lc_ctype = NULL; ++ } else if (rc_lang && *rc_lang) { ++ variables[VARIABLE_LC_CTYPE] = rc_lang; ++ rc_lang = NULL; ++ } ++ } + } -+ } -+ +#endif add = NULL;
