From 31df80c3417dceccf823cfee7ab088337d1e521b Mon Sep 17 00:00:00 2001 From: Renato Aguiar Date: Mon, 16 Mar 2020 00:19:12 -0700 Subject: [PATCH] Postpone package configuration Instruct xbps-install to do unpack only, so packages can be properly configured by xbps-reconfigure call. Before, xbps-install was sometimes marking packages as configured, thus making xbps-reconfigure call useless. --- mkplatformfs.sh.in | 2 +- mkrootfs.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkplatformfs.sh.in b/mkplatformfs.sh.in index af98eb4..b793a3a 100644 --- a/mkplatformfs.sh.in +++ b/mkplatformfs.sh.in @@ -160,7 +160,7 @@ tar xf "$BASE_TARBALL" -C "$ROOTFS" # $PKGS. After this step we will do an xbps-reconfigure -f $PKGS # under the correct architecture to ensure the system is setup # correctly. -run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $PKGS" +run_cmd_target "xbps-install -SU $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $PKGS" # Now that the packages are installed, we need to chroot in and # reconfigure. This needs to be done as the right architecture. diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index 8353a94..ce367c2 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -146,7 +146,7 @@ mount_pseudofs # system package into the rootfs. This will not produce a # bootable system but will instead produce a base component that can # be quickly expanded to perform other actions on. -run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $SYSPKG" +run_cmd_target "xbps-install -SU $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $SYSPKG" # Enable en_US.UTF-8 locale and generate it into the target ROOTFS. # This is a bit of a hack since some glibc stuff doesn't really work