summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigs/baseline/build.sh10
-rwxr-xr-xconfigs/releng/build.sh18
2 files changed, 14 insertions, 14 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index b016b45..df105e5 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -22,7 +22,7 @@ run_once() {
# Base installation (root-image)
make_basefs() {
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" init
+ ../../parabolaiso/mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" init
}
# Copy mkinitcpio parabolaiso hooks and build initramfs (root-image)
@@ -30,7 +30,7 @@ make_setup_mkinitcpio() {
cp /usr/lib/initcpio/hooks/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/hooks
cp /usr/lib/initcpio/install/parabolaiso ${work_dir}/root-image/usr/lib/initcpio/install
cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-parabolaiso.conf
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+ ../../parabolaiso/mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
}
# Prepare ${install_dir}/boot/
@@ -64,13 +64,13 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs.sfs .sfs)
make_prepare() {
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" prepare
+ ../../parabolaiso/mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" prepare
}
# Build ISO
make_iso() {
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" checksum
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso"
+ ../../parabolaiso/mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" checksum
+ ../../parabolaiso/mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso"
}
run_once make_basefs
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index a310cfa..95b768a 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -53,13 +53,13 @@ make_pacman_conf() {
# Base installation, plus needed packages (root-image)
make_basefs() {
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install
}
# Additional packages (root-image)
make_packages() {
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install
}
# Copy mkinitcpio parabolaiso hooks and build initramfs (root-image)
@@ -72,7 +72,7 @@ make_setup_mkinitcpio() {
cp /usr/lib/initcpio/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install
cp /usr/lib/initcpio/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio
cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
}
# Customize installation (root-image)
@@ -81,7 +81,7 @@ make_customize_root_image() {
patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run
rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh
}
@@ -183,16 +183,16 @@ make_aitab() {
# Build all filesystem images specified in aitab (.fs.sfs .sfs)
make_prepare() {
cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
+ setarch ${arch} ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
rm -rf ${work_dir}/root-image
# rm -rf ${work_dir}/${arch}/root-image (if low space, this helps)
}
# Build ISO
make_iso() {
- mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
- mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
+ ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
+ ../../parabolaiso/mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
}
if [[ ${EUID} -ne 0 ]]; then