On Tue, May 30, 2023 at 01:18:07PM +0200, Olaf Hering wrote:
> Commit 438c5ffa44e99cceb574c0f9946aacacdedd2952 ("rpmball: Adjust to
> new rpm, do not require --force") attempted to handle stricter
> directory permissions in newer distributions.
>
> This introduced a few issues:
> - /boot used to be a constant prior commit
> 6475d700055fa952f7671cee982a23de2f5e4a7c ("use BOOT_DIR as xen.gz
> install location"), since this commit the location has to be
> referenced via ${BOOT_DIR}
> - it assumed the prefix and the various configurable paths match the
> glob pattern /*/*/*
>
> Adjust the code to build a filelist on demand and filter directories
> from an installed filesystem.rpm.
>
> Take the opportunity to replace the usage of $RPM_BUILD_ROOT with
> %buildroot, and use pushd/popd pairs.
>
> Fixes: 438c5ffa4 ("rpmball: Adjust to new rpm, do not require --force")
>
> Signed-off-by: Olaf Hering <[email protected]>
> ---
> tools/misc/mkrpm | 33 ++++++++++++++++++++++++---------
> 1 file changed, 24 insertions(+), 9 deletions(-)
>
> diff --git a/tools/misc/mkrpm b/tools/misc/mkrpm
> index 74f6761bb0..a7bf854197 100644
> --- a/tools/misc/mkrpm
> +++ b/tools/misc/mkrpm
> @@ -50,20 +50,35 @@ uninstall.
> %build
>
> %install
> -rm -rf \$RPM_BUILD_ROOT
> -mkdir -p \$RPM_BUILD_ROOT
> -cd %{_xenroot}
> -dist/install.sh \$RPM_BUILD_ROOT/
> +rm -rf %buildroot
> +mkdir -p %buildroot
> +pushd %_xenroot
> +dist/install.sh %buildroot
> +
> +pushd %buildroot
> +popd
Are these 2 lines left over from testing? They don't appear to do
anything useful.
Beside that, patch looks fine:
Reviewed-by: Anthony PERARD <[email protected]>
Thanks,
--
Anthony PERARD
