@@ -14,7 +14,7 @@ version:
14
14
pyc :
15
15
find srv/ -name ' *.py' -exec python -m py_compile {} \;
16
16
# deepsea-cli
17
- sed -i " s/DEVVERSION/" $(VERSION ) " /" setup.py
17
+ sed " s/DEVVERSION/" $(VERSION ) " /" setup.py.in > setup.py
18
18
python setup.py build
19
19
20
20
copy-files :
@@ -634,7 +634,6 @@ copy-files:
634
634
-chown salt:salt $(DESTDIR)/srv/salt/ceph/configuration/files/ceph.conf.checksum || true
635
635
636
636
install : copy-files
637
- sed -i " s/DEVVERSION/" $(VERSION ) " /" setup.py
638
637
sed -i ' /^sharedsecret: /s!{{ shared_secret }}!' ` cat /proc/sys/kernel/random/uuid` ' !' $(DESTDIR ) /etc/salt/master.d/sharedsecret.conf
639
638
chown salt:salt $(DESTDIR ) /etc/salt/master.d/*
640
639
echo " deepsea_minions: '*'" > /srv/pillar/ceph/deepsea_minions.sls
@@ -645,6 +644,7 @@ install: copy-files
645
644
systemctl restart salt-api
646
645
# deepsea-cli
647
646
zypper -n install python-setuptools python-click
647
+ sed " s/DEVVERSION/" $(VERSION ) " /" setup.py.in > setup.py
648
648
python setup.py install --root=$(DESTDIR ) /
649
649
650
650
rpm : tarball test
@@ -656,7 +656,7 @@ tarball:
656
656
$(eval TEMPDIR := $(shell mktemp -d) )
657
657
mkdir $(TEMPDIR ) /deepsea-$(VERSION )
658
658
git archive HEAD | tar -x -C $(TEMPDIR ) /deepsea-$(VERSION )
659
- sed -i " s/DEVVERSION/" $(VERSION ) " /" $(TEMPDIR ) /deepsea-$(VERSION ) /setup.py
659
+ sed " s/DEVVERSION/" $(VERSION ) " /" $( TEMPDIR ) /deepsea- $( VERSION ) /setup.py.in $(TEMPDIR ) /deepsea-$(VERSION ) /setup.py
660
660
sed -i " s/DEVVERSION/" $(VERSION ) " /" $(TEMPDIR ) /deepsea-$(VERSION ) /deepsea.spec
661
661
sed -i " s/DEVVERSION/" $(VERSION ) " /" $(TEMPDIR ) /deepsea-$(VERSION ) /srv/modules/runners/deepsea.py
662
662
mkdir -p ~ /rpmbuild/SOURCES
0 commit comments