diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-05-14 19:19:39 +0200 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-06-27 13:15:27 -0700 |
| commit | 94b743782200b2399f2d23d4b47356e602f62777 (patch) | |
| tree | 48f6b92d783073b5d8bcd3e68e9a705d432c978d /glusterfs.spec.in | |
| parent | 2cf70079c28501fe7fcfe72c55d5efadb5cd4e3d (diff) | |
build: place glupy under $prefix while installing
Regression testing on FreeBSD fails due to this error:
--- install-pyglupyPYTHON ---
/usr/home/jenkins/root/workspace/freebsd-smoke/install-sh -c -d '/usr/local/lib/python2.7/site-packages/gluster/glupy'
mkdir: /usr/local/lib/python2.7/site-packages/gluster: Permission denied
mkdir: /usr/local/lib/python2.7/site-packages/gluster: Permission denied
*** [install-pyglupyPYTHON] Error code 1
The installation prefix is set to "/build/install" and glupy should be
placed there as well. The default to "/usr/local" is incorrect.
Cherry picked from commit a34c406445fc0294de41a8e4706f106a83e136a0:
> Change-Id: I166412a271576f2344aecec94c7835f0fe9b1cf3
> BUG: 1198849
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: http://review.gluster.org/13208
> Smoke: Gluster Build System <jenkins@build.gluster.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Change-Id: I166412a271576f2344aecec94c7835f0fe9b1cf3
BUG: 1336137
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/14338
Smoke: Gluster Build System <jenkins@build.gluster.org>
Tested-by: Aravinda VK <avishwan@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index cecc7e16b5a..20d72af72fa 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -616,21 +616,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool make %{?_smp_mflags} -# Build Glupy -pushd xlators/features/glupy/src -FLAGS="$RPM_OPT_FLAGS" python setup.py build -popd - %check make check %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -# install the Glupy Python library in /usr/lib/python*/site-packages -pushd xlators/features/glupy/src -python setup.py install --skip-build --verbose --root %{buildroot} -popd # Install include directory mkdir -p %{buildroot}%{_includedir}/glusterfs install -p -m 0644 libglusterfs/src/*.h \ @@ -667,8 +658,6 @@ mkdir -p %{buildroot}%{_localstatedir}/log/glusterd mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd mkdir -p %{buildroot}%{_localstatedir}/run/gluster -touch %{buildroot}%{python_sitelib}/gluster/__init__.py - # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -1016,10 +1005,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files %{python_sitelib}/gluster/glupy/* -# Don't expect a .egg-info file on EL5 -%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) -%{python_sitelib}/glusterfs_glupy*.egg-info -%endif %files fuse # glusterfs is a symlink to glusterfsd, -server depends on -fuse. @@ -1222,6 +1207,9 @@ exit 0 %changelog +* Sat May 14 2016 Niels de Vos <ndevos@redhat.com> +- build system got fixed so that special glupy build is not needed anymore + * Fri May 6 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com> - additional dirs and files in /var/lib/glusterd/... (#1326413) |