Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[configs/releng] Always use x86_64 as primary source for dual-iso

Browse Source 
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>
This commit is contained in:
Gerardo Exequiel Pozzi 2012-12-10 12:06:19 -03:00
parent 9de7abfc19
commit e6f0ffc189
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configs/releng/build.sh
View File

@ -219,17 +219,9 @@ make_dual() {
echo "ERROR: i686 or x86_64 builds does not exist." echo "ERROR: i686 or x86_64 builds does not exist."
_usage 1 _usage 1
fi 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 mkdir -p ${work_dir}/dual/iso
cp -a -l -f ${_src_one} ${work_dir}/dual cp -a -l -f ${work_dir}/x86_64/iso ${work_dir}/dual
cp -a -l -n ${_src_two} ${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}/aitab
rm -f ${work_dir}/dual/iso/${install_dir}/boot/syslinux/*.cfg rm -f ${work_dir}/dual/iso/${install_dir}/boot/syslinux/*.cfg
paste -d"\n" <(sed "s|%ARCH%|i686|g" ${script_path}/aitab) \ paste -d"\n" <(sed "s|%ARCH%|i686|g" ${script_path}/aitab) \