diff --git a/common/shlibs b/common/shlibs index be28dfa0d4..8ea234405a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -953,3 +953,7 @@ libbind9.so.80 bind-libs bind-devel libisccfg.so.82 bind-libs bind-devel libisc.so.83 bind-libs bind-devel libisccc.so.80 bind-libs bind-devel +libsystemd-daemon.so.0 systemd-libs systemd-devel +libsystemd-id128.so.0 systemd-libs systemd-devel +libsystemd-journal.so.0 systemd-libs systemd-devel +libsystemd-login.so.0 systemd-libs systemd-devel diff --git a/srcpkgs/systemd-libs b/srcpkgs/systemd-libs new file mode 120000 index 0000000000..1514658181 --- /dev/null +++ b/srcpkgs/systemd-libs @@ -0,0 +1 @@ +systemd \ No newline at end of file diff --git a/srcpkgs/systemd/depends b/srcpkgs/systemd/depends new file mode 100644 index 0000000000..28f368156e --- /dev/null +++ b/srcpkgs/systemd/depends @@ -0,0 +1,2 @@ +abi_depends=">=43" +api_depends="${abi_depends}" diff --git a/srcpkgs/systemd/systemd-devel.template b/srcpkgs/systemd/systemd-devel.template index 891bed610b..26be3c5d8f 100644 --- a/srcpkgs/systemd/systemd-devel.template +++ b/srcpkgs/systemd/systemd-devel.template @@ -5,10 +5,11 @@ long_desc="${long_desc} This package contains development files and/or documentation." +revision=1 noarch=yes +Add_dependency run systemd-libs -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/man/man3 usr/share/man diff --git a/srcpkgs/systemd/systemd-libs.rshlibs b/srcpkgs/systemd/systemd-libs.rshlibs new file mode 100644 index 0000000000..600fb803af --- /dev/null +++ b/srcpkgs/systemd/systemd-libs.rshlibs @@ -0,0 +1,6 @@ +libdl.so.2 +librt.so.1 +libc.so.6 +libcap.so.2 +ld-linux-x86-64.so.2 +liblzma.so.5 diff --git a/srcpkgs/systemd/systemd-libs.template b/srcpkgs/systemd/systemd-libs.template new file mode 100644 index 0000000000..a0382f4fe0 --- /dev/null +++ b/srcpkgs/systemd/systemd-libs.template @@ -0,0 +1,12 @@ +# Template file for 'systemd-libs'. +# +short_desc="${sourcepkg} - runtime libraries" +long_desc="${long_desc} + + This package contains the runtime libraries." + +replaces="systemd<43_1" + +do_install() { + vmove "usr/lib/*.so*" usr/lib +} diff --git a/srcpkgs/systemd/systemd.rshlibs b/srcpkgs/systemd/systemd.rshlibs index 2b45e41830..8e7500604e 100644 --- a/srcpkgs/systemd/systemd.rshlibs +++ b/srcpkgs/systemd/systemd.rshlibs @@ -12,3 +12,7 @@ libpam_misc.so.0 ld-linux-x86-64.so.2 liblzma.so.5 libkmod.so.2 +libsystemd-daemon.so.0 +libsystemd-journal.so.0 +libsystemd-login.so.0 +libsystemd-id128.so.0 diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 7778ea238a..fef610728c 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,6 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=43 +revision=1 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--with-distro=other --with-rootprefix= @@ -20,7 +21,9 @@ long_desc=" implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit." -subpackages="systemd-admin systemd-analyze systemd-gnome-passwd-agent systemd-devel" +subpackages="systemd-admin systemd-analyze systemd-gnome-passwd-agent" +subpackages="${subpackages} systemd-devel systemd-libs" + system_groups="lock" conf_files="