diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-01-10 13:42:58 +0100 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-01-15 02:47:51 -0800 |
| commit | a34c406445fc0294de41a8e4706f106a83e136a0 (patch) | |
| tree | 9b05d39f5dcf008dde8316687d57bb51bd64723a | |
| parent | de2c5297ad9d26c844823bcdbfc0264d8bf7ddd7 (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.
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>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index b9d32293b8f..b273b872d2b 100644 --- a/configure.ac +++ b/configure.ac @@ -1206,7 +1206,7 @@ case $host_os in esac if test "x$BUILD_GLUPY" = "xyes"; then - BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'` + BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix='$prefix'))"` BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"` BUILD_PYTHON_LIB=python$PYTHON_VERSION GLUPY_SUBDIR=glupy diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 9a7100f88dc..692f747a4bb 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -618,21 +618,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 install -p -m 0644 contrib/uuid/*.h \ %{buildroot}%{_includedir}/glusterfs/ @@ -657,8 +648,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 @@ -1032,10 +1021,6 @@ fi %{_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. @@ -1231,6 +1216,9 @@ fi %changelog +* Sun Jan 10 2016 Niels de Vos <ndevos@redhat.com> +- build system got fixed so that special glupy build is not needed anymore + * Mon Dec 28 2015 Niels de Vos <ndevos@redhat.com> - hook scripts in glusterfs-ganesha use dbus-send, add dependency (#1294446) |