Target directory: sync with changes in openmamba target
This commit is contained in:
parent
092d60f887
commit
8568df74e4
2
Makefile
2
Makefile
@ -15,7 +15,7 @@ $(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \
|
||||
net-tools prelink mc dhcpclient timezone nfs-utils \
|
||||
wireless_tools wpa_supplicant openmamba-release refit-tools openssh-clients \
|
||||
dosfstools man mbr iptables cups vim iputils sudo postplug xinetd less \
|
||||
reiserfsprogs reiser4progs ppp b43-tools mdadm usb-modeswitch \
|
||||
reiserfsprogs ppp b43-tools mdadm usb-modeswitch \
|
||||
ndiswrapper slmodem usbutils ftp telnet eject bluez lsof \
|
||||
tcpdump pcmcia-utils xdg-utils unionfs_utils iproute $(MAKEDIST_TARGET)-firmwares \
|
||||
$(MAKEDIST_TARGET)-devel
|
||||
|
@ -7,7 +7,7 @@ ifeq ($(ARCH),i586)
|
||||
# kernel
|
||||
kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia
|
||||
# kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia_96xx
|
||||
kernelsound = kernel-$(KERNEL_EXTRAVER)-sound-backport
|
||||
kernelsound = kernel-$(KERNEL_EXTRAVER)-sound
|
||||
kernelwireless = kernel-$(KERNEL_EXTRAVER)-wireless kernel-$(KERNEL_EXTRAVER)-nongpl-wl
|
||||
# kernel-$(KERNEL_EXTRAVER)-atl1e kernel-$(KERNEL_EXTRAVER)-rtl8192se
|
||||
kernelfglrx = kernel-$(KERNEL_EXTRAVER)-nongpl-fglrx
|
||||
@ -26,7 +26,7 @@ ifdef KERNEL_MORE_EXTRAVER
|
||||
# extra kernel (FIXME: only supports single extra kernel)
|
||||
kernelnvidia += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia
|
||||
# kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_71xx kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-nvidia_96xx
|
||||
kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound-backport
|
||||
kernelsound += kernel-$(KERNEL_MORE_EXTRAVER)-sound
|
||||
kernelwireless += kernel-$(KERNEL_MORE_EXTRAVER)-wireless kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-wl
|
||||
# kernel-$(KERNEL_MORE_EXTRAVER)-rtl8192se kernel-$(KERNEL_MORE_EXTRAVER)-atl1e
|
||||
kernelfglrx += kernel-$(KERNEL_MORE_EXTRAVER)-nongpl-fglrx
|
||||
@ -63,6 +63,7 @@ xorgdrvvideo = xorg-drv-video-base xorg-drv-video-fglrx xorg-drv-video-nvidia xo
|
||||
# xorg-drv-video-nvidia_71xx xorg-drv-video-nvidia_96xx xorg-drv-video-nvidia_173xx xorg-drv-video-vboxvideo
|
||||
endif
|
||||
|
||||
libOpenCL.so.1 = xorg-drv-video-fglrx xorg-drv-video-nvidia
|
||||
xorgdrvinput = xorg-drv-input-void xorg-drv-input-synaptics xorg-drv-input-evdev
|
||||
# xorg-drv-input-mouse xorg-drv-input-keyboard xorg-drv-input-joystick xorg-drv-input-evtouch xorg-drv-input-vboxmouse
|
||||
libGL.so.1 = libGL-Mesa-dri
|
||||
@ -161,6 +162,18 @@ knetworkmanagervpnplugin = plasma-applet-networkmanagement-vpnc plasma-applet-ne
|
||||
packagekitgui = kpackagekit
|
||||
firewallgui = kcm_ufw
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
# x86_64 glibc vs. glibc-multilib-utils and ldconfig vs ldconfig-multilib preferences
|
||||
/sbin/ldconfig = ldconfig
|
||||
/usr/bin/gencat = glibc
|
||||
/usr/bin/getconf = glibc
|
||||
/usr/bin/iconv = glibc
|
||||
/usr/bin/locale = glibc
|
||||
/usr/bin/localedef = glibc
|
||||
rtld[GNU_HASH] = ldconfig
|
||||
rtld[GNU_UNIQUE] = ldconfig
|
||||
endif
|
||||
|
||||
ifdef PLATFORM
|
||||
include $(TARGETSDIR)/$(TARGET)/platforms/$(PLATFORM)/Makefile.defs
|
||||
endif
|
||||
|
@ -1,7 +1,7 @@
|
||||
RELEASE=milestone2
|
||||
MAKEFILE_TARGET=${MAKEDIST_TARGET}
|
||||
KERNEL_ADDITIONAL="sound-backport vboxvideo"
|
||||
SMART_ENABLE_CHANNELS="milestone2-kde4 milestone2-kernel"
|
||||
KERNEL_ADDITIONAL="sound-backport"
|
||||
#SMART_ENABLE_CHANNELS="milestone2-kde4 milestone2-kernel"
|
||||
|
||||
#COMPRESSEDFSSIZE=400000
|
||||
#COMPRESSEDFSBLOCKSIZE=1k
|
||||
|
Loading…
Reference in New Issue
Block a user