[ptxdist] [PATCH] e2fsprogs: version bump 1.44.1 -> 1.44.2

[ptxdist] [PATCH] e2fsprogs: version bump 1.44.1 -> 1.44.2

[Clemens Gruber]

License file hash changed due to an update to the FSF address in Boston.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/e2fsprogs.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index dcc75079f..f6b481707 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION	:= 1.44.1
-E2FSPROGS_MD5		:= d6079b031682fa947ea0f96013379155
+E2FSPROGS_VERSION	:= 1.44.2
+E2FSPROGS_MD5		:= 5e8690b6870e07e644283c88915a557f
 E2FSPROGS		:= e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX	:= tar.gz
 E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
@@ -26,7 +26,7 @@ E2FSPROGS_SOURCE	:= $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
 E2FSPROGS_DIR		:= $(BUILDDIR)/$(E2FSPROGS)
 E2FSPROGS_LICENSE	:= GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
 E2FSPROGS_LICENSE_FILES	:= \
-	file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
+	file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
 	file://lib/uuid/gen_uuid.c;startline=4;endline=31;md5=697cf5d1be275fa2588beaaf2bb481bd
 
 # ----------------------------------------------------------------------------
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] procps: version bump 3.3.12 -> 3.3.15

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/procps.make | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rules/procps.make b/rules/procps.make
index f8e96d6f9..d50607aed 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_PROCPS) += procps
 #
 # Paths and names
 #
-PROCPS_VERSION	:= 3.3.12
-PROCPS_MD5	:= 957e42e8b193490b2111252e4a2b443c
+PROCPS_VERSION	:= 3.3.15
+PROCPS_MD5	:= 2b0717a7cb474b3d6dfdeedfbad2eccc
 PROCPS		:= procps-ng-$(PROCPS_VERSION)
 PROCPS_SUFFIX	:= tar.xz
 PROCPS_URL	:= $(call ptx/mirror, SF, procps-ng/Production/$(PROCPS).$(PROCPS_SUFFIX))
@@ -62,7 +62,8 @@ PROCPS_CONF_OPT	:= \
 	--without-libiconv-prefix \
 	--without-libintl-prefix \
 	--$(call ptx/wwo, PTXCONF_PROCPS_USES_NCURSES)-ncurses \
-	--$(call ptx/wwo, PTXCONF_PROCPS_WITH_SYSTEMD)-systemd
+	--$(call ptx/wwo, PTXCONF_PROCPS_WITH_SYSTEMD)-systemd \
+	--without-elogind
 
 
 # ----------------------------------------------------------------------------
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] mpg123: version bump 1.25.8 -> 1.25.10

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/mpg123.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/mpg123.make b/rules/mpg123.make
index 63c08a834..0610d9292 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MPG123) += mpg123
 #
 # Paths and names
 #
-MPG123_VERSION	:= 1.25.8
-MPG123_MD5	:= 62ef1e417eb50f82bf241866d9e6e19b
+MPG123_VERSION	:= 1.25.10
+MPG123_MD5	:= ea32caa61d41d8be797f0b04a1b43ad9
 MPG123		:= mpg123-$(MPG123_VERSION)
 MPG123_SUFFIX	:= tar.bz2
 MPG123_URL	:= http://www.mpg123.org/download/$(MPG123).$(MPG123_SUFFIX)
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] u-boot-tools: version bump 2018.01 -> 2018.05

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/u-boot-tools.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 9a3aacd19..156f224c1 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
 #
 # Paths and names
 #
-U_BOOT_TOOLS_VERSION	:= 2018.01
-U_BOOT_TOOLS_MD5	:= b42e45813369f4ae84490a481e531768
+U_BOOT_TOOLS_VERSION	:= 2018.05
+U_BOOT_TOOLS_MD5	:= ad5c59bc19724c1679feb2a0c9ff4a25
 U_BOOT_TOOLS		:= u-boot-$(U_BOOT_TOOLS_VERSION)
 U_BOOT_TOOLS_SUFFIX	:= tar.bz2
 U_BOOT_TOOLS_URL	:= ftp://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] gnupg: version bump 2.2.5 -> 2.2.8

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/gnupg.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index dad3ac3d6..fdda1c873 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg
 #
 # Paths and names
 #
