root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-pkg] cleaning

Browse source
This commit is contained in:
udeved 2016-06-08 10:48:15 +02:00
parent 46fc504a7b
commit 71e4c5bc89
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/util-pkg.sh
View file

@ -10,7 +10,7 @@
# GNU General Public License for more details. # GNU General Public License for more details.
preconf_arm(){ preconf_arm(){
local conf_dir=/tmp tarch="$1" desc=$2 flags=$3 local conf_dir=/tmp tarch="$1" desc="$2" flags="$3"
cp "${DATADIR}/pacman-arm.conf" "$conf_dir/pacman-$tarch.conf" cp "${DATADIR}/pacman-arm.conf" "$conf_dir/pacman-$tarch.conf"
cp "${DATADIR}/makepkg-arm.conf" "$conf_dir/makepkg-$tarch.conf" cp "${DATADIR}/makepkg-arm.conf" "$conf_dir/makepkg-$tarch.conf"
sed -i "$conf_dir/makepkg-$tarch.conf" \ sed -i "$conf_dir/makepkg-$tarch.conf" \
@ -27,10 +27,10 @@ preconf_arm(){
} }
preconf(){ preconf(){
local arch="$1" tarch="$2" local arch="$1"
work_dir="${chroots_pkg}/${target_branch}/$tarch" work_dir="${chroots_pkg}/${target_branch}/${target_arch}"
pkg_dir="${cache_dir_pkg}/${target_branch}/$tarch" pkg_dir="${cache_dir_pkg}/${target_branch}/${target_arch}"
if [[ "$arch" == 'multilib' ]];then if [[ "$pac_conf_arch" == 'multilib' ]];then
target_arch='x86_64' target_arch='x86_64'
is_multilib=true is_multilib=true
else else
@ -75,12 +75,12 @@ configure_chroot_arch(){
preconf_arm "$conf_arch" "$chost_desc" "$cflags" preconf_arm "$conf_arch" "$chost_desc" "$cflags"
;; ;;
'multilib') 'multilib')
conf_arch="multilib" conf_arch='multilib'
preconf "$conf_arch" "$1" preconf "$conf_arch"
;; ;;
*) *)
conf_arch='default' conf_arch='default'
preconf "$conf_arch" "$1" preconf "$conf_arch"
;; ;;
esac esac