systemd: bump version to 232

PATCH New Vicente Olivert Riera 2 participants 2 messages Nov 4, 2016 – Nov 5, 2016

Share & tools

Vicente Olivert Riera

author

2016-11-04 10:32 UTC #0 lore raw

PATCH 1/1 systemd: bump version to 232

- 0002 patch tweaked. There is a hunk that has been removed upstream by this commit:
https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff
- Patches 0004, 0005 and 0006 were backported from upstream and now they are included in this release, so drop them.

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 ...uild-sys-revert-use-of-ln-relative-option.patch | 18 +++---
 ...-export-raw-needs-missing.h-for-O_TMPFILE.patch | 31 -----------
 ...h-add-missing-definitions-for-__O_TMPFILE.patch | 63 ---------------------
 ...basic-fileio-we-always-have-O_TMPFILE-now.patch | 65 ----------------------
 package/systemd/systemd.hash                       |  2 +-
 package/systemd/systemd.mk                         |  2 +-
 6 files changed, 9 insertions(+), 172 deletions(-)
 delete mode 100644 package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch
 delete mode 100644 package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch
 delete mode 100644 package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch

package/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch +7 ~~-11~~

index 18dc987..2c1d929 100644
@@ -11,25 +11,21 @@ for example).
 
 Signed-off-by: Eric Le Bihan <[email protected]>
 [Maxime: refresh the patch]
+[Vincent:
+  refresh the patch, move-to-rootlibdir removed by:
+  https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff
+]
 Signed-off-by: Maxime Hadjinlian <[email protected]>
+Signed-off-by: Vicente Olivert Riera <[email protected]>
 ---
- Makefile.am  | 15 +++------------
+ Makefile.am  | 11 ++---------
  configure.ac |  2 --
- 2 files changed, 3 insertions(+), 14 deletions(-)
+ 2 files changed, 2 insertions(+), 11 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 0c27f81..4de1595 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -255,7 +255,7 @@ define move-to-rootlibdir
- 		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- 		rm -f $(DESTDIR)$(libdir)/$$libname && \
--		$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-+		$(LN_S) -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
- 		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
- 	fi
- endef
 @@ -312,9 +312,9 @@ install-aliases-hook:
  	set -- $(SYSTEM_UNIT_ALIASES) && \
  		dir=$(systemunitdir) && $(install-aliases)

package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch deleted +0 ~~-31~~

deleted file mode 100644
index bded6bc..0000000
@@ -1,31 +0,0 @@
-From 4a6d35237f96d07f3a783c874933f87bf14f93e0 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <[email protected]>
-Date: Sun, 28 Aug 2016 16:26:04 +0200
-Subject: [PATCH] importd/export-raw: needs missing.h for O_TMPFILE
-
-O_TMPFILE may be missing from the system headers, so use our fallback
-definition.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
----
-Backported from upstream:
-    https://github.com/systemd/systemd/commit/4a6d35237f96d07f3a783c874933f87bf14f93e0
----
- src/import/export-raw.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/import/export-raw.c b/src/import/export-raw.c
-index db06e11..6136b67 100644
---- a/src/import/export-raw.c
-+++ b/src/import/export-raw.c
-@@ -34,6 +34,7 @@
- #include "fd-util.h"
- #include "fileio.h"
- #include "import-common.h"
-+#include "missing.h"
- #include "ratelimit.h"
- #include "string-util.h"
- #include "util.h"
--- 
-2.7.4
-

package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch deleted +0 ~~-63~~

63 lines not on this page · raw message

package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch deleted +0 ~~-65~~

65 lines not on this page · raw message

package/systemd/systemd.hash +1 -1

index 30e9ef6..0acaa3c 100644
@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 899733ad6c157cedbb89aec4efe3bc824dcfd65a1d6f6bebc7b043f7924e39b4 systemd-231.tar.gz
+sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880  systemd-232.tar.gz

package/systemd/systemd.mk +1 -1

index fb07819..fa07bd0 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 231
+SYSTEMD_VERSION = 232
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
 SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README)
 SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README

Signature · 1 line

2.10.1

Thomas Petazzoni

Applied

2016-11-05 12:40 UTC #1 lore raw

PATCH 1/1 systemd: bump version to 232

Hello,

Quoted 7 lines · Vicente Olivert Riera

- 0002 patch tweaked. There is a hunk that has been removed upstream by this commit:
https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff
- Patches 0004, 0005 and 0006 were backported from upstream and now they are included in this release, so drop them.
Signed-off-by Vicente Olivert Riera <[email protected]>

Quoted 11 lines

---
 ...uild-sys-revert-use-of-ln-relative-option.patch | 18 +++---
 ...-export-raw-needs-missing.h-for-O_TMPFILE.patch | 31 -----------
 ...h-add-missing-definitions-for-__O_TMPFILE.patch | 63 ---------------------
 ...basic-fileio-we-always-have-O_TMPFILE-now.patch | 65 ----------------------
 package/systemd/systemd.hash                       |  2 +-
 package/systemd/systemd.mk                         |  2 +-
 6 files changed, 9 insertions(+), 172 deletions(-)
 delete mode 100644 package/systemd/0004-importd-export-raw-needs-missing.h-for-O_TMPFILE.patch
 delete mode 100644 package/systemd/0005-missing.h-add-missing-definitions-for-__O_TMPFILE.patch
 delete mode 100644 package/systemd/0006-basic-fileio-we-always-have-O_TMPFILE-now.patch

Applied to next, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com