From: hayao <shun819.mail@gmail.com>
Date: Thu, 30 Apr 2020 01:31:06 +0000 (+0900)
Subject: [update] : Passed architecture settings to mkalteriso.
X-Git-Tag: beta3-alpha3~83^2~40
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aafe1502a762773c20d5c10f115eaf7f262d50f4;p=alterlinux%2Falterlinux.git

[update] : Passed architecture settings to mkalteriso.
---

diff --git a/build.sh b/build.sh
index ee3f6741..7f21ca8c 100755
--- a/build.sh
+++ b/build.sh
@@ -539,24 +539,24 @@ make_pacman_conf() {
 
 # Base installation, plus needed packages (airootfs)
 make_basefs() {
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
+    arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
     # ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "bash haveged intel-ucode amd-ucode mkinitcpio-nfs-utils nbd efitools" install
+    arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "bash haveged intel-ucode amd-ucode mkinitcpio-nfs-utils nbd efitools" install
 
     # Install plymouth.
     if [[ "${boot_splash}" = true ]]; then
         if [[ -n "${theme_pkg}" ]]; then
-            ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "plymouth ${theme_pkg}" install
+            arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "plymouth ${theme_pkg}" install
         else
-            ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "plymouth" install
+            arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "plymouth" install
         fi
     fi
 
     # Install kernel.
     if [[ ! "${kernel}" = "core" ]]; then
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "linux-${kernel} linux-${kernel}-headers broadcom-wl-dkms" install
+        arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "linux-${kernel} linux-${kernel}-headers broadcom-wl-dkms" install
     else
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "linux linux-headers broadcom-wl" install
+        arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "linux linux-headers broadcom-wl" install
     fi
 }
 
@@ -688,7 +688,7 @@ make_packages() {
     done
 
     # Install packages on airootfs
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "${pkglist[@]}" install
+    arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "${pkglist[@]}" install
 }
 
 # Customize installation (airootfs)
@@ -778,29 +778,29 @@ make_customize_airootfs() {
 
     # Execute customize_airootfs.sh.
     if [[ -z ${addition_options} ]]; then
-        ${mkalteriso} ${mkalteriso_option} \
+        arch=${arch} ${mkalteriso} ${mkalteriso_option} \
             -w "${work_dir}/${arch}" \
             -C "${work_dir}/pacman.conf" \
             -D "${install_dir}" \
             -r "/root/customize_airootfs.sh ${share_options}" \
             run
         if [[ -f "${work_dir}/${arch}/airootfs/root/customize_airootfs_${channel_name}.sh" ]]; then
-            ${mkalteriso} ${mkalteriso_option} \
-            -w "${work_dir}/${arch}" \
-            -C "${work_dir}/pacman.conf" \
-            -D "${install_dir}" \
-            -r "/root/customize_airootfs_${channel_name}.sh ${share_options}" \
-            run
+            arch=${arch} ${mkalteriso} ${mkalteriso_option} \
+                -w "${work_dir}/${arch}" \
+                -C "${work_dir}/pacman.conf" \
+                -D "${install_dir}" \
+                -r "/root/customize_airootfs_${channel_name}.sh ${share_options}" \
+                run
         elif [[ -f "${work_dir}/${arch}/airootfs/root/customize_airootfs_$(echo ${channel_name} | sed 's/\.[^\.]*$//').sh" ]]; then
-            ${mkalteriso} ${mkalteriso_option} \
-            -w "${work_dir}/${arch}" \
-            -C "${work_dir}/pacman.conf" \
-            -D "${install_dir}" \
-            -r "/root/customize_airootfs_$(echo ${channel_name} | sed 's/\.[^\.]*$//').sh ${share_options}" \
-            run
+            arch=${arch} ${mkalteriso} ${mkalteriso_option} \
+                -w "${work_dir}/${arch}" \
+                -C "${work_dir}/pacman.conf" \
+                -D "${install_dir}" \
+                -r "/root/customize_airootfs_$(echo ${channel_name} | sed 's/\.[^\.]*$//').sh ${share_options}" \
+                run
         fi
     else
-        ${mkalteriso} ${mkalteriso_option} \
+        arch=${arch} ${mkalteriso} ${mkalteriso_option} \
             -w "${work_dir}/${arch}" \
             -C "${work_dir}/pacman.conf" \
             -D "${install_dir}" \
@@ -808,19 +808,19 @@ make_customize_airootfs() {
             run
 
         if [[ -f "${work_dir}/${arch}/airootfs/root/customize_airootfs_${channel_name}.sh" ]]; then
-            ${mkalteriso} ${mkalteriso_option} \
-            -w "${work_dir}/${arch}" \
-            -C "${work_dir}/pacman.conf" \
-            -D "${install_dir}" \
-            -r "/root/customize_airootfs_${channel_name}.sh ${share_options} ${addition_options}" \
-            run
+            arch=${arch} ${mkalteriso} ${mkalteriso_option} \
+                -w "${work_dir}/${arch}" \
+                -C "${work_dir}/pacman.conf" \
+                -D "${install_dir}" \
+                -r "/root/customize_airootfs_${channel_name}.sh ${share_options} ${addition_options}" \
+                run
         elif [[ -f "${work_dir}/${arch}/airootfs/root/customize_airootfs_$(echo ${channel_name} | sed 's/\.[^\.]*$//').sh" ]]; then
-            ${mkalteriso} ${mkalteriso_option} \
-            -w "${work_dir}/${arch}" \
-            -C "${work_dir}/pacman.conf" \
-            -D "${install_dir}" \
-            -r "/root/customize_airootfs_$(echo ${channel_name} | sed 's/\.[^\.]*$//').sh ${share_options} ${addition_options}" \
-            run
+            arch=${arch} ${mkalteriso} ${mkalteriso_option} \
+                -w "${work_dir}/${arch}" \
+                -C "${work_dir}/pacman.conf" \
+                -D "${install_dir}" \
+                -r "/root/customize_airootfs_$(echo ${channel_name} | sed 's/\.[^\.]*$//').sh ${share_options} ${addition_options}" \
+                run
         fi
     fi
 
@@ -854,9 +854,9 @@ make_setup_mkinitcpio() {
     fi
 
     if [[ ! ${kernel} = "core" ]]; then
-        ARCHISO_GNUPG_FD=${gpg_key:+17} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-${kernel} -g /boot/archiso.img" run
+        ARCHISO_GNUPG_FD=${gpg_key:+17} arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-${kernel} -g /boot/archiso.img" run
     else
-        ARCHISO_GNUPG_FD=${gpg_key:+17} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run
+        ARCHISO_GNUPG_FD=${gpg_key:+17} arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run
     fi
 
     if [[ "${gpg_key}" ]]; then
@@ -1021,9 +1021,9 @@ make_efiboot() {
 # Build airootfs filesystem image
 make_prepare() {
     cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" pkglist
+    arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" pkglist
     pacman -Q --sysroot "${work_dir}/airootfs" > "${work_dir}/packages-full.list"
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} -c "${sfs_comp}" -t "${sfs_comp_opt}" prepare
+    arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} -c "${sfs_comp}" -t "${sfs_comp_opt}" prepare
     remove "${work_dir}/airootfs"
 
     if [[ "${cleaning}" = true ]]; then
@@ -1033,7 +1033,7 @@ make_prepare() {
 
 # Build ISO
 make_iso() {
-    ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_filename}"
+    arch=${arch} ${mkalteriso} ${mkalteriso_option} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_filename}"
 
     if [[ ${cleaning} = true ]]; then
         remove "$(ls ${work_dir}/* | grep "build.make")"