pool/os-prober
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 829927 from home:dimstar:Factory

Browse Source 
- Install os-prober files to %{_prefix}/lib: os-prober and all its
  subscripts have /usr/lib hardcoded, so changing the location on
  the fly is no good idea (boo#1175815).

OBS-URL: https://build.opensuse.org/request/show/829927
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=100
This commit is contained in:
Michael Chang 2020-08-27 10:17:05 +00:00 committed by Git OBS Bridge
parent ce7b65b98c
commit 8723245e45
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os-prober.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 27 08:39:13 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Install os-prober files to %{_prefix}/lib: os-prober and all its
subscripts have /usr/lib hardcoded, so changing the location on
the fly is no good idea (boo#1175815).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 13 08:12:58 UTC 2019 - Michael Chang <mchang@suse.com> Tue Aug 13 08:12:58 UTC 2019 - Michael Chang <mchang@suse.com>

20
os-prober.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package os-prober # spec file for package os-prober
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Release: 0
Summary: Probes disks on the system for installed operating systems Summary: Probes disks on the system for installed operating systems
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Boot Group: System/Boot
Url: https://salsa.debian.org/installer-team/os-prober URL: https://salsa.debian.org/installer-team/os-prober
Source0: https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2 Source0: https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2
Source1: COPYING-note.txt Source1: COPYING-note.txt
# move newns binary outside of os-prober subdirectory, so that debuginfo # move newns binary outside of os-prober subdirectory, so that debuginfo
@ -134,7 +134,7 @@ install -m 0755 -d %{buildroot}%{_bindir}
install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name} install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name}
install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir} install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir}
install -m 0755 -Dp newns %{buildroot}%{_libexecdir}/newns install -m 0755 -Dp newns %{buildroot}%{_prefix}/lib/newns
install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh
%ifarch m68k %ifarch m68k
@ -152,24 +152,24 @@ ARCH=x86
for probes in os-probes os-probes/mounted os-probes/init \ for probes in os-probes os-probes/mounted os-probes/init \
linux-boot-probes linux-boot-probes/mounted; do linux-boot-probes linux-boot-probes/mounted; do
install -m 755 -d %{buildroot}%{_libexecdir}/$probes install -m 755 -d %{buildroot}%{_prefix}/lib/$probes
cp -a $probes/common/* %{buildroot}%{_libexecdir}/$probes cp -a $probes/common/* %{buildroot}%{_prefix}/lib/$probes
if [ -e "$probes/$ARCH" ]; then if [ -e "$probes/$ARCH" ]; then
cp -a $probes/$ARCH/* %{buildroot}%{_libexecdir}/$probes cp -a $probes/$ARCH/* %{buildroot}%{_prefix}/lib/$probes
fi fi
done done
if [ "$ARCH" = x86 ]; then if [ "$ARCH" = x86 ]; then
install -m 755 -p os-probes/mounted/powerpc/20macosx \ install -m 755 -p os-probes/mounted/powerpc/20macosx \
%{buildroot}%{_libexecdir}/os-probes/mounted %{buildroot}%{_prefix}/lib/os-probes/mounted
fi fi
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README TODO debian/copyright debian/changelog COPYING-note.txt %doc README TODO debian/copyright debian/changelog COPYING-note.txt
%{_bindir}/* %{_bindir}/*
%{_libexecdir}/linux-boot-probes %{_prefix}/lib/linux-boot-probes
%{_libexecdir}/newns %{_prefix}/lib/newns
%{_libexecdir}/os-probes %{_prefix}/lib/os-probes
%{_datadir}/%{name} %{_datadir}/%{name}
%{_localstatedir}/lib/%{name} %{_localstatedir}/lib/%{name}