]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: remove build directory in %clean, not %install 45698/head
authorTim Serong <tserong@suse.com>
Wed, 30 Mar 2022 05:25:30 +0000 (16:25 +1100)
committerTim Serong <tserong@suse.com>
Tue, 24 May 2022 11:59:03 +0000 (21:59 +1000)
Removing the build directory at the end of %install is too soon,
and means we get rid of a bunch of stuff needed to correctly
create debuginfo/debugsource packages, which happens automatically
right after %install.  So, let's put it where it really belongs, in
the %clean section.

Fixes: aa18cb12003e3526c8e8f23dc2335a483fbfa68e
Fixes: https://tracker.ceph.com/issues/55079
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 94ad178bdcbae56a8eafc65a3a276e25d7a51a5e)

ceph.spec.in

index eacf8de67531d7a51ceb8d5fe8a8c81f9a4c40f2..418b3f30e8f7ac56e8af9949611f83b1bcdebe37 100644 (file)
@@ -1431,13 +1431,12 @@ install -m 644 -D monitoring/ceph-mixin/prometheus_alerts.yml %{buildroot}/etc/p
 %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
 %endif
 
+%clean
+rm -rf %{buildroot}
 # built binaries are no longer necessary at this point,
 # but are consuming ~17GB of disk in the build environment
 rm -rf build
 
-%clean
-rm -rf %{buildroot}
-
 #################################################################################
 # files and systemd scriptlets
 #################################################################################