From 8763000a53ea61b47a2996dcf574acd0f7db7646 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 03:35:44 -0500 Subject: [PATCH] script/makepkg: port options cpio need not be verbose --- script/makepkg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/makepkg b/script/makepkg index a5f8eb9..0332723 100755 --- a/script/makepkg +++ b/script/makepkg @@ -55,7 +55,7 @@ chprepare() { # Copy in cached configuration, if necessary [ -f "${conf_dir}/make.conf" ] && cp -p "${conf_dir}/make.conf" "${chroot_dir}/etc/make.conf" - [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -iv ) < "${conf_dir}/port_options.cpio" + [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -i ) < "${conf_dir}/port_options.cpio" # If you have WITHOUT_INFO set in src.conf during buildworld/installworld, ports that need # makeinfo and install-info will fail horribly; stub them @@ -303,13 +303,13 @@ port_rmconfig_all() { port_load_config() { [ -f "${conf_dir}/port_options.cpio" ] || return 0 meh "port load-config" - cheval "cd /var/db/ports; cpio -iv" < "${conf_dir}/port_options.cpio" + cheval "cd /var/db/ports; cpio -i" < "${conf_dir}/port_options.cpio" } # Dump port build options to cpio port_save_config() { meh "port save-config" - cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -ovHnewc" > "${conf_dir}/port_options.cpio.tmp" || wtf "port save-config failed" + cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -oHnewc" > "${conf_dir}/port_options.cpio.tmp" || wtf "port save-config failed" mv -f "${conf_dir}/port_options.cpio.tmp" "${conf_dir}/port_options.cpio" || wtf "port save-config atomic commit failed" } -- 2.42.0