[xen staging] rpmball: Adjust to new rpm, do not require --force

[patchbot@xxxxxxx]

commit 438c5ffa44e99cceb574c0f9946aacacdedd2952
Author:     Don Slutz <Don.Slutz@xxxxxxxxx>
AuthorDate: Sun Aug 9 14:22:34 2020 -0400
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Aug 14 17:18:56 2020 +0100

    rpmball: Adjust to new rpm, do not require --force
    
    Also prevent warning: directory /boot: remove failed
    
    Before:
    
    [root@TestCloud1 xen]# rpm -hiv dist/xen*rpm
    Preparing...                          ################################# 
[100%]
            file /boot from install of xen-4.15-unstable.x86_64 conflicts with 
file from package filesystem-3.2-25.el7.x86_64
            file /usr/bin from install of xen-4.15-unstable.x86_64 conflicts 
with file from package filesystem-3.2-25.el7.x86_64
            file /usr/lib from install of xen-4.15-unstable.x86_64 conflicts 
with file from package filesystem-3.2-25.el7.x86_64
            file /usr/lib64 from install of xen-4.15-unstable.x86_64 conflicts 
with file from package filesystem-3.2-25.el7.x86_64
            file /usr/sbin from install of xen-4.15-unstable.x86_64 conflicts 
with file from package filesystem-3.2-25.el7.x86_64
    [root@TestCloud1 xen]# rpm -e xen
    warning: directory /boot: remove failed: Device or resource busy
    
    After:
    
    [root@TestCloud1 xen]# rpm -hiv dist/xen*rpm
    Preparing...                          ################################# 
[100%]
    Updating / installing...
       1:xen-4.15-unstable                ################################# 
[100%]
    [root@TestCloud1 xen]# rpm -e xen
    [root@TestCloud1 xen]#
    
    Signed-off-by: Don Slutz <Don.Slutz@xxxxxxxxx>
    Acked-by: Wei Liu <wl@xxxxxxx>
---
 tools/misc/mkrpm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm
index ae40e1a4c4..68819b2d73 100644
--- a/tools/misc/mkrpm
+++ b/tools/misc/mkrpm
@@ -62,7 +62,8 @@ rm -rf \$RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/*
+/*/*/*
+/boot/*
 
 %post
 EOF
--
generated by git-patchbot for /home/xen/git/xen.git#staging