Skip to contentSkip to conversation

systemd: update to v237

PATCH New Adam Duskett 2 participants 2 messages Jan 30, 2018 – Feb 3, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd: update to v237

Also refresh patches and remove 0004-add-false-option-for-tests.patch as it has been added upstream.

---
 package/systemd/0001-fix-getty-unit.patch          |   6 +-
 .../0002-install-don-t-use-ln-relative.patch       |  10 +-
 .../systemd/0004-add-false-option-for-tests.patch  | 150 ---------------------
 package/systemd/systemd.hash                       |   2 +-
 package/systemd/systemd.mk                         |   2 +-
 5 files changed, 10 insertions(+), 160 deletions(-)
 delete mode 100644 package/systemd/0004-add-false-option-for-tests.patch
package/systemd/0001-fix-getty-unit.patch +3 -3
index 8b50353195..b6947626c5 100644
@@ -7,7 +7,7 @@ Prefer getty to agetty in console setup systemd units
 
 Signed-off-by: Maxime Ripard <[email protected]>
 Signed-off-by: Eric Le Bihan <[email protected]>
-[Adam: Refresh for 234]
+[aduskett at gmail.com: Update for systemd v237]
 Signed-off-by: Adam Duskett <[email protected]>
 ---
  units/getty at .service.m4        | 5 +----
@@ -18,7 +18,7 @@ diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
 index 2a84061..7ad588f 100644
 --- a/units/getty at .service.m4
 +++ b/units/getty at .service.m4
-@@ -33,10 +33,7 @@ ConditionPathExists=/dev/tty0
+@@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0
  
  [Service]
  # the VT is cleared by TTYVTDisallocate
@@ -34,7 +34,7 @@ diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4
 index b7caeaf..c663612 100644
 --- a/units/serial-getty at .service.m4
 +++ b/units/serial-getty at .service.m4
-@@ -31,7 +31,7 @@ Before=rescue.service
+@@ -33,7 +33,7 @@ Before=rescue.service
  # The '-o' option value tells agetty to replace 'login' arguments with an
  # option to preserve environment (-p), followed by '--' for safety, and then
  # the entered username.
package/systemd/0002-install-don-t-use-ln-relative.patch +5 -5
index e76ce4378a..5f34b56969 100644
@@ -19,6 +19,7 @@ while we do :  /usr/sbin/foo -> ../../usr/bin/foo
 
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 [aduskett at gmail.com: Added meson.build section and dirname wrapper in add-wants]
+[aduskett at gmail.com: Update for systemd v237]
 Signed-off-by: Adam Duskett <[email protected]>
 ---
  meson.build                 | 2 +-
@@ -30,8 +31,7 @@ diff --git a/meson.build b/meson.build
 index ddc061c..614201a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -531,7 +531,7 @@ foreach prog : progs
- endforeach
+@@ -572,6 +572,6 @@ conf.set_quoted('TELINIT', get_option('telinit-path'))
  
  if run_command('ln', '--relative', '--help').returncode() != 0
 -        error('ln does not support --relative')
@@ -43,7 +43,7 @@ diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
 index 47a5e70..e9002ad 100755
 --- a/tools/meson-make-symlink.sh
 +++ b/tools/meson-make-symlink.sh
-@@ -7,5 +7,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
+@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
  if [ "$(dirname $1)" = . ]; then
          ln -vfs -T "$1" "${DESTDIR:-}$2"
  else
@@ -55,7 +55,7 @@ diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
 index dfd287e..8c08283 100755
 --- a/units/meson-add-wants.sh
 +++ b/units/meson-add-wants.sh
-@@ -13,7 +13,7 @@ case "$target" in
+@@ -14,7 +14,7 @@ case "$target" in
                  ;;
  esac
  
@@ -64,7 +64,7 @@ index dfd287e..8c08283 100755
  
  case "$target" in
          */)
-@@ -24,4 +24,5 @@ case "$target" in
+@@ -25,4 +25,5 @@ case "$target" in
                  ;;
  esac
  
package/systemd/0004-add-false-option-for-tests.patch deleted +0 -150

150 lines not on this page · raw message

package/systemd/systemd.hash +1 -1
index d8f6365c9c..74cc5dd825 100644
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256	0cadccfa7109232ec2a469d41ca595d5595b83b648b534ea669c15dbca904c43	systemd-236.tar.gz
+sha256	c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c	systemd-237.tar.gz
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	LICENSE.GPL2
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	LICENSE.LGPL2.1
 sha256	f6a739f5ee7f10df6467021066038297c0150ff680db9a4b9f60da53b11aa560	README
package/systemd/systemd.mk +1 -1
index f58e037943..1c31ebb34c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 236
+SYSTEMD_VERSION = 237
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
 SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
Signature · 1 line
2.14.3
#1 lore raw

PATCH 1/1 systemd: update to v237

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Adam" == Adam Duskett <[email protected]> writes:

Also refresh patches and remove 0004-add-false-option-for-tests.patch as it has been added upstream.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard