Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-08-29 01:45:49 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-08-29 01:45:49 -0300
commitad2385c08263b1edf640da0c9b69bda9995a582f (patch)
treeb755b78f588bde937bf2e6a6a5dbc13dfd763c2b /configs
parent14903dfc4579089288e1da82e92fb6eb6b891c66 (diff)
[archiso] Use -w <work_dir> instead of cmd <work>, add -o <out_dir>
Default (if not specified) -w work -o out. -o <out_dir> is only used by 'iso' command. Adjust build.sh of releng and baseline profile to reflect this change. <project> - work <- $work_dir - out <- $out_dir Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/baseline/build.sh11
-rwxr-xr-xconfigs/releng/build.sh21
2 files changed, 17 insertions, 15 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 24f301b..f3e8676 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -8,14 +8,15 @@ iso_version=$(date +%Y.%m.%d)
install_dir=arch
arch=$(uname -m)
work_dir=work
+out_dir=out
verbose="n"
script_path=$(readlink -f ${0%/*})
# Base installation (root-image)
make_basefs() {
- mkarchiso ${verbose} -D "${install_dir}" -p "base" create "${work_dir}"
- mkarchiso ${verbose} -D "${install_dir}" -p "syslinux" create "${work_dir}"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "base" create
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "syslinux" create
}
# Copy mkinitcpio archiso hooks (root-image)
@@ -73,13 +74,13 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs .fs.sfs .sfs)
make_prepare() {
- mkarchiso ${verbose} -D "${install_dir}" prepare "${work_dir}"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
}
# Build ISO
make_iso() {
- mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}"
- mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${iso_name}-${iso_version}-${arch}.iso"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso"
}
if [[ $verbose == "y" ]]; then
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 1f26408..7660ee9 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -8,19 +8,20 @@ iso_version=$(date +%Y.%m.%d)
install_dir=arch
arch=$(uname -m)
work_dir=work
+out_dir=out
verbose="n"
script_path=$(readlink -f ${0%/*})
# Base installation (root-image)
make_basefs() {
- mkarchiso ${verbose} -D "${install_dir}" -p "base" create "${work_dir}"
- mkarchiso ${verbose} -D "${install_dir}" -p "memtest86+ syslinux mkinitcpio-nfs-utils nbd" create "${work_dir}"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "base" create
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "memtest86+ syslinux mkinitcpio-nfs-utils nbd" create
}
# Additional packages (root-image)
make_packages() {
- mkarchiso ${verbose} -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" create "${work_dir}"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" create
}
# Customize installation (root-image)
@@ -156,15 +157,15 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs .fs.sfs .sfs)
make_prepare() {
- mkarchiso ${verbose} -D "${install_dir}" prepare "${work_dir}"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
}
# Build ISO
# args: $1 (core | netinstall)
make_iso() {
local _iso_type=${1}
- mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}"
- mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${iso_name}-${iso_version}-${_iso_type}-${arch}.iso"
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
+ mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${_iso_type}-${arch}.iso"
}
# Build dual-iso images from ${work_dir}/i686/iso and ${work_dir}/x86_64/iso
@@ -207,8 +208,8 @@ make_dual() {
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/}
done
- mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}/dual"
- mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${iso_name}-${iso_version}-${_iso_type}-dual.iso"
+ mkarchiso ${verbose} -w "${work_dir}/dual" -D "${install_dir}" checksum
+ mkarchiso ${verbose} -w "${work_dir}/dual" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${_iso_type}-dual.iso"
: > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type}
fi
}
@@ -298,11 +299,11 @@ case "${command_name}" in
;;
clean_single)
rm -rf ${work_dir}
- rm -f ${iso_name}-${iso_version}-*-${arch}.iso
+ rm -f ${out_dir}/${iso_name}-${iso_version}-*-${arch}.iso
;;
clean_dual)
rm -rf ${work_dir}/dual
- rm -f ${iso_name}-${iso_version}-*-dual.iso
+ rm -f ${out_dir}/${iso_name}-${iso_version}-*-dual.iso
;;
*)
echo "Invalid command name '${command_name}'"