Commit eca1d659aba9eb5fd584567b685b0efb10617bf4

Authored by Silvan Calarco
1 parent 891c321c0f
Exists in master

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

Showing 10 changed files with 56 additions and 71 deletions Side-by-side Diff

platforms/livecd-gnome-root/Makefile.defs
1 1 packagekitgui = gnome-packagekit
2 2 firewallgui = gui-ufw
3   -ifeq ($(ARCH),x86_64)
4   -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
5   -else
6 3 xorgdrvvideo += xorg-drv-video-vboxvideo
7   -endif
platforms/livecd-gnome-root/post.inc.sh
... ... @@ -18,18 +18,19 @@
18 18 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
19 19 clean_rpm_database
20 20  
21   -# pre-create video drivers for VirtualBox
22   -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
23   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
24   - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
25   - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
26   -done
27   -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  21 +## pre-create video drivers for VirtualBox
  22 +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
  23 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  24 +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  25 +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  26 +#done
  27 +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  28 +#
  29 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  30 +# # remove kernel headers installed by dkms
  31 +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
  32 +#done
28 33  
29   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
30   - # remove kernel headers installed by dkms
31   - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
32   -done
33 34 # remove unused initramfs generated by kernel
34 35 for f in $MOUNTDIR/boot/initramfs-*.img*; do
35 36 case "$f" in
platforms/livecd-light-root/Makefile.defs
1 1 packagekitgui = gnome-packagekit
2 2 firewallgui = gui-ufw
3   -ifeq ($(ARCH),x86_64)
4   -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
5   -else
6 3 xorgdrvvideo += xorg-drv-video-vboxvideo
7   -endif
platforms/livecd-light-root/post.inc.sh
... ... @@ -11,18 +11,19 @@
11 11 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
12 12 clean_rpm_database
13 13  
14   -# pre-create video drivers for VirtualBox
15   -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
16   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
17   - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
18   - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
19   -done
20   -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  14 +## pre-create video drivers for VirtualBox
  15 +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
  16 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  17 +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  18 +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  19 +#done
  20 +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  21 +#
  22 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  23 +# # remove kernel headers installed by dkms
  24 +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
  25 +#done
21 26  
22   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
23   - # remove kernel headers installed by dkms
24   - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
25   -done
26 27 # remove unused initramfs generated by kernel
27 28 for f in $MOUNTDIR/boot/initramfs-*.img*; do
28 29 case "$f" in
platforms/livecd-root/Makefile.defs
1 1 networkmanagergui = plasma-nm
2   -ifeq ($(ARCH),x86_64)
3   -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
4   -else
5 2 xorgdrvvideo += xorg-drv-video-vboxvideo
6   -endif
platforms/livecd-root/post.inc.sh
... ... @@ -16,18 +16,19 @@
16 16 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
17 17 clean_rpm_database
18 18  
19   -# pre-create video drivers for VirtualBox
20   -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
21   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
22   - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
23   - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
24   -done
25   -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  19 +## pre-create video drivers for VirtualBox
  20 +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
  21 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  22 +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  23 +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  24 +#done
  25 +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  26 +#
  27 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  28 +# # remove kernel headers installed by dkms
  29 +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
  30 +#done
26 31  
27   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
28   - # remove kernel headers installed by dkms
29   - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
30   -done
31 32 # remove unused initramfs generated by kernel
32 33 for f in $MOUNTDIR/boot/initramfs-*.img*; do
33 34 case "$f" in
platforms/livedvd-root/Makefile.defs
1 1 networkmanagergui = plasma-applet-networkmanagement
2   -ifeq ($(ARCH),x86_64)
3   -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
4   -else
5 2 xorgdrvvideo += xorg-drv-video-vboxvideo
6   -endif
platforms/livedvd-root/post.inc.sh
... ... @@ -16,13 +16,14 @@
16 16 # error: db4 error(-30986) from dbcursor->get: DB_PAGE_NOTFOUND: Requested page not found
17 17 clean_rpm_database
18 18  
19   -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
20   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
21   - for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do
22   - # pre-create video drivers for VirtualBox
23   - chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
24   - done
25   -done
  19 +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
  20 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  21 +# for m in vboxdrv vboxguest vboxnetadp vboxnetflt vboxpci vboxvideo; do
  22 +# # pre-create video drivers for VirtualBox
  23 +# chroot $MOUNTDIR dkms install -q -m $m -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  24 +# done
  25 +#done
  26 +
26 27 # remove unused initramfs generated by kernel
27 28 for f in $MOUNTDIR/boot/initramfs-*.img*; do
28 29 case "$f" in
platforms/testcd-root/Makefile.defs
1 1 networkmanagergui = plasma-applet-networkmanagement
2   -ifeq ($(ARCH),x86_64)
3   -xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest
4   -else
5 2 xorgdrvvideo += xorg-drv-video-vboxvideo
6   -endif
platforms/testcd-root/post.inc.sh
... ... @@ -6,18 +6,19 @@
6 6 # chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
7 7 #done
8 8  
9   -# pre-create video drivers for VirtualBox
10   -virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
11   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
12   - chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
13   - chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
14   -done
15   -chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  9 +## pre-create video drivers for VirtualBox
  10 +#virtualbox_ver=`ls -d $MOUNTDIR/usr/src/vboxvideo-* | sed "s|.*-||"`
  11 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  12 +# chroot $MOUNTDIR dkms install -q -m vboxguest -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  13 +# chroot $MOUNTDIR dkms install -q -m vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
  14 +#done
  15 +#chroot $MOUNTDIR rpm -e VirtualBox-vboxguest dkms --noscripts
  16 +#
  17 +#for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
  18 +# # remove kernel headers installed by dkms
  19 +# chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
  20 +#done
16 21  
17   -for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
18   - # remove kernel headers installed by dkms
19   - chroot $MOUNTDIR dnf remove kernel-${K}-headers -y
20   -done
21 22 # remove unused initramfs generated by kernel
22 23 for f in $MOUNTDIR/boot/initramfs-*.img* do
23 24 case "$f" in