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

Don't install vboxvideo on x86 as a workaround for rpm 4 segfaulting

Browse Source
This commit is contained in:
Silvan Calarco 2019-08-04 13:29:36 +02:00
parent 0a029f67a7
commit 49871dd73d
6 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makedist.inc.sh
View File

@ -18,7 +18,7 @@ libcap libaudit libselinux libsepol libpcre libcap-ng libattr libstdc++6 libpam"
# pam initscripts # pam initscripts
chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20 chroot $MOUNTDIR /usr/sbin/update-alternatives --install /bin/sh sh /bin/bash 20
[ -e $TARGETDIR/platforms/$PLATFORM/pre.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh [ -e $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh ] && . $TARGETDIR/platforms/$PLATFORM/pre-packages.inc.sh
[ "$LANGUAGE" ] && { [ "$LANGUAGE" ] && {

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

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

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

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

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

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

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

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

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

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