-GNUPG_VERSION	:= 2.2.5
-GNUPG_MD5	:= 567cd2d41fa632903066fde73d2005cb
+GNUPG_VERSION	:= 2.2.8
+GNUPG_MD5	:= 0db6d8ec569e260435a7d2bfb2ecfe5c
 GNUPG		:= gnupg-$(GNUPG_VERSION)
 GNUPG_SUFFIX	:= tar.bz2
 GNUPG_URL	:= ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
@@ -75,6 +75,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
 	--disable-dirmngr-auto-start \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-sqlite \
+	--disable-npth-debug \
 	--disable-ntbtls \
 	--disable-gnutls \
 	--disable-ldap \
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] libgpg-error: version bump 1.28 -> 1.31

[Clemens Gruber]

The patch is now upstream and therefore removed.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...ion-on-arm64-due-to-invalid-use-of-v.patch | 53 -------------------
 patches/libgpg-error-1.28/series              |  4 --
 rules/libgpg-error.make                       |  4 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
 delete mode 100644 patches/libgpg-error-1.28/series

diff --git a/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
deleted file mode 100644
index 8c7265a90..000000000
--- a/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Werner Koch <wk@gnupg.org>
-Date: Sun, 18 Mar 2018 17:39:43 +0100
-Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list.
-
-* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of
-NULL.
---
-
-Fix
-Suggested-by: Jakub Wilk <jwilk@jwilk.net>
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- src/logging.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/logging.c b/src/logging.c
-index 1a4f6203d16d..d01f974e4545 100644
---- a/src/logging.c
-+++ b/src/logging.c
-@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void)
- 
- 
- /* Print a hexdump of (BUFFER,LENGTH).  With FMT passed as NULL print
-- * just the raw dump, with FMT being an empty string, print a trailing
-- * linefeed, otherwise print an entire debug line with the expanded
-- * FMT followed by a possible wrapped hexdump and a final LF.  */
-+ * just the raw dump (in this case ARG_PTR is not used), with FMT
-+ * being an empty string, print a trailing linefeed, otherwise print
-+ * an entire debug line with the expanded FMT followed by a possible
-+ * wrapped hexdump and a final LF.  */
- void
- _gpgrt_logv_printhex (const void *buffer, size_t length,
-                       const char *fmt, va_list arg_ptr)
-@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
-       va_end (arg_ptr);
-     }
-   else
--    _gpgrt_logv_printhex (buffer, length, NULL, NULL);
-+    {
-+      /* va_list is not necessary a pointer and thus we can't use NULL
-+       * because that would conflict with platforms using a straight
-+       * struct for it (e.g. arm64).  We use a dummy variable instead;
-+       * the static is a simple way zero it out so to not get
-+       * complains about uninitialized use.  */
-+      static va_list dummy_argptr;
-+
-+      _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr);
-+    }
- }
- 
- 
diff --git a/patches/libgpg-error-1.28/series b/patches/libgpg-error-1.28/series
deleted file mode 100644
index d627f12d0..000000000
--- a/patches/libgpg-error-1.28/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
-# da99be1b79ee0b3994f2153e5ad33086  - git-ptx-patches magic
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 525ab0c7a..2a71ea042 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
 #
 # Paths and names
 #
-LIBGPG_ERROR_VERSION	:= 1.28
-LIBGPG_ERROR_MD5	:= 2b072f6194eb22d48cd4c7c77e59b5af
+LIBGPG_ERROR_VERSION	:= 1.31
+LIBGPG_ERROR_MD5	:= 5cc6df0fea27832e9cdbafc60f51561b
 LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
 LIBGPG_ERROR_SUFFIX	:= tar.bz2
 LIBGPG_ERROR_URL	:= \
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] systemd: add upstream patch to fix OnFailure behaviour

