summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-01-18 17:00:13 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-02-19 07:33:03 +0100
commitb1854484a0f2b701b198d55887bd30efc375cc11 (patch)
tree5409f592d751b1ef3240de61d4788a09535d0ce2
parentfa75a6dd63395c88a7fbbb95152d07aaa3f35357 (diff)
downloadptxdist-b1854484a0f2b701b198d55887bd30efc375cc11.tar.gz
ptxdist-b1854484a0f2b701b198d55887bd30efc375cc11.tar.xz
systemd: version bump 239 -> 241
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/systemd-239/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch104
-rw-r--r--patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch22
-rw-r--r--patches/systemd-239/series5
-rw-r--r--projectroot/etc/fstab1
-rw-r--r--rules/systemd.in6
-rw-r--r--rules/systemd.make24
6 files changed, 16 insertions, 146 deletions
diff --git a/patches/systemd-239/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch b/patches/systemd-239/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
deleted file mode 100644
index 44a4b7504..000000000
--- a/patches/systemd-239/0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Filipe Brandenburger <filbranden@google.com>
-Date: Sun, 15 Jul 2018 22:43:35 -0700
-Subject: [PATCH] build-sys: Detect whether struct statx is defined in
- sys/stat.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a
-definition for struct statx, in which case include file linux/stat.h should be
-avoided, in order to prevent a duplicate definition.
-
- In file included from ../src/basic/missing.h:18,
- from ../src/basic/util.h:28,
- from ../src/basic/hashmap.h:10,
- from ../src/shared/bus-util.h:12,
- from ../src/libsystemd/sd-bus/bus-creds.c:11:
- /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’
- struct statx {
- ^~~~~
- In file included from /usr/include/sys/stat.h:446,
- from ../src/basic/util.h:19,
- from ../src/basic/hashmap.h:10,
- from ../src/shared/bus-util.h:12,
- from ../src/libsystemd/sd-bus/bus-creds.c:11:
- /usr/include/bits/statx.h:36:8: note: originally defined here
- struct statx
- ^~~~~
-
-Extend our meson.build to look for struct statx when only sys/stat.h is
-included and, in that case, do not include linux/stat.h anymore.
-
-Tested that systemd builds correctly when using a glibc version that includes a
-definition for struct statx.
-
-glibc Fedora RPM update:
-https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae
-
-glibc upstream commit:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd
----
- meson.build | 5 +++++
- src/basic/missing.h | 5 ++++-
- src/basic/xattr-util.c | 1 -
- 3 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 04331dd41a19..a0e724070874 100644
---- a/meson.build
-+++ b/meson.build
-@@ -425,6 +425,7 @@ decl_headers = '''
- #include <sys/stat.h>
- '''
- # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail
-+# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time
-
- foreach decl : ['char16_t',
- 'char32_t',
-@@ -439,6 +440,10 @@ foreach decl : ['char16_t',
- conf.set10('HAVE_' + decl.underscorify().to_upper(), have)
- endforeach
-
-+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : '''
-+#include <sys/stat.h>
-+''', args : '-D_GNU_SOURCE') > 0)
-+
- foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'],
- ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'],
- ['IFLA_VRF_TABLE', 'linux/if_link.h'],
-diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 71a07d057474..14ad3d49140f 100644
---- a/src/basic/missing.h
-+++ b/src/basic/missing.h
-@@ -15,7 +15,6 @@
- #include <linux/neighbour.h>
- #include <linux/oom.h>
- #include <linux/rtnetlink.h>
--#include <linux/stat.h>
- #include <net/ethernet.h>
- #include <stdlib.h>
- #include <sys/resource.h>
-@@ -25,6 +24,10 @@
- #include <uchar.h>
- #include <unistd.h>
-
-+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H
-+#include <linux/stat.h>
-+#endif
-+
- #if HAVE_AUDIT
- #include <libaudit.h>
- #endif
-diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
-index c5c55ea8461a..0ee0979837cd 100644
---- a/src/basic/xattr-util.c
-+++ b/src/basic/xattr-util.c
-@@ -2,7 +2,6 @@
-
- #include <errno.h>
- #include <fcntl.h>
--#include <linux/stat.h>
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
deleted file mode 100644
index f1858b23d..000000000
--- a/patches/systemd-239/0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Lennart Poettering <lennart@poettering.net>
-Date: Fri, 19 Oct 2018 12:12:33 +0200
-Subject: [PATCH] dhcp6: make sure we have enough space for the DHCP6 option
- header
-
----
- src/libsystemd-network/dhcp6-option.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
-index 18196b12573c..09794972991f 100644
---- a/src/libsystemd-network/dhcp6-option.c
-+++ b/src/libsystemd-network/dhcp6-option.c
-@@ -103,7 +103,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, DHCP6IA *ia) {
- return -EINVAL;
- }
-
-- if (*buflen < len)
-+ if (*buflen < offsetof(DHCP6Option, data) + len)
- return -ENOBUFS;
-
- ia_hdr = *buf;
diff --git a/patches/systemd-239/series b/patches/systemd-239/series
deleted file mode 100644
index bdfa3c1e8..000000000
--- a/patches/systemd-239/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
-0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
-# 69d3a3089d693a020a7338b3e119044a - git-ptx-patches magic
diff --git a/projectroot/etc/fstab b/projectroot/etc/fstab
index 269e35f66..0121c3076 100644
--- a/projectroot/etc/fstab
+++ b/projectroot/etc/fstab
@@ -14,4 +14,3 @@ tmpfs /run tmpfs nosuid,nodev,strictatime,mode=0755 0 0
tmpfs /var/log tmpfs nosuid,nodev,noexec,mode=0755,size=10% 0 0
tmpfs /var/lock tmpfs nosuid,nodev,noexec,mode=0755,size=1M 0 0
tmpfs /var/tmp tmpfs nosuid,nodev,mode=1777,size=20% 0 0
-tmpfs /var/lib/private tmpfs mode=0700,size=20% 0 0
diff --git a/rules/systemd.in b/rules/systemd.in
index 949a62c77..cf2897e4d 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -185,12 +185,6 @@ endmenu
menu "misc helper "
-config SYSTEMD_UDEV_COLLECT
- bool
- prompt "collect"
- help
- Collect variables across events
-
config SYSTEMD_UDEV_MTD_PROBE
bool
prompt "mtd_probe"
diff --git a/rules/systemd.make b/rules/systemd.make
index 7dd16b716..d3a6b72b1 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
#
# Paths and names
#
-SYSTEMD_VERSION := 239
-SYSTEMD_MD5 := 6137e3f50390391cf34521d071a1a078
+SYSTEMD_VERSION := 241
+SYSTEMD_MD5 := c5953c24c850b44fcf714326e567dc37
SYSTEMD := systemd-$(SYSTEMD_VERSION)
SYSTEMD_SUFFIX := tar.gz
SYSTEMD_URL := https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX)
@@ -54,6 +54,8 @@ SYSTEMD_CONF_OPT := \
-Dbacklight=false \
-Dbinfmt=false \
-Dblkid=true \
+ -Dbump-proc-sys-fs-file-max=true \
+ -Dbump-proc-sys-fs-nr-open=true \
-Dbzip2=false \
-Dcertificate-root=/etc/ssl \
-Dcompat-gateway-hostname=false \
@@ -66,6 +68,8 @@ SYSTEMD_CONF_OPT := \
-Ddefault-dnssec=no \
-Ddefault-hierarchy=hybrid \
-Ddefault-kill-user-processes=true \
+ -Ddefault-locale=C \
+ -Ddefault-net-naming-scheme=latest \
-Ddev-kvm-mode=0660 \
-Ddns-over-tls=false \
-Ddns-servers= \
@@ -88,7 +92,6 @@ SYSTEMD_CONF_OPT := \
-Dimportd=false \
-Dinstall-tests=false \
-Dkexec-path=/usr/sbin/kexec \
- -Dkill-path=/usr/bin/kill \
-Dkmod=true \
-Dkmod-path=/usr/bin/kmod \
-Dldconfig=false \
@@ -102,6 +105,7 @@ SYSTEMD_CONF_OPT := \
-Dllvm-fuzz=false \
-Dloadkeys-path=/usr/bin/loadkeys \
-Dlocaled=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOCALES) \
+ -Dlog-trace=false \
-Dlogind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
-Dlz4=$(call ptx/truefalse,PTXCONF_SYSTEMD_LZ4) \
-Dmachined=false \
@@ -109,13 +113,16 @@ SYSTEMD_CONF_OPT := \
-Dmemory-accounting-default=true \
-Dmicrohttpd=$(call ptx/truefalse,PTXCONF_SYSTEMD_MICROHTTPD) \
-Dmount-path=/usr/bin/mount \
- -Dmyhostname=true \
-Dnetworkd=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \
-Dnobody-group=nogroup \
-Dnobody-user=nobody \
+ -Dnss-myhostname=true \
+ -Dnss-mymachines=false \
+ -Dnss-resolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \
-Dnss-systemd=true \
-Dntp-servers= \
-Dok-color=green \
+ -Dopenssl=false \
-Doss-fuzz=false \
-Dpam=false \
-Dpcre2=false \
@@ -135,10 +142,11 @@ SYSTEMD_CONF_OPT := \
-Dslow-tests=false \
-Dsmack=false \
-Dsplit-bin=true \
+ -Dsplit-usr=false \
-Dstatic-libsystemd=false \
-Dstatic-libudev=false \
- -Dsplit-usr=false \
-Dsulogin-path=/sbin/sulogin \
+ -Dsupport-url=https://www.ptxdist.org/ \
-Dsystem-gid-max=999 \
-Dsystem-uid-max=999 \
-Dsysusers=false \
@@ -153,7 +161,7 @@ SYSTEMD_CONF_OPT := \
-Dtpm=false \
-Dtty-gid=112 \
-Dumount-path=/usr/bin/umount \
- -Dusers-gid= \
+ -Dusers-gid=-1 \
-Dutmp=false \
-Dvalgrind=false \
-Dvconsole=$(call ptx/truefalse,PTXCONF_SYSTEMD_VCONSOLE) \
@@ -233,7 +241,6 @@ SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_ATA) += ata_id
SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_CDROM) += cdrom_id
SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_SCSI) += scsi_id
SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_V4L) += v4l_id
-SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_COLLECT) += collect
SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_MTD_PROBE) += mtd_probe
SYSTEMD_UDEV_RULES-y := \
@@ -400,12 +407,13 @@ endif
@$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd)
@$(call install_copy, systemd, 0, 0, 0700, /var/lib/private)
+ @$(call install_copy, systemd, 0, 0, 0700, /var/cache/private)
# # systemd expects this directory to exist.
@$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd/coredump)
@$(call install_copy, systemd, 0, 0, 0700, /var/lib/machines)
ifdef PTXCONF_SYSTEMD_TIMEDATE
- @$(call install_link, systemd, ../private/systemd/timesync, \
+ @$(call install_copy, systemd, systemd-timesync, nogroup, 0700, \
/var/lib/systemd/timesync)
endif