mbox

systemd: Allow RPATH.

Message ID 1481820949-27395-1-git-send-email-stefan.schantl@ipfire.org
State Accepted
Headers

Message

Stefan Schantl Dec. 16, 2016, 3:55 a.m. UTC 
  The systemd tool now requires an rpath for libsystemd-shared
library to run properly.

Fixes #11272.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 systemd/systemd.nm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

Comments

Michael Tremer Dec. 16, 2016, 9:39 p.m. UTC | #1 
Hi,

I had to remove some whitespace issues. Please pay more attention to those next
time...

On Thu, 2016-12-15 at 17:55 +0100, Stefan Schantl wrote:
> The systemd tool now requires an rpath for libsystemd-shared
> library to run properly.
> 
> Fixes #11272.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
>  systemd/systemd.nm | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/systemd/systemd.nm b/systemd/systemd.nm
> index 074440e..e761bd5 100644
> --- a/systemd/systemd.nm
> +++ b/systemd/systemd.nm
> @@ -5,7 +5,7 @@
>  
>  name       = systemd
>  version    = 232
> -release    = 1
> +release    = 2
>  
>  maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
>  groups     = System/Base
> @@ -23,6 +23,11 @@ source_dl  = https://github.com/%{name}/%{name}/archive/v%{
> version}.tar.gz#/
>  build
>  	unitdir = %{prefix}/lib/systemd/system
>  
> +	# The tools which are shipped by systemd requires an rpath to
> +	# the libsystemd-shared binary to run properly. So the macro for
> +	# removing any rpath's have to be disabled.
> +	MACRO_FIX_LIBTOOL = #Do nothing.
> +

Here.

>  	requires
>  		# Testsuite
>  		/usr/bin/getfacl
> @@ -199,6 +204,13 @@ create_groups
>  	getent group systemd-journal >/dev/null || /usr/sbin/groupadd -r
> systemd-journal
>  end
>  
> +quality-agent
> +	whitelist_rpath
> +		%{prefix}/lib/systemd
> +	end
> +end
> +
> +

And here...

>  packages
>  	package %{name}
>  		groups += Base