Skip to contentSkip to conversation

package/systemd: bump version to 243

PATCH New Jagan Teki 4 participants 5 messages Sep 30, 2019 – Oct 5, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 package/systemd: bump version to 243

Bump systemd version to 243, this would remove patches that have been available in upstream and updated hash file.

---
 .../0001-install-don-t-use-ln-relative.patch  |  30 +--
 ...age-paths-longer-than-BUS_PATH_SIZE_.patch |  53 -----
 ...ry-strings-to-hold-dbus-paths-on-the.patch | 194 ------------------
 ...drop-misplaced-Wl-undefined-argument.patch |  51 -----
 package/systemd/systemd.hash                  |   2 +-
 package/systemd/systemd.mk                    |   2 +-
 6 files changed, 17 insertions(+), 315 deletions(-)
 delete mode 100644 package/systemd/0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
 delete mode 100644 package/systemd/0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
 delete mode 100644 package/systemd/0004-meson-drop-misplaced-Wl-undefined-argument.patch
package/systemd/0001-install-don-t-use-ln-relative.patch +15 -15
index d00a8db63f..a25a93b675 100644
@@ -1,6 +1,6 @@
-From 7f4a12d25bbb5859d266f32f7a3d794bb62c354e Mon Sep 17 00:00:00 2001
+From 3b2b27d722d84056396fe4585b33ea5b0f328bd8 Mon Sep 17 00:00:00 2001
 From: Adam Duskett <[email protected]>
-Date: Sun, 31 Dec 2017 12:46:04 -0500
+Date: Sat, 28 Sep 2019 17:55:44 +0530
 Subject: [PATCH] install: don't use ln --relative
 
 Oldish enterprise-class distributions have too old versions of
@@ -30,45 +30,45 @@ Signed-off-by: Trent Piepho <[email protected]>
  3 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 04331dd41..359042c04 100644
+index e5ceb1e..92bcdfe 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -628,7 +628,7 @@ endforeach
+@@ -580,7 +580,7 @@ endforeach
  conf.set_quoted('TELINIT', get_option('telinit-path'))
  
  if run_command('ln', '--relative', '--help').returncode() != 0
 -        error('ln does not support --relative (added in coreutils 8.16)')
-+        message('ln does not support --relative (added in coreutils 8.16)')
++	message('ln does not support --relative (added in coreutils 8.16)')
  endif
  
  ############################################################
 diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
-index 501cd43d4..25e7f89fd 100755
+index da0d13a..4917eff 100755
 --- a/tools/meson-make-symlink.sh
 +++ b/tools/meson-make-symlink.sh
 @@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
  if [ "$(dirname $1)" = . ]; then
-         ln -vfs -T "$1" "${DESTDIR:-}$2"
+     ln -vfs -T "$1" "${DESTDIR:-}$2"
  else
--        ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
-+        dds="$( dirname "$2" |sed -r -e 's:/+[^/]+:../:g; s:/$::' )"
-+        ln -vfs -T "${dds}$1" "${DESTDIR:-}$2"
+-    ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
++    dds="$( dirname "$2" |sed -r -e 's:/+[^/]+:../:g; s:/$::' )"
++    ln -vfs -T "${dds}$1" "${DESTDIR:-}$2"
  fi
 diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
-index 70f7172ae..bb8155075 100755
+index a483d75..4642673 100755
 --- a/units/meson-add-wants.sh
 +++ b/units/meson-add-wants.sh
 @@ -14,7 +14,7 @@ case "$target" in
-                 ;;
+         ;;
  esac
  
 -unitpath="${DESTDIR:-}${unitdir}/${unit}"
 +unitpath="${unitdir}/${unit}"
  
  case "$target" in
-         */)
+     */)
 @@ -25,4 +25,6 @@ case "$target" in
-                 ;;
+         ;;
  esac
  
 -ln -vfs --relative "$unitpath" "$dir"
@@ -76,5 +76,5 @@ index 70f7172ae..bb8155075 100755
 +dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')"
 +ln -vfs "$dds$unitpath" "$dir"
 -- 
-2.14.4
+2.18.0.321.gffc6fa0e3
 
package/systemd/0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch deleted +0 -53

53 lines not on this page · raw message

package/systemd/0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch deleted +0 -194

194 lines not on this page · raw message

package/systemd/0004-meson-drop-misplaced-Wl-undefined-argument.patch deleted +0 -51

51 lines not on this page · raw message

package/systemd/systemd.hash +1 -1
index c769d48959..ed3e28b993 100644
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256	b2561a8e1d10a2c248253f0dda31a85dd6d69f2b54177de55e02cd1d2778316e  	systemd-241.tar.gz
+sha256  0611843c2407f8b125b1b7cb93533bdebd4ccf91c99dffa64ec61556a258c7d1	systemd-243.tar.gz
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	LICENSE.GPL2
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	LICENSE.LGPL2.1
 sha256	d9356b277440f21730426592c27170d034a39954ab5154dfba1cc3cbf7b22935	README
package/systemd/systemd.mk +1 -1
index e8fd7967bd..f73d5c056c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 241
+SYSTEMD_VERSION = 243
 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.18.0.321.gffc6fa0e3
#1 lore raw

PATCH 1/1 package/systemd: bump version to 243

Quoted 5 lines · On Mon, 30 Sep 2019 11:13:56 +0530 Jagan Teki <[email protected]>…

Bump systemd version to 243, this would remove patches that have been available in upstream and updated hash file.

We already have a systemd bump to 243 proposed in patchwork, and it looks much more complete than this one:

http://patchwork.ozlabs.org/patch/1157207/

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH 1/1 package/systemd: bump version to 243

Quoted 7 lines · Thomas Petazzoni
Quoted 3 lines · On Mon, 30 Sep 2019 11:13:56 +0530 Jagan Teki <[email protected]>…

Bump systemd version to 243, this would remove patches that have been available in upstream and updated hash file.

Quoted 7 lines
Quoted 2 lines

We already have a systemd bump to 243 proposed in patchwork, and it looks much more complete than this one:

http://patchwork.ozlabs.org/patch/1157207/

Couldn't find it before, will pick this for test.

#3 lore raw

PATCH 1/1 package/systemd: bump version to 243

In reply to Thomas Petazzoni

Hi Thomas,

Quoted 15 lines · Thomas Petazzoni
Quoted 5 lines · On Mon, 30 Sep 2019 11:13:56 +0530 Jagan Teki <[email protected]>…

Bump systemd version to 243, this would remove patches that have been available in upstream and updated hash file.

We already have a systemd bump to 243 proposed in patchwork, and it looks much more complete than this one:

http://patchwork.ozlabs.org/patch/1157207/

Quoted 9 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

So what is holding that up from being applied?

Thanks,
-Vladimir

#4 lore raw

PATCH 1/1 package/systemd: bump version to 243

Quoted 30 lines · Vladimir Oltean

Hi Thomas,

Quoted 15 lines · Thomas Petazzoni
Quoted 5 lines · On Mon, 30 Sep 2019 11:13:56 +0530 Jagan Teki <[email protected]>…

Bump systemd version to 243, this would remove patches that have been available in upstream and updated hash file.

We already have a systemd bump to 243 proposed in patchwork, and it looks much more complete than this one:

http://patchwork.ozlabs.org/patch/1157207/

Quoted 9 lines

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Quoted 1 line

So what is holding that up from being applied?

I think more people need to test it, seems to work fine for me though.

Quoted 7 lines

Thanks,
-Vladimir
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot