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

Makefile: currently stop providing proprietary video drivers by default in all platforms

Browse Source
This commit is contained in:
Silvan Calarco 2013-04-09 16:06:33 +02:00
parent 3dcf299aa4
commit a22d6c84f4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile.defs
View File

@ -13,10 +13,13 @@ _initsystem = sysvinit
/sbin/shutdown = $(_initsystem) /sbin/shutdown = $(_initsystem)
/sbin/telinit = $(_initsystem) /sbin/telinit = $(_initsystem)
#xorgproprietary = xorg-drv-video-fglrx xorg-drv-video-nvidia
ifeq ($(ARCH),i586) ifeq ($(ARCH),i586)
# kernel # kernel
kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
kernelsound = kernel-$(KERNEL_EXTRAVER)-sound kernelsound = kernel-$(KERNEL_EXTRAVER)-sound
kernelheaders = kernel-$(KERNEL_EXTRAVER)-headers
# FIXME: r8101 is a ethernet driver but virtual requirement is called kernelwireless # FIXME: r8101 is a ethernet driver but virtual requirement is called kernelwireless
kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-r8101 kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-r8101
kernelsound-$(KERNEL_EXTRAVER) = kernel-$(KERNEL_EXTRAVER)-sound kernelsound-$(KERNEL_EXTRAVER) = kernel-$(KERNEL_EXTRAVER)-sound
@ -41,6 +44,7 @@ ifdef KERNEL_MORE_EXTRAVER
kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia
# kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx # kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound
kernelheaders += kernel-$(KERNEL_MORE_EXTRAVER)-headers
kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-r8101 kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-r8101
kernelsound-$(KERNEL_MORE_EXTRAVER) += kernel-$(KERNEL_MORE_EXTRAVER)-sound kernelsound-$(KERNEL_MORE_EXTRAVER) += kernel-$(KERNEL_MORE_EXTRAVER)-sound
kernelwireless-$(KERNEL_MORE_EXTRAVER) += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-r8101 kernelwireless-$(KERNEL_MORE_EXTRAVER) += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-r8101
@ -72,33 +76,33 @@ endif
ifeq ($(ARCH),i586) ifeq ($(ARCH),i586)
# xorg # xorg
xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11 xorglibGL = libGL-Mesa-dri
# libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11 # libGL-fglrx-X11 libGL-nvidia-X11
xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia xorglibglx = xorg-ext-libglx
# xorg-ext-libglx-nvidia_71xx xorg-ext-libglx-nvidia_96xx xorg-ext-libglx-nvidia_173xx # xorg-ext-libglx-nvidia
libGLcore.so.1 = xorg-drv-video-nvidia libGLcore.so.1 = xorg-drv-video-nvidia
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
libnvidia-tls.so.1 = xorg-drv-video-nvidia libnvidia-tls.so.1 = xorg-drv-video-nvidia
libvdpau.so.1 = libvdpau libvdpau.so.1 = libvdpau
libvdpau_trace.so.1 = libvdpau libvdpau_trace.so.1 = libvdpau
xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau xorgdrvvideo = xorg-drv-video-base xorg-drv-video-nouveau $(xorgproprietary)
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
bootloader = syslinux bootloader = syslinux
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
# xorg # xorg
xorglibGL = libGL-Mesa-dri libGL-nvidia-X11 xorglibGL = libGL-Mesa-dri
# libGL-fglrx-X11 # libGL-nvidia-X11 libGL-fglrx-X11
xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia xorglibglx = xorg-ext-libglx
# 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
libvdpau.so.1[][64bit] = libvdpau libvdpau.so.1[][64bit] = libvdpau
libvdpau_trace.so.1[][64bit] = libvdpau libvdpau_trace.so.1[][64bit] = libvdpau
xorgdrvvideo = xorg-drv-video-ati xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-i128 xorg-drv-video-intel \ xorgdrvvideo = xorg-drv-video-ati xorg-drv-video-dummy xorg-drv-video-fbdev xorg-drv-video-i128 xorg-drv-video-intel \
xorg-drv-video-mga xorg-drv-video-nvidia xorg-drv-video-nouveau xorg-drv-video-openchrome \ xorg-drv-video-mga xorg-drv-video-nouveau xorg-drv-video-openchrome \
xorg-drv-video-r128 xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware xorg-drv-video-r128 xorg-drv-video-vesa xorg-drv-video-v4l xorg-drv-video-vmware $(xorgproprietary)
# xorg-drv-video-fglrx
bootloader = syslinux bootloader = syslinux
endif endif