]> git.pld-linux.org Git - packages/ceph.git/blob - ceph-python.patch
- updated to 10.2.11 (for now, WIP on newer ones)
[packages/ceph.git] / ceph-python.patch
1 --- ceph-10.2.11/src/ceph-detect-init/Makefile.am.orig  2018-07-09 18:23:56.000000000 +0200
2 +++ ceph-10.2.11/src/ceph-detect-init/Makefile.am       2020-05-23 15:54:24.161595205 +0200
3 @@ -67,15 +67,9 @@
4  ceph-detect-init-install-data:
5         cd $(srcdir)/ceph-detect-init ; \
6         if test "$(DESTDIR)" ; then \
7 -               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
8 -                       options=--install-layout=deb ; \
9 -               else \
10                         options=--prefix=/usr ; \
11 -               fi ; \
12                 root="--root=$(DESTDIR)" ; \
13         fi ; \
14 -       python setup.py install $$root $$options
15 +       $(PYTHON) setup.py install $$root $$options --optimize=2
16  
17 -LOCAL_ALL += ceph-detect-init-all
18 -LOCAL_CLEAN += ceph-detect-init-clean
19  LOCAL_INSTALLDATA += ceph-detect-init-install-data
20 --- ceph-10.2.11/src/ceph-disk/Makefile.am.orig 2018-07-09 18:23:56.000000000 +0200
21 +++ ceph-10.2.11/src/ceph-disk/Makefile.am      2020-05-23 15:55:36.397870535 +0200
22 @@ -32,7 +32,7 @@
23  
24  export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv
25  
26 -ceph-disk-all: ${CEPH_DISK_VIRTUALENV}
27 +ceph-disk-init-all: ${CEPH_DISK_VIRTUALENV}
28  
29  ${CEPH_DISK_VIRTUALENV}:
30         cd $(srcdir)/ceph-disk ; ../tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} ; test -d wheelhouse && export NO_INDEX=--no-index ; ${CEPH_DISK_VIRTUALENV}/bin/pip install $$NO_INDEX --find-links=file://$$(pwd)/wheelhouse -e .
31 @@ -43,15 +43,10 @@
32  ceph-disk-install-data:
33         cd $(srcdir)/ceph-disk ; \
34         if test "$(DESTDIR)" ; then \
35 -               if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
36 -                       options=--install-layout=deb ; \
37 -               else \
38                         options=--prefix=/usr ; \
39 -               fi ; \
40                 root="--root=$(DESTDIR) --install-script=/usr/sbin" ; \
41         fi ; \
42 -       python setup.py install $$root $$options
43 +       $(PYTHON) setup.py install $$root $$options --optimize=2
44  
45 -LOCAL_ALL += ceph-disk-all
46  LOCAL_CLEAN += ceph-disk-clean
47  LOCAL_INSTALLDATA += ceph-disk-install-data
This page took 0.076502 seconds and 3 git commands to generate.