data, mklive.sh.in: remove void-vpkgs.conf

Most of these aren't in void-packages anymore, the awk dependency
resolution is done via base-* packages, and the openssl entry was making
a XBPS bug apparent after the OpenSSL switch, where 'xbps-remove -o'
tries to remove the 'openssl' package.
This commit is contained in:
Érico Rolim 2021-03-08 14:58:32 -03:00 committed by Michael Aldridge
parent 464eb6edfa
commit e4cf0ea630
2 changed files with 0 additions and 16 deletions

View File

@ -1,9 +0,0 @@
# Default void configuration
#
virtualpkg=awk:gawk
virtualpkg=cron-daemon:dcron
virtualpkg=editor:nvi
virtualpkg=man:openbsd-man
virtualpkg=ntp-daemon:openntpd
virtualpkg=shell:dash
virtualpkg=smtp-server:opensmtpd

View File

@ -95,10 +95,6 @@ copy_void_keys() {
cp keys/*.plist "$1"/var/db/xbps/keys
}
copy_void_conf() {
install -Dm644 data/void-vpkgs.conf "$1"/usr/share/xbps.d/void-virtualpkgs.conf
}
copy_dracut_files() {
mkdir -p "$1"/usr/lib/dracut/modules.d/01vmklive
cp dracut/vmklive/* "$1"/usr/lib/dracut/modules.d/01vmklive/
@ -110,15 +106,12 @@ copy_autoinstaller_files() {
}
install_prereqs() {
copy_void_conf "$VOIDHOSTDIR"
XBPS_ARCH=$ARCH "$XBPS_INSTALL_CMD" -r "$VOIDHOSTDIR" ${XBPS_REPOSITORY} \
-c "$XBPS_HOST_CACHEDIR" -y $REQUIRED_PKGS
[ $? -ne 0 ] && die "Failed to install required software, exiting..."
}
install_packages() {
copy_void_conf "$ROOTFS"
XBPS_ARCH=$BASE_ARCH "${XBPS_INSTALL_CMD}" -r "$ROOTFS" \
${XBPS_REPOSITORY} -c "$XBPS_CACHEDIR" -yn $PACKAGE_LIST $INITRAMFS_PKGS
[ $? -ne 0 ] && die "Missing required binary packages, exiting..."