openmamba/makedist-openmamba
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove vboxguest and vboxvideo dkms installation as they are now provided in kernel

Browse Source
This commit is contained in:
Silvan Calarco 2020-07-24 17:35:57 +02:00
parent 891c321c0f
commit eca1d659ab
10 changed files with 56 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platforms/livecd-gnome-root/Makefile.defs
View File

@ -1,7 +1,3 @@
packagekitgui = gnome-packagekit packagekitgui = gnome-packagekit
firewallgui = gui-ufw firewallgui = gui-ufw
ifeq ($(ARCH),x86_64)
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
else
xorgdrvvideo += xorg-drv-video-vboxvideo xorgdrvvideo += xorg-drv-video-vboxvideo
endif

23
platforms/livecd-gnome-root/post.inc.sh
View File

@ -18,18 +18,19 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt
# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
clean_rpm_database clean_rpm_database
# pre-create video drivers for VirtualBox ## pre-create video drivers for VirtualBox
virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` #virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do #for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done #done
chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts #chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
#
#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# # remove kernel headers installed by dkms
# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
#done
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms
chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do
case "$f" in case "$f" in

4
platforms/livecd-light-root/Makefile.defs
View File

@ -1,7 +1,3 @@
packagekitgui = gnome-packagekit packagekitgui = gnome-packagekit
firewallgui = gui-ufw firewallgui = gui-ufw
ifeq ($(ARCH),x86_64)
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
else
xorgdrvvideo += xorg-drv-video-vboxvideo xorgdrvvideo += xorg-drv-video-vboxvideo
endif

23
platforms/livecd-light-root/post.inc.sh
View File

@ -11,18 +11,19 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt
# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
clean_rpm_database clean_rpm_database
# pre-create video drivers for VirtualBox ## pre-create video drivers for VirtualBox
virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` #virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do #for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done #done
chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts #chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
#
#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# # remove kernel headers installed by dkms
# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
#done
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms
chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do
case "$f" in case "$f" in

4
platforms/livecd-root/Makefile.defs
View File

@ -1,6 +1,2 @@
networkmanagergui = plasma-nm networkmanagergui = plasma-nm
ifeq ($(ARCH),x86_64)
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
else
xorgdrvvideo += xorg-drv-video-vboxvideo xorgdrvvideo += xorg-drv-video-vboxvideo
endif

23
platforms/livecd-root/post.inc.sh
View File

@ -16,18 +16,19 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt
# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
clean_rpm_database clean_rpm_database
# pre-create video drivers for VirtualBox ## pre-create video drivers for VirtualBox
virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` #virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do #for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done #done
chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts #chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
#
#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# # remove kernel headers installed by dkms
# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
#done
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms
chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do
case "$f" in case "$f" in

4
platforms/livedvd-root/Makefile.defs
View File

@ -1,6 +1,2 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-applet-networkmanagement
ifeq ($(ARCH),x86_64)
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
else
xorgdrvvideo += xorg-drv-video-vboxvideo xorgdrvvideo += xorg-drv-video-vboxvideo
endif

15
platforms/livedvd-root/post.inc.sh
View File

@ -16,13 +16,14 @@ chroot $MOUNTDIR chown liveuser /home/liveuser/Desktop/openmamba-installer.deskt
# error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
clean_rpm_database clean_rpm_database
virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` #virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do #for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do # for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do
# pre-create video drivers for VirtualBox # # pre-create video drivers for VirtualBox
chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done # done
done #done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img*; do for f in $MOUNTDIR/boot/initramfs-*.img*; do
case "$f" in case "$f" in

4
platforms/testcd-root/Makefile.defs
View File

@ -1,6 +1,2 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-applet-networkmanagement
ifeq ($(ARCH),x86_64)
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
else
xorgdrvvideo += xorg-drv-video-vboxvideo xorgdrvvideo += xorg-drv-video-vboxvideo
endif

23
platforms/testcd-root/post.inc.sh
View File

@ -6,18 +6,19 @@ chroot $MOUNTDIR update-alternatives-set-dri
# chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
#done #done
# pre-create video drivers for VirtualBox ## pre-create video drivers for VirtualBox
virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"` #virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do #for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force # chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done #done
chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts #chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
#
#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# # remove kernel headers installed by dkms
# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
#done
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
# remove kernel headers installed by dkms
chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
done
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
for f in $MOUNTDIR/boot/initramfs-*.img* do for f in $MOUNTDIR/boot/initramfs-*.img* do
case "$f" in case "$f" in