Message ID | 10c7314a9e1b89fa030d11d5ce6664e1e77179d9.1596997354.git.don.slutz@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [XEN] rpmball: Adjust to new rpm, do not require --force | expand |
On Sun, Aug 09, 2020 at 02:22:34PM -0400, Don Slutz wrote: > From: Don Slutz <Don.Slutz@Gmail.com> > > 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@Gmail.com> Acked-by: Wei Liu <wl@xen.org> Since this is only a spec file for developers, I think the risk of breaking things is minimal. > --- > tools/misc/mkrpm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm > index ae40e1a..68819b2 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 > -- > 1.8.3.1 >
diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm index ae40e1a..68819b2 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