summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2014-10-13 15:29:10 -0700
committerJoshua Harlow <harlowja@yahoo-inc.com>2014-10-13 15:29:10 -0700
commit1897fc80874b6a01282bee1512170268e365dc83 (patch)
treef2412d6354f1620caa5d0825e04410a0a4418f76 /packages
parent797de394e5395f39b7f17403999e25cbe7f7a126 (diff)
downloadvyos-cloud-init-1897fc80874b6a01282bee1512170268e365dc83.tar.gz
vyos-cloud-init-1897fc80874b6a01282bee1512170268e365dc83.zip
Fix the rpm building (currently broken)
Diffstat (limited to 'packages')
-rw-r--r--packages/redhat/cloud-init.spec.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
index 0e9862d8..05458271 100644
--- a/packages/redhat/cloud-init.spec.in
+++ b/packages/redhat/cloud-init.spec.in
@@ -81,7 +81,7 @@ ssh keys and to let the user run various scripts.
%{__python} setup.py build
%install
-rm -rf \$RPM_BUILD_ROOT
+
%{__python} setup.py install -O1 \
--skip-build --root \$RPM_BUILD_ROOT \
--init-system=${init_sys}
@@ -92,6 +92,9 @@ mkdir -p \$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d
cp -p tools/21-cloudinit.conf \
\$RPM_BUILD_ROOT/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
+rm -rf \$RPM_BUILD_ROOT%{python_sitelib}/tests
+mkdir -p \$RPM_BUILD_ROOT/var/lib/cloud
+
%clean
rm -rf \$RPM_BUILD_ROOT
@@ -169,7 +172,7 @@ fi
/usr/lib/%{name}/write-ssh-key-fingerprints
# Docs
-%doc TODO LICENSE ChangeLog requirements.txt
+%doc LICENSE ChangeLog requirements.txt
%doc %{_defaultdocdir}/cloud-init/*
# Configs
@@ -180,7 +183,7 @@ fi
%dir %{_sysconfdir}/cloud/templates
%config(noreplace) %{_sysconfdir}/cloud/templates/*
%config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
-%config(noreplace) %{_sysconfdir}/sudoers.d/cloud-init
+%dir /var/lib/cloud
# Python code is here...
%{python_sitelib}/*