Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2018-02-13 10:24:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Tue Feb 13 10:24:49 2018 rev:271 rq:574687 version:234
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2018-02-05
10:50:43.266736808 +0100
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
2018-02-13 10:24:52.758873965 +0100
@@ -1,0 +2,79 @@
+Fri Feb 9 14:01:24 UTC 2018 - f...@suse.com
+
+- Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7
+
+ db1d8eacd compat-rules: make path_id_compat build with meson
+
+- Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch
+ which is now part of the git repo (see above).
+
+-------------------------------------------------------------------
+Fri Feb 9 07:59:56 UTC 2018 - f...@suse.com
+
+- Don't ship /usr/lib/systemd/system/tmp.mnt at all (bsc#1071224)
+
+ The previous fix couldn't work on platforms using a RO
+ rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but
+ we still ship a copy in /var.
+
+ Users who want to use tmpfs on /tmp are supposed to add a symlink in
+ /etc/ pointing to the copy shipped in /var.
+
+ To support the update path we automatically create the symlink if
+ tmp.mount in use is located in /usr.
+
+-------------------------------------------------------------------
+Tue Feb 6 16:11:40 UTC 2018 - f...@suse.com
+
+- Don't build seccomp support in the mini package
+
+-------------------------------------------------------------------
+Tue Feb 6 15:12:42 UTC 2018 - f...@suse.com
+
+- Switch to Meson build system
+
+ Some rearrangement in the file list was also needed. That was
+ probably due to the upgrade of rpm.
+
+-------------------------------------------------------------------
+Tue Feb 6 14:54:57 UTC 2018 - f...@suse.com
+
+- Import commit 0a5600eb7f8263c7c79fec0d85cc159d54aba636
+
+ 2a181fc6f insserv-generator: make it build with meson
+ 7b0401da4 build-sys: don't build networkctl if networkd is disabled
+
+-------------------------------------------------------------------
+Tue Feb 6 09:27:59 UTC 2018 - f...@suse.com
+
+- Don't build-require selinux for the mini package
+
+-------------------------------------------------------------------
+Tue Feb 6 08:56:33 UTC 2018 - f...@suse.com
+
+- Drop libgcrypt.m4
+
+ The mini package builds fine without it so it doesn't seem necessary
+ anymore.
+
+-------------------------------------------------------------------
+Mon Feb 5 20:25:31 UTC 2018 - f...@suse.com
+
+- Import commit 846d838c37865da60eba48090e570e959291399f
+
+ b1e0a348d fileio: include sys/mman.h
+ f1fa784cb meson: update header file to detect memfd_create()
+ 8838ba7ec meson: define _GNU_SOURCE to detect copy_file_range() (#7734)
+ 531a00c84 Restore "restore /var/run and /var/lock bind mount if they aren't
symlink""
+
+ (the 3 first commits make systemd build against glibc 2.27)
+
+-------------------------------------------------------------------
+Mon Feb 5 10:01:37 UTC 2018 - f...@suse.com
+
+- Import commit 3f421e4fbf6fcb31d74caf729435868ba8824483
+
+ 7fb9ea39a Revert "restore /var/run and /var/lock bind mount if they aren't
symlink"
+ 23ce1207a meson.build: make docdir configurable (#8068)
+
+-------------------------------------------------------------------
systemd.changes: same change
Old:
----
libgcrypt.m4
suse-disable-tmpfs-for-tmp.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.jIOzSe/_old 2018-02-13 10:24:53.954830875 +0100
+++ /var/tmp/diff_new_pack.jIOzSe/_new 2018-02-13 10:24:53.958830731 +0100
@@ -69,6 +69,10 @@
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libqrencode)
+BuildRequires: pkgconfig(libselinux) >= 2.1.9
+%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
+BuildRequires: pkgconfig(libseccomp) >= 2.3.1
+%endif
%endif
BuildRequires: fdupes
BuildRequires: gperf
@@ -76,8 +80,8 @@
BuildRequires: libacl-devel
BuildRequires: libcap-devel
BuildRequires: libmount-devel >= 2.27.1
-BuildRequires: libsepol-devel
-BuildRequires: libtool
+BuildRequires: m4
+BuildRequires: meson >= 0.43
BuildRequires: pam-devel
# regenerate_initrd_post macro is expanded during build, hence this
# BR. Also this macro was introduced since version 12.4.
@@ -87,8 +91,6 @@
BuildRequires: pkgconfig(libkmod) >= 15
BuildRequires: pkgconfig(libpci) >= 3
BuildRequires: pkgconfig(libpcre)
-BuildRequires: pkgconfig(libselinux) >= 2.1.9
-BuildRequires: pkgconfig(libsepol)
%if %{with importd}
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libcurl)
@@ -98,9 +100,6 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
%endif
-%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
-BuildRequires: pkgconfig(libseccomp) >= 2.3.1
-%endif
%if %{with gnuefi}
BuildRequires: gnu-efi
%endif
@@ -144,11 +143,9 @@
Source2: systemd-user
Source3: systemd-sysv-convert
Source6: baselibs.conf
-Source7: libgcrypt.m4
Source11: after-local.service
Source12: systemd-sysv-install
Source14: kbd-model-map.legacy
-Source15: suse-disable-tmpfs-for-tmp.service
Source100: scripts-systemd-fix-machines-btrfs-subvol.sh
Source101: scripts-systemd-upgrade-from-pre-210.sh
@@ -163,8 +160,6 @@
# patches are temporary and should be removed as soon as a fix is
# merged by upstream.
-# Empty
-
%description
Systemd is a system and service manager, compatible with SysV and LSB
init scripts for Linux. systemd provides aggressive parallelization
@@ -410,62 +405,52 @@
%setup -q -n systemd-%{version}
# %autopatch -p1
-# only needed for bootstrap
-%if 0%{?bootstrap}
-cp %{SOURCE7} m4/
-%endif
-
%build
-./autogen.sh
-
# keep split-usr until all packages have moved their systemd rules to /usr
-%configure \
- --docdir=%{_docdir}/systemd \
- --with-pamlibdir=/%{_lib}/security \
- --with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
- --with-dbussessionservicedir=%{_datadir}/dbus-1/services \
- --with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \
- --with-certificate-root=%{_sysconfdir}/pki/systemd \
+%meson \
+ -Ddocdir=%{_docdir}/systemd \
+ -Drootprefix=/usr \
+ -Dsplit-usr=true \
+ -Dpamlibdir=/%{_lib}/security \
+ -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \
+ -Dcertificate-root=%{_sysconfdir}/pki/systemd \
+ -Ddefault-hierarchy=hybrid \
+ -Ddefault-kill-user-processes=false \
+ -Drc-local=/etc/init.d/boot.local \
+ -Dhalt-local=/etc/init.d/halt.local \
+ -Ddebug-shell=/bin/bash \
+ -Dseccomp=auto \
+ -Dselinux=auto \
+ -Dapparmor=auto \
+ -Dsmack=false \
+ -Dima=false \
%if 0%{?bootstrap}
- --disable-myhostname \
- --disable-manpages \
+ -Dman=false \
+ -Dhtml=false \
+ -Dmyhostname=false \
%endif
- --enable-selinux \
- --enable-split-usr \
- --disable-static \
- --disable-lto \
- --disable-tests \
- --without-kill-user-processes \
- --with-default-hierarchy=hybrid \
- --with-rc-local-script-path-start=/etc/init.d/boot.local \
- --with-rc-local-script-path-stop=/etc/init.d/halt.local \
- --with-debug-shell=/bin/bash \
- --disable-smack \
- --disable-ima \
- --disable-adm-group \
- --disable-wheel-group \
- --disable-ldconfig \
- --disable-gshadow \
%if %{without networkd}
- --disable-networkd \
+ -Dnetworkd=false \
+%endif
+%if %{without resolved}
+ -Dresolve=false \
%endif
%if %{without machined}
- --disable-machined \
+ -Dmachined=false \
%endif
%if %{without sysvcompat}
- --with-sysvinit-path= \
- --with-sysvrcnd-path= \
+ -Dsysvinit-path= \
+ -Dsysvrcnd-path= \
%endif
-%if %{without resolved}
- --disable-resolved \
-%endif
- --disable-kdbus
+ -Dadm-group=false \
+ -Dwheel-group=false \
+ -Dgshadow=false \
+ -Dldconfig=false
-%make_build V=e
+%meson_build
%install
-%make_install
-find %{buildroot} -type f -name '*.la' -delete
+%meson_install
# move to %{_lib}
%if ! 0%{?bootstrap}
@@ -481,13 +466,12 @@
ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl
ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd
-install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
-
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated
install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert
install -m0755 -D %{S:12}
%{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
+install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
# Package the scripts used to fix all packaging issues. Also drop the
# "scripts-{systemd/udev}" prefix which is used because osc doesn't
@@ -514,10 +498,11 @@
# customized for openSUSE distros.
install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/
-# Install the service which will disable/mask tmpfs for /tmp (if
-# needed) on first boot.
-install -m0644 -D %{S:15}
%{buildroot}/%{_prefix}/lib/systemd/system/suse-disable-tmpfs-for-tmp.service
-ln -s ../suse-disable-tmpfs-for-tmp.service
%{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/
+# Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs
+# by default on SUSE distros. We still keep a copy in /var for those
+# who want to switch to tmpfs: it's still can be copied in /etc.
+rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount
+mv %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount
%{buildroot}/%{_datadir}/systemd/
# don't enable wall ask password service, it spams every console (bnc#747783)
rm
%{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path
@@ -529,10 +514,6 @@
sg
EOF
-# Remove .so file for the shared library, it's not supposed to be
-# used.
-rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so
-
# do not ship sysctl defaults in systemd package, will be part of
# aaa_base (in procps for now)
rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf
@@ -653,13 +634,10 @@
# so keep the section even if it's empty.
%pre
if [ $1 -gt 1 ] ; then
- # Check if tmp.mount has been restored by either the admin or
- # was added at package installation. In both cases do nothing
- # and prevent the service to be executed during %post for the
- # former case.
- if test -e %{_unitdir}/tmp.mount; then
- touch %{_unitdir}/.disable-tmpfs-for-tmp~done
- fi
+ case "$(systemctl show -pFragmentPath tmp.mount)" in
+ FragmentPath=/usr/lib/systemd/system/tmp.mount)
+ ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || :
+ esac
fi
%post
@@ -734,13 +712,6 @@
# tmpfiles_create macro previously however it's empty so there
# shouldn't be any issues.
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
-
- # Should we mask tmpfs ? If tmp.mount was already installed in
- # /usr/lib then this is a nop as sysadmin restored the unit
- # most likely to use tmpfs (see %pre) otherwise mask the mount
- # unit unless it's overriden by a tmp.mount unit installed
- # either by sysadmin or fstab-generator.
- systemctl start suse-disable-tmpfs-for-tmp.service || :
fi
%postun
@@ -902,14 +873,16 @@
%dir %{_prefix}/lib/systemd
%dir %{_prefix}/lib/systemd/user
%dir %{_prefix}/lib/systemd/system
+%if %{with journal_remote}
+%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
+%exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.*
+%exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.*
%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
%exclude %{_prefix}/lib/systemd/systemd-journal-remote
%exclude %{_prefix}/lib/systemd/systemd-journal-upload
+%endif
%exclude %{_prefix}/lib/systemd/systemd-sysv*
%exclude %{_prefix}/lib/systemd/systemd-udevd
-%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
-%exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.*
-%exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.*
%exclude %{_prefix}/lib/systemd/system/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service
@@ -963,11 +936,13 @@
%{_libexecdir}/modules-load.d/sg.conf
%{_libexecdir}/sysusers.d/
-%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf
-
%dir %{_sysconfdir}/tmpfiles.d
%{_libexecdir}/tmpfiles.d/
+
+%if %{with journal_remote}
+%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf
%exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf
+%endif
%{_libexecdir}/environment.d/
@@ -981,12 +956,12 @@
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
%dir %{_sysconfdir}/X11/xorg.conf.d
-%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/system.d
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%dir %{_sysconfdir}/systemd/user
+%if %{with networkd}
%dir %{_sysconfdir}/systemd/network
+%endif
%dir %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/xdg/systemd/user
%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
@@ -1001,27 +976,33 @@
%if %{with resolved}
%config(noreplace) %{_sysconfdir}/systemd/resolved.conf
%endif
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
+
+%dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/system.d
+%dir %{_datadir}/dbus-1/services
+%dir %{_datadir}/dbus-1/system-services
+
+%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%if %{with machined}
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
%endif
%if %{with networkd}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%endif
%if %{with resolved}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%endif
%if %{with importd}
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
%endif
-# Some files created by us.
+# Some files created at runtime.
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%ghost %config(noreplace) %{_sysconfdir}/locale.conf
@@ -1032,31 +1013,13 @@
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
-%{_prefix}/lib/systemd/system/org.freedesktop.systemd1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.locale1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.login1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.hostname1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.timedate1.busname
-%if %{with networkd}
-%{_prefix}/lib/systemd/system/org.freedesktop.network1.busname
-%endif
-%if %{with resolved}
-%{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname
-%endif
-%if %{with machined}
-%{_prefix}/lib/systemd/system/org.freedesktop.machine1.busname
-%endif
-%if %{with importd}
-%{_prefix}/lib/systemd/system/org.freedesktop.import1.busname
-%endif
-
%{_datadir}/systemd
%{_datadir}/factory
+
+%if %{with journal_remote}
%exclude %{_datadir}/systemd/gatewayd
+%endif
-%dir %{_datadir}/dbus-1
-%dir %{_datadir}/dbus-1/services
-%dir %{_datadir}/dbus-1/system-services
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
@@ -1206,7 +1169,9 @@
%{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket
%dir %{_prefix}/lib/systemd/network
%{_prefix}/lib/systemd/network/*.link
+%if %{with networkd}
%{_prefix}/lib/systemd/network/*.network
+%endif
%{_datadir}/pkgconfig/udev.pc
%files -n libsystemd0%{?mini}
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.jIOzSe/_old 2018-02-13 10:24:53.978830011 +0100
+++ /var/tmp/diff_new_pack.jIOzSe/_new 2018-02-13 10:24:53.982829867 +0100
@@ -67,6 +67,10 @@
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libqrencode)
+BuildRequires: pkgconfig(libselinux) >= 2.1.9
+%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
+BuildRequires: pkgconfig(libseccomp) >= 2.3.1
+%endif
%endif
BuildRequires: fdupes
BuildRequires: gperf
@@ -74,8 +78,8 @@
BuildRequires: libacl-devel
BuildRequires: libcap-devel
BuildRequires: libmount-devel >= 2.27.1
-BuildRequires: libsepol-devel
-BuildRequires: libtool
+BuildRequires: m4
+BuildRequires: meson >= 0.43
BuildRequires: pam-devel
# regenerate_initrd_post macro is expanded during build, hence this
# BR. Also this macro was introduced since version 12.4.
@@ -85,8 +89,6 @@
BuildRequires: pkgconfig(libkmod) >= 15
BuildRequires: pkgconfig(libpci) >= 3
BuildRequires: pkgconfig(libpcre)
-BuildRequires: pkgconfig(libselinux) >= 2.1.9
-BuildRequires: pkgconfig(libsepol)
%if %{with importd}
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libcurl)
@@ -96,9 +98,6 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33
%endif
-%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x
-BuildRequires: pkgconfig(libseccomp) >= 2.3.1
-%endif
%if %{with gnuefi}
BuildRequires: gnu-efi
%endif
@@ -142,11 +141,9 @@
Source2: systemd-user
Source3: systemd-sysv-convert
Source6: baselibs.conf
-Source7: libgcrypt.m4
Source11: after-local.service
Source12: systemd-sysv-install
Source14: kbd-model-map.legacy
-Source15: suse-disable-tmpfs-for-tmp.service
Source100: scripts-systemd-fix-machines-btrfs-subvol.sh
Source101: scripts-systemd-upgrade-from-pre-210.sh
@@ -161,8 +158,6 @@
# patches are temporary and should be removed as soon as a fix is
# merged by upstream.
-# Empty
-
%description
Systemd is a system and service manager, compatible with SysV and LSB
init scripts for Linux. systemd provides aggressive parallelization
@@ -408,62 +403,52 @@
%setup -q -n systemd-%{version}
# %autopatch -p1
-# only needed for bootstrap
-%if 0%{?bootstrap}
-cp %{SOURCE7} m4/
-%endif
-
%build
-./autogen.sh
-
# keep split-usr until all packages have moved their systemd rules to /usr
-%configure \
- --docdir=%{_docdir}/systemd \
- --with-pamlibdir=/%{_lib}/security \
- --with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
- --with-dbussessionservicedir=%{_datadir}/dbus-1/services \
- --with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \
- --with-certificate-root=%{_sysconfdir}/pki/systemd \
+%meson \
+ -Ddocdir=%{_docdir}/systemd \
+ -Drootprefix=/usr \
+ -Dsplit-usr=true \
+ -Dpamlibdir=/%{_lib}/security \
+ -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \
+ -Dcertificate-root=%{_sysconfdir}/pki/systemd \
+ -Ddefault-hierarchy=hybrid \
+ -Ddefault-kill-user-processes=false \
+ -Drc-local=/etc/init.d/boot.local \
+ -Dhalt-local=/etc/init.d/halt.local \
+ -Ddebug-shell=/bin/bash \
+ -Dseccomp=auto \
+ -Dselinux=auto \
+ -Dapparmor=auto \
+ -Dsmack=false \
+ -Dima=false \
%if 0%{?bootstrap}
- --disable-myhostname \
- --disable-manpages \
+ -Dman=false \
+ -Dhtml=false \
+ -Dmyhostname=false \
%endif
- --enable-selinux \
- --enable-split-usr \
- --disable-static \
- --disable-lto \
- --disable-tests \
- --without-kill-user-processes \
- --with-default-hierarchy=hybrid \
- --with-rc-local-script-path-start=/etc/init.d/boot.local \
- --with-rc-local-script-path-stop=/etc/init.d/halt.local \
- --with-debug-shell=/bin/bash \
- --disable-smack \
- --disable-ima \
- --disable-adm-group \
- --disable-wheel-group \
- --disable-ldconfig \
- --disable-gshadow \
%if %{without networkd}
- --disable-networkd \
+ -Dnetworkd=false \
+%endif
+%if %{without resolved}
+ -Dresolve=false \
%endif
%if %{without machined}
- --disable-machined \
+ -Dmachined=false \
%endif
%if %{without sysvcompat}
- --with-sysvinit-path= \
- --with-sysvrcnd-path= \
+ -Dsysvinit-path= \
+ -Dsysvrcnd-path= \
%endif
-%if %{without resolved}
- --disable-resolved \
-%endif
- --disable-kdbus
+ -Dadm-group=false \
+ -Dwheel-group=false \
+ -Dgshadow=false \
+ -Dldconfig=false
-%make_build V=e
+%meson_build
%install
-%make_install
-find %{buildroot} -type f -name '*.la' -delete
+%meson_install
# move to %{_lib}
%if ! 0%{?bootstrap}
@@ -479,13 +464,12 @@
ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl
ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd
-install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
-
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated
install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert
install -m0755 -D %{S:12}
%{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
+install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs
# Package the scripts used to fix all packaging issues. Also drop the
# "scripts-{systemd/udev}" prefix which is used because osc doesn't
@@ -512,10 +496,11 @@
# customized for openSUSE distros.
install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/
-# Install the service which will disable/mask tmpfs for /tmp (if
-# needed) on first boot.
-install -m0644 -D %{S:15}
%{buildroot}/%{_prefix}/lib/systemd/system/suse-disable-tmpfs-for-tmp.service
-ln -s ../suse-disable-tmpfs-for-tmp.service
%{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/
+# Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs
+# by default on SUSE distros. We still keep a copy in /var for those
+# who want to switch to tmpfs: it's still can be copied in /etc.
+rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount
+mv %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount
%{buildroot}/%{_datadir}/systemd/
# don't enable wall ask password service, it spams every console (bnc#747783)
rm
%{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path
@@ -527,10 +512,6 @@
sg
EOF
-# Remove .so file for the shared library, it's not supposed to be
-# used.
-rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so
-
# do not ship sysctl defaults in systemd package, will be part of
# aaa_base (in procps for now)
rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf
@@ -651,13 +632,10 @@
# so keep the section even if it's empty.
%pre
if [ $1 -gt 1 ] ; then
- # Check if tmp.mount has been restored by either the admin or
- # was added at package installation. In both cases do nothing
- # and prevent the service to be executed during %post for the
- # former case.
- if test -e %{_unitdir}/tmp.mount; then
- touch %{_unitdir}/.disable-tmpfs-for-tmp~done
- fi
+ case "$(systemctl show -pFragmentPath tmp.mount)" in
+ FragmentPath=/usr/lib/systemd/system/tmp.mount)
+ ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || :
+ esac
fi
%post
@@ -732,13 +710,6 @@
# tmpfiles_create macro previously however it's empty so there
# shouldn't be any issues.
%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || :
-
- # Should we mask tmpfs ? If tmp.mount was already installed in
- # /usr/lib then this is a nop as sysadmin restored the unit
- # most likely to use tmpfs (see %pre) otherwise mask the mount
- # unit unless it's overriden by a tmp.mount unit installed
- # either by sysadmin or fstab-generator.
- systemctl start suse-disable-tmpfs-for-tmp.service || :
fi
%postun
@@ -900,14 +871,16 @@
%dir %{_prefix}/lib/systemd
%dir %{_prefix}/lib/systemd/user
%dir %{_prefix}/lib/systemd/system
+%if %{with journal_remote}
+%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
+%exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.*
+%exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.*
%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd
%exclude %{_prefix}/lib/systemd/systemd-journal-remote
%exclude %{_prefix}/lib/systemd/systemd-journal-upload
+%endif
%exclude %{_prefix}/lib/systemd/systemd-sysv*
%exclude %{_prefix}/lib/systemd/systemd-udevd
-%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.*
-%exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.*
-%exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.*
%exclude %{_prefix}/lib/systemd/system/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.*
%exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service
@@ -961,11 +934,13 @@
%{_libexecdir}/modules-load.d/sg.conf
%{_libexecdir}/sysusers.d/
-%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf
-
%dir %{_sysconfdir}/tmpfiles.d
%{_libexecdir}/tmpfiles.d/
+
+%if %{with journal_remote}
+%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf
%exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf
+%endif
%{_libexecdir}/environment.d/
@@ -979,12 +954,12 @@
%dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d
%dir %{_sysconfdir}/X11/xorg.conf.d
-%dir %{_sysconfdir}/dbus-1
-%dir %{_sysconfdir}/dbus-1/system.d
%dir %{_sysconfdir}/systemd
%dir %{_sysconfdir}/systemd/system
%dir %{_sysconfdir}/systemd/user
+%if %{with networkd}
%dir %{_sysconfdir}/systemd/network
+%endif
%dir %{_sysconfdir}/xdg/systemd
%{_sysconfdir}/xdg/systemd/user
%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
@@ -999,27 +974,33 @@
%if %{with resolved}
%config(noreplace) %{_sysconfdir}/systemd/resolved.conf
%endif
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
+
+%dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/system.d
+%dir %{_datadir}/dbus-1/services
+%dir %{_datadir}/dbus-1/system-services
+
+%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%if %{with machined}
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
%endif
%if %{with networkd}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%endif
%if %{with resolved}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%endif
%if %{with importd}
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
%endif
-# Some files created by us.
+# Some files created at runtime.
%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%ghost %config(noreplace) %{_sysconfdir}/locale.conf
@@ -1030,31 +1011,13 @@
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target
%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target
-%{_prefix}/lib/systemd/system/org.freedesktop.systemd1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.locale1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.login1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.hostname1.busname
-%{_prefix}/lib/systemd/system/org.freedesktop.timedate1.busname
-%if %{with networkd}
-%{_prefix}/lib/systemd/system/org.freedesktop.network1.busname
-%endif
-%if %{with resolved}
-%{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname
-%endif
-%if %{with machined}
-%{_prefix}/lib/systemd/system/org.freedesktop.machine1.busname
-%endif
-%if %{with importd}
-%{_prefix}/lib/systemd/system/org.freedesktop.import1.busname
-%endif
-
%{_datadir}/systemd
%{_datadir}/factory
+
+%if %{with journal_remote}
%exclude %{_datadir}/systemd/gatewayd
+%endif
-%dir %{_datadir}/dbus-1
-%dir %{_datadir}/dbus-1/services
-%dir %{_datadir}/dbus-1/system-services
%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
@@ -1204,7 +1167,9 @@
%{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket
%dir %{_prefix}/lib/systemd/network
%{_prefix}/lib/systemd/network/*.link
+%if %{with networkd}
%{_prefix}/lib/systemd/network/*.network
+%endif
%{_datadir}/pkgconfig/udev.pc
%files -n libsystemd0%{?mini}
++++++ systemd-234.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-234/meson.build new/systemd-234/meson.build
--- old/systemd-234/meson.build 2018-02-02 09:54:37.000000000 +0100
+++ new/systemd-234/meson.build 2018-02-07 14:26:15.000000000 +0100
@@ -102,13 +102,17 @@
catalogdir = join_paths(prefixdir, 'lib/systemd/catalog')
kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d')
factorydir = join_paths(datadir, 'factory')
-docdir = join_paths(datadir, 'doc/systemd')
bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi')
testsdir = join_paths(prefixdir, 'lib/systemd/tests')
systemdstatedir = join_paths(localstatedir, 'lib/systemd')
catalogstatedir = join_paths(systemdstatedir, 'catalog')
randomseeddir = join_paths(localstatedir, 'lib/systemd')
+docdir = get_option('docdir')
+if docdir == ''
+ docdir = join_paths(datadir, 'doc/systemd')
+endif
+
dbuspolicydir = get_option('dbuspolicydir')
if dbuspolicydir == ''
dbuspolicydir = join_paths(datadir, 'dbus-1/system.d')
@@ -414,7 +418,8 @@
endforeach
foreach ident : [
- ['memfd_create', '''#include <sys/memfd.h>'''],
+ ['memfd_create', '''#define _GNU_SOURCE
+ #include <sys/mman.h>'''],
['gettid', '''#include <sys/types.h>'''],
['pivot_root', '''#include <stdlib.h>'''], # no known
header declares pivot_root
['name_to_handle_at', '''#define _GNU_SOURCE
@@ -427,7 +432,8 @@
['kcmp', '''#include <linux/kcmp.h>'''],
['keyctl', '''#include <sys/types.h>
#include <keyutils.h>'''],
- ['copy_file_range', '''#include <sys/syscall.h>
+ ['copy_file_range', '''#define _GNU_SOURCE
+ #include <sys/syscall.h>
#include <unistd.h>'''],
['explicit_bzero' , '''#include <string.h>'''],
]
@@ -1558,6 +1564,14 @@
install_rpath : rootlibexecdir,
install : true,
install_dir : systemgeneratordir)
+
+ executable('systemd-insserv-generator',
+ 'src/insserv-generator/insserv-generator.c',
+ include_directories : includes,
+ link_with : [libshared],
+ install_rpath : rootlibexecdir,
+ install : true,
+ install_dir : systemgeneratordir)
endif
if conf.get('ENABLE_HOSTNAMED', false)
@@ -2189,18 +2203,17 @@
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
-endif
-exe = executable('networkctl',
- networkctl_sources,
- include_directories : includes,
- link_with : [libsystemd_network,
+ exe = executable('networkctl',
+ networkctl_sources,
+ include_directories : includes,
+ link_with : [libsystemd_network,
libshared],
- install_rpath : rootlibexecdir,
- install : true,
- install_dir : rootbindir)
-public_programs += [exe]
-
+ install_rpath : rootlibexecdir,
+ install : true,
+ install_dir : rootbindir)
+ public_programs += [exe]
+endif
############################################################
foreach tuple : tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-234/meson_options.txt
new/systemd-234/meson_options.txt
--- old/systemd-234/meson_options.txt 2018-02-02 09:54:37.000000000 +0100
+++ new/systemd-234/meson_options.txt 2018-02-07 14:26:15.000000000 +0100
@@ -117,6 +117,8 @@
description : 'directory for PAM modules')
option('pamconfdir', type : 'string',
description : 'directory for PAM configuration ["no" disables]')
+option('docdir', type : 'string',
+ description : 'documentation directory')
option('fallback-hostname', type : 'string', value : 'localhost',
description : 'the hostname used if none configured')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-234/src/basic/fileio.c
new/systemd-234/src/basic/fileio.c
--- old/systemd-234/src/basic/fileio.c 2018-02-02 09:54:37.000000000 +0100
+++ new/systemd-234/src/basic/fileio.c 2018-02-07 14:26:15.000000000 +0100
@@ -24,6 +24,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/mman.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-234/src/udev/compat/meson.build
new/systemd-234/src/udev/compat/meson.build
--- old/systemd-234/src/udev/compat/meson.build 1970-01-01 01:00:00.000000000
+0100
+++ new/systemd-234/src/udev/compat/meson.build 2018-02-07 14:26:15.000000000
+0100
@@ -0,0 +1,11 @@
+foreach prog : ['path_id_compat.c']
+
+ executable(prog.split('.')[0],
+ prog,
+ include_directories : includes,
+ c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
+ link_with : [libudev_internal],
+ install_rpath : udev_rpath,
+ install : true,
+ install_dir : udevlibexecdir)
+endforeach
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-234/src/udev/meson.build
new/systemd-234/src/udev/meson.build
--- old/systemd-234/src/udev/meson.build 2018-02-02 09:54:37.000000000
+0100
+++ new/systemd-234/src/udev/meson.build 2018-02-07 14:26:15.000000000
+0100
@@ -151,3 +151,5 @@
meson.add_install_script('sh', '-c',
mkdir_p.format(join_paths(sysconfdir,
'udev/rules.d')))
+
+subdir('compat')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/systemd-234/units/meson.build
new/systemd-234/units/meson.build
--- old/systemd-234/units/meson.build 2018-02-02 09:54:37.000000000 +0100
+++ new/systemd-234/units/meson.build 2018-02-07 14:26:15.000000000 +0100
@@ -101,6 +101,8 @@
['timers.target', ''],
['umount.target', ''],
['user.slice', ''],
+ ['var-run.mount', 'HAVE_SYSV_COMPAT',
'local-fs.target.wants/'],
+ ['var-lock.mount', 'HAVE_SYSV_COMPAT',
'local-fs.target.wants/'],
['var-lib-machines.mount', 'ENABLE_MACHINED',
'remote-fs.target.wants/ machines.target.wants/'],
]
