Commit 8568df74e4400a0cd577bb30fdb4267d2cb74f81

Authored by Silvan Calarco
1 parent 092d60f887
Exists in master

Target directory: sync with changes in openmamba target

Showing 3 changed files with 18 additions and 5 deletions Side-by-side Diff

... ... @@ -15,7 +15,7 @@
15 15 net-tools prelink mc dhcpclient timezone nfs-utils \
16 16 wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
17 17 dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
18   - reiserfsprogs reiser4progs ppp b43-tools mdadm usb-modeswitch \
  18 + reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
19 19 ndiswrapper slmodem usbutils ftp telnet eject bluez lsof \
20 20 tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \
21 21 $(MAKEDIST_TARGET)-devel
... ... @@ -7,7 +7,7 @@
7 7 # kernel
8 8 kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
9 9 # kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx
10   -kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
  10 +kernelsound = kernel-$(KERNEL_EXTRAVER)-sound
11 11 kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl
12 12 # kernel-$(KERNEL_EXTRAVER)-atl1e kernel-$(KERNEL_EXTRAVER)-rtl8192se
13 13 kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
... ... @@ -26,7 +26,7 @@
26 26 # extra kernel (FIXME: only supports single extra kernel)
27 27 kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia
28 28 # kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
29   -kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound-backport
  29 +kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound
30 30 kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl
31 31 # kernel-$(KERNEL_MORE_EXTRAVER)-rtl8192se kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
32 32 kernelfglrx += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-fglrx
... ... @@ -63,6 +63,7 @@
63 63 # xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
64 64 endif
65 65  
  66 +libOpenCL.so.1 = xorg-drv-video-fglrx xorg-drv-video-nvidia
66 67 xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev
67 68 # xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
68 69 libGL.so.1 = libGL-Mesa-dri
... ... @@ -160,6 +161,18 @@
160 161  
161 162 packagekitgui = kpackagekit
162 163 firewallgui = kcm_ufw
  164 +
  165 +ifeq ($(ARCH),x86_64)
  166 +# x86_64 glibc vs. glibc-multilib-utils and ldconfig vs ldconfig-multilib preferences
  167 +/sbin/ldconfig = ldconfig
  168 +/usr/bin/gencat = glibc
  169 +/usr/bin/getconf = glibc
  170 +/usr/bin/iconv = glibc
  171 +/usr/bin/locale = glibc
  172 +/usr/bin/localedef = glibc
  173 +rtld[GNU_HASH] = ldconfig
  174 +rtld[GNU_UNIQUE] = ldconfig
  175 +endif
163 176  
164 177 ifdef PLATFORM
165 178 include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs
1 1 RELEASE=milestone2
2 2 MAKEFILE_TARGET=${MAKEDIST_TARGET}
3   -KERNEL_ADDITIONAL="sound-backport vboxvideo"
4   -SMART_ENABLE_CHANNELS="milestone2-kde4 milestone2-kernel"
  3 +KERNEL_ADDITIONAL="sound-backport"
  4 +#SMART_ENABLE_CHANNELS="milestone2-kde4 milestone2-kernel"
5 5  
6 6 #COMPRESSEDFSSIZE=400000
7 7 #COMPRESSEDFSBLOCKSIZE=1k