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

live platforms: support for precreating VirtualBox guest modules

Browse Source
This commit is contained in:
Silvan Calarco 2013-09-12 10:28:28 +02:00
parent 084eb07f6f
commit f6358f1d1c
16 changed files with 68 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,2 +1,3 @@
packagekitgui = gnome-packagekit packagekitgui = gnome-packagekit
firewallgui = gui-ufw firewallgui = gui-ufw
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

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

@ -46,7 +46,17 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
# pre-create video drivers for VirtualBox
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 vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done
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 smart remove kernel-${K}-headers -y
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
# remove failsafe image to save space for livecd # remove failsafe image to save space for livecd

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

@ -1,2 +1,3 @@
packagekitgui = gnome-packagekit packagekitgui = gnome-packagekit
firewallgui = gui-ufw firewallgui = gui-ufw
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

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

@ -35,7 +35,17 @@ esac
echo $timezone > $MOUNTDIR/etc/timezone echo $timezone > $MOUNTDIR/etc/timezone
cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime cp $MOUNTDIR/usr/share/zoneinfo/$timezone $MOUNTDIR/etc/localtime
# pre-create video drivers for VirtualBox
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 vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done
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 smart remove kernel-${K}-headers -y
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
# remove failsafe image to save space for livecd # remove failsafe image to save space for livecd

11
platforms/livecd-root/Makefile
View File

