Skip to content

Commit e4cf0ea

Browse files
ericonrthe-maldridge
authored andcommitted
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.
1 parent 464eb6e commit e4cf0ea

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

data/void-vpkgs.conf

Lines changed: 0 additions & 9 deletions
This file was deleted.

mklive.sh.in

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ copy_void_keys() {
9595
cp keys/*.plist "$1"/var/db/xbps/keys
9696
}
9797

98-
copy_void_conf() {
99-
install -Dm644 data/void-vpkgs.conf "$1"/usr/share/xbps.d/void-virtualpkgs.conf
100-
}
101-
10298
copy_dracut_files() {
10399
mkdir -p "$1"/usr/lib/dracut/modules.d/01vmklive
104100
cp dracut/vmklive/* "$1"/usr/lib/dracut/modules.d/01vmklive/
@@ -110,15 +106,12 @@ copy_autoinstaller_files() {
110106
}
111107

112108
install_prereqs() {
113-
copy_void_conf "$VOIDHOSTDIR"
114109
XBPS_ARCH=$ARCH "$XBPS_INSTALL_CMD" -r "$VOIDHOSTDIR" ${XBPS_REPOSITORY} \
115110
-c "$XBPS_HOST_CACHEDIR" -y $REQUIRED_PKGS
116111
[ $? -ne 0 ] && die "Failed to install required software, exiting..."
117112
}
118113

119114
install_packages() {
120-
copy_void_conf "$ROOTFS"
121-
122115
XBPS_ARCH=$BASE_ARCH "${XBPS_INSTALL_CMD}" -r "$ROOTFS" \
123116
${XBPS_REPOSITORY} -c "$XBPS_CACHEDIR" -yn $PACKAGE_LIST $INITRAMFS_PKGS
124117
[ $? -ne 0 ] && die "Missing required binary packages, exiting..."

0 commit comments

Comments
 (0)