[Clemens Gruber]

Without this patch, the OnFailure action is triggered, even though there
was a normal/successful restart. (e.g. with RestartForceExitStatus and
SuccessExitStatus to trigger service restarts with special exit codes)

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...er-OnFailure-deps-when-a-unit-is-goi.patch | 244 ++++++++++++++++++
 patches/systemd-238/series                    |   3 +-
 2 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 patches/systemd-238/0005-core-don-t-trigger-OnFailure-deps-when-a-unit-is-goi.patch

diff --git a/patches/systemd-238/0005-core-don-t-trigger-OnFailure-deps-when-a-unit-is-goi.patch b/patches/systemd-238/0005-core-don-t-trigger-OnFailure-deps-when-a-unit-is-goi.patch
new file mode 100644
index 000000000..b783cac3a
--- /dev/null
+++ b/patches/systemd-238/0005-core-don-t-trigger-OnFailure-deps-when-a-unit-is-goi.patch
@@ -0,0 +1,244 @@
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 1 Jun 2018 19:06:19 +0200
+Subject: [PATCH] core: don't trigger OnFailure= deps when a unit is going to
+ restart
+
+This adds a flags parameter to unit_notify() which can be used to pass
+additional notification information to the function. We the make the old
+reload_failure boolean parameter one of these flags, and then add a new
+flag that let's unit_notify() if we are configured to restart the
+service.
+
+Note that this adjusts behaviour of systemd to match what the docs say.
+
+Fixes: #8398
+---
+ src/core/automount.c |  2 +-
+ src/core/device.c    |  2 +-
+ src/core/mount.c     |  3 ++-
+ src/core/path.c      |  2 +-
+ src/core/scope.c     |  2 +-
+ src/core/service.c   |  5 ++++-
+ src/core/slice.c     |  2 +-
+ src/core/socket.c    |  2 +-
+ src/core/swap.c      |  2 +-
+ src/core/target.c    |  2 +-
+ src/core/timer.c     |  2 +-
+ src/core/unit.c      | 10 ++++++----
+ src/core/unit.h      |  7 ++++++-
+ 13 files changed, 27 insertions(+), 16 deletions(-)
+
+diff --git a/src/core/automount.c b/src/core/automount.c
+index 01a6ff806e16..b66c7baad7e3 100644
+--- a/src/core/automount.c
++++ b/src/core/automount.c
+@@ -265,7 +265,7 @@ static void automount_set_state(Automount *a, AutomountState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(a), "Changed %s -> %s", automount_state_to_string(old_state), automount_state_to_string(state));
+ 
+-        unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static int automount_coldplug(Unit *u) {
+diff --git a/src/core/device.c b/src/core/device.c
+index b0dd469fd14b..d92e92bdcc6b 100644
+--- a/src/core/device.c
++++ b/src/core/device.c
+@@ -136,7 +136,7 @@ static void device_set_state(Device *d, DeviceState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(d), "Changed %s -> %s", device_state_to_string(old_state), device_state_to_string(state));
+ 
+-        unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(d), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static int device_coldplug(Unit *u) {
+diff --git a/src/core/mount.c b/src/core/mount.c
+index fb55c71d3c00..46add4d6481e 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -669,7 +669,8 @@ static void mount_set_state(Mount *m, MountState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(m), "Changed %s -> %s", mount_state_to_string(old_state), mount_state_to_string(state));
+ 
+-        unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state], m->reload_result == MOUNT_SUCCESS);
++        unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state],
++                    m->reload_result == MOUNT_SUCCESS ? 0 : UNIT_NOTIFY_RELOAD_FAILURE);
+ }
+ 
+ static int mount_coldplug(Unit *u) {
+diff --git a/src/core/path.c b/src/core/path.c
+index 1893d8de4581..e5e60b86e995 100644
+--- a/src/core/path.c
++++ b/src/core/path.c
+@@ -438,7 +438,7 @@ static void path_set_state(Path *p, PathState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(p), "Changed %s -> %s", path_state_to_string(old_state), path_state_to_string(state));
+ 
+-        unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(p), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static void path_enter_waiting(Path *p, bool initial, bool recheck);
+diff --git a/src/core/scope.c b/src/core/scope.c
+index 5b9c2bb3c4f0..efebb2f11200 100644
+--- a/src/core/scope.c
++++ b/src/core/scope.c
+@@ -111,7 +111,7 @@ static void scope_set_state(Scope *s, ScopeState state) {
+         if (state != old_state)
+                 log_debug("%s changed %s -> %s", UNIT(s)->id, scope_state_to_string(old_state), scope_state_to_string(state));
+ 
+-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static int scope_add_default_dependencies(Scope *s) {
+diff --git a/src/core/service.c b/src/core/service.c
+index df36019f6238..fc98ab90e9e1 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1091,7 +1091,9 @@ static void service_set_state(Service *s, ServiceState state) {
+         if (old_state != state)
+                 log_unit_debug(UNIT(s), "Changed %s -> %s", service_state_to_string(old_state), service_state_to_string(state));
+ 
+-        unit_notify(UNIT(s), table[old_state], table[state], s->reload_result == SERVICE_SUCCESS);
++        unit_notify(UNIT(s), table[old_state], table[state],
++                    (s->reload_result == SERVICE_SUCCESS ? 0 : UNIT_NOTIFY_RELOAD_FAILURE) |
++                    (s->will_auto_restart ? UNIT_NOTIFY_WILL_AUTO_RESTART : 0));
+ }
+ 
+ static usec_t service_coldplug_timeout(Service *s) {
+@@ -1606,6 +1608,7 @@ static bool service_will_restart(Unit *u) {
+                 return false;
+         if (UNIT(s)->job->type == JOB_START)
+                 return true;
++
+         return false;
+ }
+ 
+diff --git a/src/core/slice.c b/src/core/slice.c
+index 1c4574b8bb15..ea2dfb78f6e5 100644
+--- a/src/core/slice.c
++++ b/src/core/slice.c
+@@ -55,7 +55,7 @@ static void slice_set_state(Slice *t, SliceState state) {
+                           slice_state_to_string(old_state),
+                           slice_state_to_string(state));
+ 
+-        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static int slice_add_parent_slice(Slice *s) {
+diff --git a/src/core/socket.c b/src/core/socket.c
+index 41988788b898..53226ef00694 100644
+--- a/src/core/socket.c
++++ b/src/core/socket.c
+@@ -1813,7 +1813,7 @@ static void socket_set_state(Socket *s, SocketState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(s), "Changed %s -> %s", socket_state_to_string(old_state), socket_state_to_string(state));
+ 
+-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static int socket_coldplug(Unit *u) {
+diff --git a/src/core/swap.c b/src/core/swap.c
+index ed397c4c9e37..96c1ef5a171e 100644
+--- a/src/core/swap.c
++++ b/src/core/swap.c
+@@ -508,7 +508,7 @@ static void swap_set_state(Swap *s, SwapState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(s), "Changed %s -> %s", swap_state_to_string(old_state), swap_state_to_string(state));
+ 
+-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], 0);
+ 
+         /* If there other units for the same device node have a job
+            queued it might be worth checking again if it is runnable
+diff --git a/src/core/target.c b/src/core/target.c
+index 756cbbfb6ce4..916f0dff4394 100644
+--- a/src/core/target.c
++++ b/src/core/target.c
+@@ -44,7 +44,7 @@ static void target_set_state(Target *t, TargetState state) {
+                           target_state_to_string(old_state),
+                           target_state_to_string(state));
+ 
+-        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static int target_add_default_dependencies(Target *t) {
+diff --git a/src/core/timer.c b/src/core/timer.c
+index ddb9c82b8715..2cf0836155aa 100644
+--- a/src/core/timer.c
++++ b/src/core/timer.c
+@@ -277,7 +277,7 @@ static void timer_set_state(Timer *t, TimerState state) {
+         if (state != old_state)
+                 log_unit_debug(UNIT(t), "Changed %s -> %s", timer_state_to_string(old_state), timer_state_to_string(state));
+ 
+-        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], true);
++        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state], 0);
+ }
+ 
+ static void timer_enter_waiting(Timer *t, bool initial);
+diff --git a/src/core/unit.c b/src/core/unit.c
+index c3056624ef23..e64ff2b8ade9 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -1959,7 +1959,7 @@ int unit_reload(Unit *u) {
+ 
+         if (!UNIT_VTABLE(u)->reload) {
+                 /* Unit doesn't have a reload function, but we need to propagate the reload anyway */
+-                unit_notify(u, unit_active_state(u), unit_active_state(u), true);
++                unit_notify(u, unit_active_state(u), unit_active_state(u), 0);
+                 return 0;
+         }
+ 
+@@ -2327,7 +2327,7 @@ static void unit_update_on_console(Unit *u) {
+ 
+ }
+ 
+-void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success) {
++void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, UnitNotifyFlags flags) {
+         bool unexpected;
+         Manager *m;
+ 
+@@ -2403,7 +2403,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
+ 
+                         if (u->job->state == JOB_RUNNING) {
+                                 if (ns == UNIT_ACTIVE)
+-                                        job_finish_and_invalidate(u->job, reload_success ? JOB_DONE : JOB_FAILED, true, false);
++                                        job_finish_and_invalidate(u->job, (flags & UNIT_NOTIFY_RELOAD_FAILURE) ? JOB_FAILED : JOB_DONE, true, false);
+                                 else if (!IN_SET(ns, UNIT_ACTIVATING, UNIT_RELOADING)) {
+                                         unexpected = true;
+ 
+@@ -2456,7 +2456,9 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
+ 
+                 if (ns != os && ns == UNIT_FAILED) {
+                         log_unit_debug(u, "Unit entered failed state.");
+-                        unit_start_on_failure(u);
++
++                        if (!(flags & UNIT_NOTIFY_WILL_AUTO_RESTART))
++                                unit_start_on_failure(u);
+                 }
+         }
+ 
+diff --git a/src/core/unit.h b/src/core/unit.h
+index e903bf8ad7ef..368c6eab82d9 100644
+--- a/src/core/unit.h
++++ b/src/core/unit.h
+@@ -666,7 +666,12 @@ int unit_reload(Unit *u);
+ int unit_kill(Unit *u, KillWho w, int signo, sd_bus_error *error);
+ int unit_kill_common(Unit *u, KillWho who, int signo, pid_t main_pid, pid_t control_pid, sd_bus_error *error);
+ 
+-void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success);
++typedef enum UnitNotifyFlags {
++        UNIT_NOTIFY_RELOAD_FAILURE    = 1U << 0,
++        UNIT_NOTIFY_WILL_AUTO_RESTART = 1U << 1,
++} UnitNotifyFlags;
++
++void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, UnitNotifyFlags flags);
+ 
+ int unit_watch_pid(Unit *u, pid_t pid);
+ void unit_unwatch_pid(Unit *u, pid_t pid);
diff --git a/patches/systemd-238/series b/patches/systemd-238/series
index c944349f2..e3f9b1905 100644
--- a/patches/systemd-238/series
+++ b/patches/systemd-238/series
@@ -4,4 +4,5 @@
 0002-core-do-not-free-heap-allocated-strings-8391.patch
 0003-units-Fix-SuccessAction-that-belongs-to-Unit-section.patch
 0004-add-__nr_statx-defines-for-extra-architectures.patch
-# 6b5baff5bd25fe8378e83fcbe60f9d0c  - git-ptx-patches magic
+0005-core-don-t-trigger-OnFailure-deps-when-a-unit-is-goi.patch
+# 1f0962615be22e831b59404c594a352d  - git-ptx-patches magic
-- 
2.17.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de