From e6f0ffc18909d0a3f960a16542eb9012518525e1 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 10 Dec 2012 12:06:19 -0300 Subject: [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 --- configs/releng/build.sh | 12 ++---------- 1 file 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) \ -- cgit v1.2.3-70-g09d2