summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-12-10 12:06:19 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2012-12-10 12:09:21 -0300
commite6f0ffc18909d0a3f960a16542eb9012518525e1 (patch)
treee93470d0ce478fd833d810a7557104dfb82cc205
parent9de7abfc19616aa9ac5e8f51ac51f765296ebeef (diff)
downloadarchiso32-e6f0ffc18909d0a3f960a16542eb9012518525e1.tar.xz
[configs/releng] Always use x86_64 as primary source for dual-iso
Simplify code path. Previously in "dual" mode is executed when arch=i686, i686 was used as primary source. This does not change current behaviour of building "dual" on x86_64. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rwxr-xr-xconfigs/releng/build.sh12
1 files changed, 2 insertions, 10 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 8b08d4f..ca73e89 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -219,17 +219,9 @@ make_dual() {
echo "ERROR: i686 or x86_64 builds does not exist."
_usage 1
fi
- local _src_one _src_two _cfg
- if [[ ${arch} == "i686" ]]; then
- _src_one=${work_dir}/i686/iso
- _src_two=${work_dir}/x86_64/iso
- else
- _src_one=${work_dir}/x86_64/iso
- _src_two=${work_dir}/i686/iso
- fi
mkdir -p ${work_dir}/dual/iso
- cp -a -l -f ${_src_one} ${work_dir}/dual
- cp -a -l -n ${_src_two} ${work_dir}/dual
+ cp -a -l -f ${work_dir}/x86_64/iso ${work_dir}/dual
+ cp -a -l -n ${work_dir}/i686/iso ${work_dir}/dual
rm -f ${work_dir}/dual/iso/${install_dir}/aitab
rm -f ${work_dir}/dual/iso/${install_dir}/boot/syslinux/*.cfg
paste -d"\n" <(sed "s|%ARCH%|i686|g" ${script_path}/aitab) \