Move armhf package translation to --compat
This commit is contained in:
12
installJRMC
12
installJRMC
@@ -788,13 +788,7 @@ translate_packages() {
|
|||||||
recommends_arr=("${recommends_arr[@]//)/}")
|
recommends_arr=("${recommends_arr[@]//)/}")
|
||||||
|
|
||||||
# Translate package names
|
# Translate package names
|
||||||
debug "BUILD_TARGET: $BUILD_TARGET"
|
|
||||||
|
|
||||||
case $BUILD_TARGET in
|
case $BUILD_TARGET in
|
||||||
raspbian)
|
|
||||||
requires_arr=("${requires_arr[@]/libasound2/libasound2t64}")
|
|
||||||
requires_arr=("${requires_arr[@]/libgtk-3-0/libgtk-3-0t64}")
|
|
||||||
;;
|
|
||||||
fedora|centos)
|
fedora|centos)
|
||||||
requires_arr=("${requires_arr[@]/libc6/glibc}")
|
requires_arr=("${requires_arr[@]/libc6/glibc}")
|
||||||
requires_arr=("${requires_arr[@]/libasound2/alsa-lib}")
|
requires_arr=("${requires_arr[@]/libasound2/alsa-lib}")
|
||||||
@@ -1141,6 +1135,12 @@ install_mc_deb() {
|
|||||||
execute sed -i 's/libva2/libva1/g' control
|
execute sed -i 's/libva2/libva1/g' control
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# TODO workaround for 32-bit raspbian
|
||||||
|
if [[ $ID == "raspbian" && $MC_ARCH == "armhf" ]]; then
|
||||||
|
execute sed -i 's/libasound2/libasound2t64/g' control
|
||||||
|
execute sed -i 's/libgtk-3-0/libgtk-3-0t64/g' control
|
||||||
|
fi
|
||||||
|
|
||||||
execute tar -cJf "control.tar.xz" "control" "postinst"
|
execute tar -cJf "control.tar.xz" "control" "postinst"
|
||||||
declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}"
|
declare -g MC_DEB="${MC_DEB/.deb/.compat.deb}"
|
||||||
execute ar rcs "$MC_DEB" "debian-binary" "control.tar.xz" "data.tar.xz"
|
execute ar rcs "$MC_DEB" "debian-binary" "control.tar.xz" "data.tar.xz"
|
||||||
|
|||||||
Reference in New Issue
Block a user