Skip to content

Commit 31df80c

Browse files
renatoaguiarJuan RP
authored andcommitted
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.
1 parent d2969a7 commit 31df80c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

mkplatformfs.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ tar xf "$BASE_TARBALL" -C "$ROOTFS"
160160
# $PKGS. After this step we will do an xbps-reconfigure -f $PKGS
161161
# under the correct architecture to ensure the system is setup
162162
# correctly.
163-
run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $PKGS"
163+
run_cmd_target "xbps-install -SU $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $PKGS"
164164

165165
# Now that the packages are installed, we need to chroot in and
166166
# reconfigure. This needs to be done as the right architecture.

mkrootfs.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ mount_pseudofs
146146
# system package into the rootfs. This will not produce a
147147
# bootable system but will instead produce a base component that can
148148
# be quickly expanded to perform other actions on.
149-
run_cmd_target "xbps-install -S $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $SYSPKG"
149+
run_cmd_target "xbps-install -SU $XBPS_CONFFILE $XBPS_CACHEDIR $XBPS_REPOSITORY -r $ROOTFS -y $SYSPKG"
150150

151151
# Enable en_US.UTF-8 locale and generate it into the target ROOTFS.
152152
# This is a bit of a hack since some glibc stuff doesn't really work

0 commit comments

Comments
 (0)