From: Don Slutz Date: Sun, 9 Aug 2020 18:22:34 +0000 (-0400) Subject: rpmball: Adjust to new rpm, do not require --force X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1772 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=438c5ffa44e99cceb574c0f9946aacacdedd2952;p=xen.git 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 Acked-by: Wei Liu --- 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