root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

buildpkg & buildiso: move mkchroot_args

Browse source
This commit is contained in:
udeved 2017-05-07 13:46:13 +02:00
parent 15cfc351e8
commit aef651518a
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -137,6 +137,8 @@ iso_only=false
verbose=false
persist=false
mkchroot_args=(-L)
usage() {
echo "Usage: ${0##*/} [options]"
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"

2
bin/buildpkg.in
View file

@ -184,6 +184,6 @@ ${pretend} && display_settings && exit
${delete_first} && delete_chroot "${work_dir}/root" "${work_dir}"
${create_first} && create_chroot "${work_dir}/root" "${packages[@]}"
${create_first} && create_chroot "${mkchroot_args[@]}" "${work_dir}/root" "${packages[@]}"
run make_pkg "${build_list_pkg}"

6
lib/util-chroot.sh
View file

@ -46,10 +46,10 @@ subvolume_delete_recursive() {
create_chroot(){
local timer=$(get_timer)
local dest="$1"
prepare_dir "$dest"
# local dest="$1"
# prepare_dir "$dest"
setarch "${target_arch}" \
mkchroot "${mkchroot_args[@]}" "$@" || abort
mkchroot "$@" || abort
show_elapsed_time "${FUNCNAME}" "${timer}"
}

17
lib/util-iso.sh
View file

@ -281,7 +281,9 @@ make_image_root() {
msg "Prepare [Base installation] (rootfs)"
local path="${work_dir}/rootfs"
create_chroot "${path}" "${packages[@]}" || die
prepare_dir "${path}"
create_chroot "${mkchroot_args[@]}" "${path}" "${packages[@]}" || die
pacman -Qr "${path}" > "${path}/rootfs-pkgs.txt"
copy_overlay "${profile_dir}/root-overlay" "${path}"
@ -301,9 +303,11 @@ make_image_desktop() {
msg "Prepare [Desktop installation] (desktopfs)"
local path="${work_dir}/desktopfs"
prepare_dir "${path}"
mount_fs_root "${path}"
create_chroot "${path}" "${packages[@]}" || die
create_chroot "${mkchroot_args[@]}" "${path}" "${packages[@]}" || die
pacman -Qr "${path}" > "${path}/desktopfs-pkgs.txt"
cp "${path}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
@ -332,9 +336,11 @@ make_image_live() {
msg "Prepare [Live installation] (livefs)"
local path="${work_dir}/livefs"
prepare_dir "${path}"
mount_fs_select "${path}"
create_chroot "${path}" "${packages[@]}" || die
create_chroot "${mkchroot_args[@]}" "${path}" "${packages[@]}" || die
pacman -Qr "${path}" > "${path}/livefs-pkgs.txt"
copy_overlay "${profile_dir}/live-overlay" "${path}"
@ -356,7 +362,8 @@ make_image_mhwd() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare [drivers repository] (mhwdfs)"
local path="${work_dir}/mhwdfs"
mkdir -p ${path}${mhwd_repo}
prepare_dir "${path}${mhwd_repo}"
mount_fs_select "${path}"
@ -385,7 +392,7 @@ make_image_boot() {
msg "Prepare [/iso/boot]"
local boot="${iso_root}/boot"
mkdir -p ${boot}
prepare_dir "${boot}"
cp ${work_dir}/rootfs/boot/vmlinuz* ${boot}/vmlinuz-${target_arch}