abuild: drop special linguas variable

This commit is contained in:
Sertonix 2024-06-13 22:16:41 +02:00 committed by Natanael Copa
parent 18340ddd42
commit bf66ab6312

View File

@ -596,7 +596,7 @@ subpkg_set() {
subpkgarch=${_splitarch#*:} subpkgarch=${_splitarch#*:}
if [ "$subpkgarch" = "$_splitarch" -o -z "$subpkgarch" ]; then if [ "$subpkgarch" = "$_splitarch" -o -z "$subpkgarch" ]; then
case "$subpkgname" in case "$subpkgname" in
*-doc | *-openrc | *-lang | *-lang-* | *sh-completion | *-pyc) subpkgarch="noarch" ;; *-doc | *-openrc | *-lang | *sh-completion | *-pyc) subpkgarch="noarch" ;;
*) subpkgarch="$pkgarch" ;; *) subpkgarch="$pkgarch" ;;
esac esac
fi fi
@ -965,34 +965,6 @@ lang() {
default_lang default_lang
} }
default_lang_subpkg() {
if [ -z "$lang" ]; then
error "lang is not set"
return 1
fi
pkgdesc="$pkgname language pack for $lang"
install_if="$pkgname=$pkgver-r$pkgrel lang-$lang"
local dir
for dir in ${langdir:-/usr/share/locale}; do
amove "$dir/$lang*"
done
}
lang_subpkg() {
default_lang_subpkg
}
prepare_language_packs() {
local lang
for lang in $linguas; do
lang="$lang" \
subpkgname="$pkgname-lang-$lang" \
subpkgdir="$pkgbasedir"/$subpkgname \
"$abuild_path" $forceroot lang_subpkg prepare_package || return 1
done
}
# echo '-dirty' if git is not clean # echo '-dirty' if git is not clean
git_dirty() { git_dirty() {
[ $($git status -s -- "$startdir" | wc -l) -ne 0 ] && echo "-dirty" [ $($git status -s -- "$startdir" | wc -l) -ne 0 ] && echo "-dirty"
@ -2223,7 +2195,6 @@ rootpkg() {
set_source_date \ set_source_date \
package \ package \
prepare_subpackages \ prepare_subpackages \
prepare_language_packs \
prepare_package \ prepare_package \
create_apks create_apks
} }
@ -2954,9 +2925,6 @@ if [ -n "$subpkgname" ]; then
subpackages= subpackages=
else else
allpackages="$pkgname $subpackages" allpackages="$pkgname $subpackages"
for i in $linguas; do
allpackages="$allpackages $pkgname-lang-$i::noarch"
done
fi fi
apkbuild_arch="$arch" apkbuild_arch="$arch"
pkgdir="$pkgbasedir/$pkgname" pkgdir="$pkgbasedir/$pkgname"