Commit cef83969feb7b0e38fd9fffe481a664992c2d9c2

Authored by Silvan Calarco
1 parent 28d2b65f7f
Exists in master

Sync global Makefile and Makefile.defs from devel branch

Showing 2 changed files with 26 additions and 8 deletions Side-by-side Diff

... ... @@ -32,12 +32,12 @@
32 32 include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile
33 33 endif
34 34  
35   -kdelibs:
  35 +kdelibs3:
36 36 @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
37 37 { echo -n "$@ "; \
38 38 [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-i18n-$(LANGUAGE) "; } || \
39 39 :
40   -kdelibs4:
  40 +kdelibs:
41 41 @[ `echo " $$INSTALLED " | grep -c " $@ "` -eq 0 ] && \
42 42 { echo -n "$@ "; \
43 43 [ ! "$(LANGUAGE)" = "" ] && [ ! "$(LANGUAGE)" = "en" ] && echo -n "kde-l10n-$(LANGUAGE) "; } || \
... ... @@ -3,12 +3,13 @@
3 3 # libc
4 4 libpthread.so.0 = glibc
5 5  
  6 +ifeq ($(ARCH),i586)
6 7 # kernel
7 8 kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
8 9 # kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx
9 10 kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
10   -kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl kernel-$(KERNEL_EXTRAVER)-rtl8192se
11   -# kernel-$(KERNEL_EXTRAVER)-atl1e
  11 +kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl
  12 +# kernel-$(KERNEL_EXTRAVER)-atl1e kernel-$(KERNEL_EXTRAVER)-rtl8192se
12 13 kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
13 14 kernelslmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
14 15 kernelhsfmodem = kernel-$(KERNEL_EXTRAVER)-nongpl-softmodems
... ... @@ -26,8 +27,8 @@
26 27 kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia
27 28 # kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
28 29 kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound-backport
29   -kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl kernel-$(KERNEL_MORE_EXTRAVER)-rtl8192se
30   -# kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
  30 +kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl
  31 +# kernel-$(KERNEL_MORE_EXTRAVER)-rtl8192se kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
31 32 kernelfglrx += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-fglrx
32 33 kernelslmodem += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-softmodems
33 34 kernelhsfmodem += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-softmodems
34 35  
35 36  
... ... @@ -40,8 +41,17 @@
40 41 kernellirc += kernel-$(KERNEL_MORE_EXTRAVER)-lirc
41 42 kernelvboxvideo += kernel-$(KERNEL_MORE_EXTRAVER)-vboxvideo
42 43 endif
  44 +endif
43 45  
  46 +ifeq ($(ARCH),arm)
44 47 # xorg
  48 +xorglibGL = libGL-Mesa-dri
  49 +xorglibglx = xorg-ext-libglx
  50 +xorgdrvvideo = xorg-drv-video-fbdev xorg-drv-video-tegra
  51 +endif
  52 +
  53 +ifeq ($(ARCH),i586)
  54 +# xorg
45 55 xorglibGL = libGL-Mesa-dri libGL-fglrx-X11 libGL-nvidia-X11
46 56 # libGL-nvidia_71xx-X11 libGL-nvidia_96xx-X11 libGL-nvidia_173xx-X11
47 57 xorglibglx = xorg-ext-libglx xorg-ext-libglx-nvidia
48 58  
... ... @@ -49,9 +59,10 @@
49 59 libGLcore.so.1 = xorg-drv-video-nvidia
50 60 # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
51 61 libnvidia-tls.so.1 = xorg-drv-video-nvidia
52   -# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx
53 62 xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xorg-drv-video-nouveau
54 63 # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
  64 +endif
  65 +
55 66 xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev
56 67 # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
57 68 libGL.so.1 = libGL-Mesa-dri
58 69  
... ... @@ -59,7 +70,11 @@
59 70  
60 71  
61 72 splashtheme = splash-theme-openmamba
  73 +
  74 +ifeq ($(ARCH),i586)
62 75 bootloader = syslinux
  76 +endif
  77 +
63 78 alsaplayer_output = alsaplayer-output-alsa
64 79 #libscanpci.so = xorg-server
65 80 libgtkpeer.so = libgcj4
... ... @@ -110,6 +125,7 @@
110 125 /usr/bin/expectk = expect85-tk
111 126 /usr/bin/test = coreutils
112 127 /sbin/nologin= util-linux
  128 +/sbin/shutdown = sysvinit
113 129 /usr/bin/chfn= pwdutils
114 130 /usr/bin/chsh= pwdutils
115 131 /usr/bin/newgrp= pwdutils
116 132  
... ... @@ -125,8 +141,10 @@
125 141 /usr/bin/cdrecord = cdrkit
126 142 /usr/bin/mkisofs = cdrkit
127 143 /usr/bin/readcd = cdrkit
128   -
129 144 libgs.so.9 = ghostscript
  145 +udev = udev
  146 +libudev.so.0 = udev
  147 +libgudev-1.0.so.0 = udev
130 148  
131 149 # ffmpeg / libav
132 150 libpostproc.so.51 = libpostproc-ffmpeg