rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build when %_bindir==%_sbindir

Browse Source 
Preparation for https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin.

Also remove duplicate listing in %files.

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-04-17 13:41:17 +02:00
parent 3e8a581288
commit 434cc479bc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grub2.spec
View File

@ -287,8 +287,9 @@ ln -s ../grub2-systemd-integration.service \
%global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post} %global dip RPM_BUILD_ROOT=%{finddebugroot} %{__debug_install_post}
%define __debug_install_post ( \ %define __debug_install_post ( \
mkdir -p %{finddebugroot}/usr \ mkdir -p %{finddebugroot}/usr \
mv ${RPM_BUILD_ROOT}/usr/bin %{finddebugroot}/usr/bin \ mv %{buildroot}/usr/bin %{finddebugroot}/usr/bin \
mv ${RPM_BUILD_ROOT}/usr/sbin %{finddebugroot}/usr/sbin \ [ "%{_sbindir}" != "%{_bindir}" ] && \\\
mv %{buildroot}/usr/sbin %{finddebugroot}/usr/sbin \
%{dip} \ %{dip} \
install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/ \ install -m 0755 -d %{buildroot}/usr/lib/ %{buildroot}/usr/src/ \
cp -al %{finddebugroot}/usr/lib/debug/ \\\ cp -al %{finddebugroot}/usr/lib/debug/ \\\
@ -296,6 +297,7 @@ ln -s ../grub2-systemd-integration.service \
cp -al %{finddebugroot}/usr/src/debug/ \\\ cp -al %{finddebugroot}/usr/src/debug/ \\\
%{buildroot}/usr/src/debug/ ) \ %{buildroot}/usr/src/debug/ ) \
mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin \ mv %{finddebugroot}/usr/bin %{buildroot}/usr/bin \
[ "%{_sbindir}" != "%{_bindir}" ] && \\\
mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin \ mv %{finddebugroot}/usr/sbin %{buildroot}/usr/sbin \
%{nil} %{nil}
@ -482,7 +484,6 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%exclude %{_datadir}/man/man1/grub2-render-label* %exclude %{_datadir}/man/man1/grub2-render-label*
%if %{with_legacy_arch} %if %{with_legacy_arch}
%{_sbindir}/grub2-install
%ifarch x86_64 %ifarch x86_64
%{_sbindir}/grub2-bios-setup %{_sbindir}/grub2-bios-setup
%else %else