jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

os-prober: fix the way scripts are installed for different archs

Browse source 
The old way simply installed stuff for all as if they were x86,
the new way follows what the Debian scripts do.

Closes: #12045 [via git-merge-pr]
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
q66 2019-05-31 02:06:03 +02:00 committed by Jürgen Buchmüller
parent 0a4108a9cf
commit ef869c8f35
No known key found for this signature in database
GPG key ID: DE55AD8DBEBB4EE8
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
srcpkgs/os-prober/template
View file

@ -1,7 +1,7 @@
# Template file for 'os-prober'
pkgname=os-prober
version=1.77
revision=1
revision=2
build_style=gnu-makefile
make_dirs="/var/lib/os-prober 0755 root root"
short_desc="Utility to detect other OSes on a set of drives"
@ -11,6 +11,12 @@ homepage="https://packages.debian.org/sid/os-prober"
distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz"
checksum=8d8ea4afbe1aeef3c8b73f74a0fb37b06185e21a6abc78f80fc2160009cf705f
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) _ARCH="x86";;
ppc*) _ARCH="powerpc";;
*) ;;
esac
do_install() {
vbin linux-boot-prober
vbin os-prober
@ -20,7 +26,9 @@ do_install() {
for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
vmkdir usr/lib/${dir}
install -m755 -t ${DESTDIR}/usr/lib/${dir} ${dir}/common/*
[ -d ${dir}/x86 ] && cp -r ${dir}/x86/* ${DESTDIR}/usr/lib/${dir}
[ -n "$_ARCH" -a -d ${dir}/${_ARCH} ] && cp -r ${dir}/${_ARCH}/* ${DESTDIR}/usr/lib/${dir}
done
vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted
if [ -n "$_ARCH" -a "$_ARCH" = "x86" ]; then
vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted
fi
}