@ -1,7 +1,6 @@
$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark kcalc kdf kgpg desktop-base-kde4 \ $(MAKEDIST_TARGET)-livecd-kde4: desktop-base-kde4 kmix bluedevil kwallet
ksnapshot okular desktop-base-kde4 kmix \ # smb4k juk kate dragon ksnapshot okular kppp krfb ark kcalc kdf kgpg kopete
bluedevil smb4k juk kwallet dragon kate
# kopete4
$(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress $(MAKEDIST_TARGET)-livecd-libreoffice: libreoffice-Calc libreoffice-writer libreofice-impress
$(MAKEDIST_TARGET)-livecd-root: \ $(MAKEDIST_TARGET)-livecd-root: \
@ -15,8 +14,10 @@ $(MAKEDIST_TARGET)-livecd-root: \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server \ samba-server \
smart-gui cpufreqd mambatray \ cpufreqd mambatray smart \
$(MAKEDIST_TARGET)-livecd-kde4 $(MAKEDIST_TARGET)-livecd-kde4
# smart-gui
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-livecd-root-en: \ $(MAKEDIST_TARGET)-livecd-root-en: \
kde-l10n-en_GB kde-l10n-en_GB

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

@ -1 +1,2 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-applet-networkmanagement
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

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

@ -47,7 +47,17 @@ for f in /usr/share/applications/chromium-devel.desktop; do
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1 chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f || exit 1
done done
# pre-create video drivers for VirtualBox
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 vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done
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 smart remove kernel-${K}-headers -y
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
# remove failsafe image to save space for livecd # remove failsafe image to save space for livecd

2
platforms/livedvd-root/Makefile
View File

@ -1,4 +1,4 @@
$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ark kcalc kdf kgpg desktop-base-kde4 \ $(MAKEDIST_TARGET)-livedvd-kde4: kppp krfb ark kcalc kdf kgpg desktop-base-kde4 \
ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \ ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \
kopete4 bluedevil smb4k amarok kwallet dragon kate kopete4 bluedevil smb4k amarok kwallet dragon kate
$(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-livedvd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress

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

@ -1 +1,2 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-applet-networkmanagement
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

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

@ -47,7 +47,11 @@ for f in /usr/share/applications/chromium-devel.desktop /opt/kde/share/applicati
chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f chroot $MOUNTDIR /opt/kde/bin/kickoffcfg --add-favorite $f
done done
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
# pre-create video drivers for VirtualBox
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
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
# # remove failsafe image to save space for livecd # # remove failsafe image to save space for livecd

2
platforms/livedvd/Makefile.defs
View File

@ -4,7 +4,7 @@ xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
#xorg-ext-libglx-nvidia #xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-amd xorg-drv-video-nsc xorg-drv-video-fglrx xorg-drv-video-nvidia xorgdrvvideo = xorg-drv-video-base xorg-drv-video-amd xorg-drv-video-nsc xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-vboxvideo
libkorganizer.so.1 = korganizer libkorganizer.so.1 = korganizer
libkorganizer_calendar.so.1 = korganizer libkorganizer_calendar.so.1 = korganizer
libkorganizer_eventviewer.so.1 = korganizer libkorganizer_eventviewer.so.1 = korganizer

4
platforms/livegames-root/Makefile
View File

@ -1,5 +1,5 @@
$(MAKEDIST_TARGET)-livegames-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \ $(MAKEDIST_TARGET)-livegames-kde4: kppp krfb ark kcalc kdf kfloppy kgpg desktop-base-kde4 \
ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \ ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \
kopete4 kdebluetooth4 smb4k kate \ kopete4 kdebluetooth4 smb4k kate \
kruler gwenview4 kamera kcolorchooser lisa4 kwalletmanager4 libqt4-sqlite \ kruler gwenview4 kamera kcolorchooser lisa4 kwalletmanager4 libqt4-sqlite \
bomber bovo granatier kapman katomic kbattleship kblackbox kblocks kbounce \ bomber bovo granatier kapman katomic kbattleship kblackbox kblocks kbounce \

5
platforms/rootfs/Makefile
View File

@ -12,7 +12,8 @@ $(MAKEDIST_TARGET)-$(PLATFORM)-arm: \
$(MAKEDIST_TARGET)-$(PLATFORM)-i586: \ $(MAKEDIST_TARGET)-$(PLATFORM)-i586: \
kernel-mamba kernel-mamba-sound kernel-mamba-wireless \ kernel-mamba kernel-mamba-sound kernel-mamba-wireless \
kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless kernel-mamba-64GB kernel-mamba-64GB-sound kernel-mamba-64GB-wireless \
chromium
$(MAKEDIST_TARGET)-$(PLATFORM): \ $(MAKEDIST_TARGET)-$(PLATFORM): \
$(MAKEDIST_TARGET)-$(PLATFORM)-kde4 openssh-server usbutils wireless_tools i2c-tools \ $(MAKEDIST_TARGET)-$(PLATFORM)-kde4 openssh-server usbutils wireless_tools i2c-tools \
@ -23,7 +24,7 @@ $(MAKEDIST_TARGET)-$(PLATFORM): \
liblame expect prelink NetworkManager ModemManager procps \ liblame expect prelink NetworkManager ModemManager procps \
xorg-server x11vnc xkeyboard-config screen \ xorg-server x11vnc xkeyboard-config screen \
xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \ xorg-drv-input-tslib xcursor-transparent-theme rpm smart xdg-utils \
dhcp-server rfkill plymouth livecd-tools chromium rdesktop mingetty \ dhcp-server rfkill plymouth livecd-tools rdesktop mingetty \
postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd postplug-xorg postplug-sound gparted tar net-tools chrony mambatray kvkbd
# startactive # startactive

11
platforms/testcd-root/Makefile
View File

@ -1,6 +1,6 @@
$(MAKEDIST_TARGET)-testcd-kde4: kppp4 krfb4 ark kcalc kdf kgpg desktop-base-kde4 \ $(MAKEDIST_TARGET)-testcd-kde4: desktop-base-kde4 kmix bluedevil kwallet
ksnapshot okular kontact kmail akregator desktop-base-kde4 kmix \ # kopete dragon kate smb4k juk ksnapshot okular kontact kmail akregator kppp krfb ark kcalc kdf kgpg
kopete bluedevil smb4k juk kwallet dragon kate
$(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress $(MAKEDIST_TARGET)-testcd-libreoffice: libreoffice-calc libreoffice-writer libreoffice-impress
$(MAKEDIST_TARGET)-testcd-root: \ $(MAKEDIST_TARGET)-testcd-root: \
@ -13,9 +13,10 @@ $(MAKEDIST_TARGET)-testcd-root: \
chromium \ chromium \
macbook-tools livecd-tools \ macbook-tools livecd-tools \
Mesa-tools driconf parted testdisk \ Mesa-tools driconf parted testdisk \
samba-server \ samba-server cpufreqd mambatray smart \
smart-gui cpufreqd mambatray \
$(MAKEDIST_TARGET)-testcd-kde4 openssh-server $(MAKEDIST_TARGET)-testcd-kde4 openssh-server
# smart-gui
# Localization targets # Localization targets
$(MAKEDIST_TARGET)-testcd-root-en: \ $(MAKEDIST_TARGET)-testcd-root-en: \
kde-l10n-en_GB kde-l10n-en_GB

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

@ -1,2 +1,3 @@
networkmanagergui = plasma-applet-networkmanagement networkmanagergui = plasma-applet-networkmanagement
#xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau #xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-nouveau
xorgdrvvideo += xorg-drv-video-vboxvideo VirtualBox-vboxguest

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

@ -47,7 +47,17 @@ for f in /usr/share/applications/chromium-devel.desktop; do
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
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 vboxvideo -v ${virtualbox_ver} -k ${KERNEL_MAJVER}$K --force
done
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 smart remove kernel-${K}-headers -y
# remove unused initramfs generated by kernel # remove unused initramfs generated by kernel
rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img* rm -f $MOUNTDIR/boot/initramfs-${KERNEL_MAJVER}${K}.img*
# remove failsafe image to save space for livecd # remove failsafe image to save space for livecd