Changes - SailfishOS Open Build Service

Changes of Revision 9

[-] [+]	Changed	_service:tar_git:nfs-utils.spec
@@ -16,6 +16,7 @@ URL: http://linux-nfs.org/ Source0: %{name}-%{version}.tar.bz2 Source100: nfs-utils.yaml +Patch0: systemd-Makefile.am.patch Requires: rpcbind Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -62,20 +63,19 @@ %{summary}. # >> macros2 -# 4.x has a macro defined, 3.4 needs /usr/lib/systemd, lower needs /lib/systemd +# 4.x has a macro defined, 3.4 uses /usr/lib/systemd, lower uses /lib/systemd +%if %{sailfishos_version} <= 30400 %if %{undefined _systemdgeneratordir} -%if %{sailfishos_version} == 30400 %define _systemdgeneratordir %{_unitdir}/../system-generators %endif -%if %{sailfishos_version} < 30400 -%define _systemdgeneratordir /lib/systemd/system-generators -%endif %endif # << macros2 %prep %setup -q -n %{name}-%{version}/upstream +# systemd-Makefile.am.patch +%patch0 -p1 # >> setup # << setup
[-] [+]	Added	_service:tar_git:systemd-Makefile.am.patch ^
@@ -0,0 +1,31 @@ +diff --git a/systemd/Makefile.am b/systemd/Makefile.am +index 650ad25c..e7f5d818 100644 +--- a/systemd/Makefile.am ++++ b/systemd/Makefile.am +@@ -12,7 +12,9 @@ unit_files = \ + rpc-statd-notify.service \ + rpc-statd.service \ + \ +- proc-fs-nfsd.mount \ ++ proc-fs-nfsd.mount ++ ++rpc_pipefs_mount_file = \ + var-lib-nfs-rpc_pipefs.mount + + if CONFIG_NFSV4 +@@ -51,8 +53,7 @@ man5_MANS = nfs.conf.man + man7_MANS = nfs.systemd.man + EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS) + +-unit_dir = /usr/lib/systemd/system +-generator_dir = /usr/lib/systemd/system-generators ++generator_dir = $(unitdir)/../system-generators + + EXTRA_PROGRAMS = nfs-server-generator rpc-pipefs-generator + genexecdir = $(generator_dir) +@@ -75,4 +76,5 @@ genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator + install-data-hook: $(unit_files) + mkdir -p $(DESTDIR)/$(unitdir) + cp $(unit_files) $(DESTDIR)/$(unitdir) ++ cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount) + endif
[-] [+]	Changed	_service:tar_git:nfs-utils.yaml ^
@@ -21,6 +21,9 @@ Help: https://wiki.linux-nfs.org/wiki/index.php/Nfsv4_configuration Bugtracker: https://bugzilla.linux-nfs.org %endif +Patches: + # from 2.5.5_rcX: do not hardcode systemd paths: + - systemd-Makefile.am.patch SetupOptions: -q -n %{name}-%{version}/upstream ConfigOptions: - '--with-gnu-ld'