Merge pull request #3909 from stefansaraev/i386

drop i386 and clean up
This commit is contained in:
Stefan Saraev 2015-04-03 12:30:25 +03:00
commit 0310165bad
34 changed files with 28 additions and 4671 deletions

View File

@ -1,14 +0,0 @@
# determines TARGET_CPU, if not forced by user
if [ -z "$TARGET_CPU" ]; then
TARGET_CPU=i686
fi
# determine architecture's family
TARGET_SUBARCH=i686
# setup ARCH specific *FLAGS
TARGET_CFLAGS="-march=$TARGET_CPU -m32"
TARGET_LDFLAGS="-march=$TARGET_CPU -m32"
# build with SIMD support ( yes / no )
SIMD_SUPPORT="yes"

View File

@ -35,11 +35,6 @@ get_graphicdrivers() {
VDPAU_SUPPORT="yes"
fi
if [ "$drv" = "nvidia-legacy" ]; then
XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
VDPAU_SUPPORT="yes"
fi
if [ "$drv" = "r200" ]; then
DRI_DRIVERS="$DRI_DRIVERS,r200"
XORG_DRIVERS="$XORG_DRIVERS ati"

View File

@ -17,10 +17,10 @@ else
PROJECT="$PROJECT"
fi
# determines TARGET_ARCH, if not forced by user (i386 / x86_64 / arm)
# default is i386
# determines TARGET_ARCH, if not forced by user (x86_64 / arm)
# default is x86_64
if [ -z "$ARCH" ]; then
TARGET_ARCH="i386"
TARGET_ARCH="x86_64"
else
TARGET_ARCH="$ARCH"
fi

View File

@ -121,11 +121,7 @@
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,nvidia)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeonsi nvidia"
if [ "$TARGET_ARCH" = "i386" ]; then
# TODO: create Legacy build with OpenELEC-4.2
# install legacy drivers to i386 ARCH
GRAPHIC_DRIVERS="r200 r300 r600 i915 i965 nvidia-legacy"
elif [ "$TARGET_ARCH" = "x86_64" ]; then
if [ "$TARGET_ARCH" = "x86_64" ]; then
GRAPHIC_DRIVERS="r300 r600 radeonsi i915 i965 nvidia"
fi

View File

@ -38,9 +38,6 @@ make_target() {
cd $ROOT/$PKG_BUILD
case $TARGET_ARCH in
i386)
INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
;;
x86_64)
INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
;;

View File

@ -61,8 +61,6 @@ fi
ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
if [ "$ARCH" = "x86_64" ]; then
INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz"
elif [ "$ARCH" = "i386" ]; then
INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
elif [ "$ARCH" = "arm" ]; then
INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
else

View File

@ -45,7 +45,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
--with-ogg=$SYSROOT_PREFIX/usr \
--with-gnu-ld"
if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then
if [ $TARGET_ARCH = "x86_64" ]; then
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse"

View File

@ -1,61 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="gnu-efi"
PKG_VERSION="3.0"
PKG_VERSION_SRC="${PKG_VERSION}u"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://sourceforge.net/projects/gnu-efi/"
PKG_URL="$SOURCEFORGE_SRC/project/$PKG_NAME/${PKG_NAME}_${PKG_VERSION_SRC}.orig.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="gnu-efi: Library for building UEFI Applications using GNU toolchain"
PKG_LONGDESC="gnu-efi is a library for building UEFI Applications using GNU toolchain"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
pre_make_target() {
# Unset all compiler FLAGS
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
export MAKEFLAGS=-j1
if [ "$TARGET_ARCH" = "x86_64" ]; then
EFI_ARCH="x86_64"
elif [ "$TARGET_ARCH" = "i386" ]; then
EFI_ARCH="ia32"
fi
}
make_target() {
make CC=$CC ARCH=$EFI_ARCH
make CC=$CC ARCH=$EFI_ARCH -C apps all
}
makeinstall_target() {
make ARCH=$EFI_ARCH INSTALLROOT="$SYSROOT_PREFIX" PREFIX="/usr" LIBDIR="/usr/lib" install
mkdir -p $INSTALL/usr/share/gnu-efi/apps/$EFI_ARCH
cp apps/*.efi $INSTALL/usr/share/gnu-efi/apps/$EFI_ARCH
}

View File

@ -82,9 +82,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-polly \
--disable-libffi \
--disable-ltdl-install"
if [ "$TARGET_ARCH" = i386 ]; then
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86,r600"
elif [ "$TARGET_ARCH" = x86_64 ]; then
if [ "$TARGET_ARCH" = x86_64 ]; then
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=x86_64,r600"
elif [ "$TARGET_ARCH" = arm ]; then
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-targets=arm"

View File

@ -1,39 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="nasm"
PKG_VERSION="2.11.02"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://nasm.sourceforge.net/"
PKG_URL="http://www.nasm.us/pub/nasm/releasebuilds/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_HOST=""
PKG_PRIORITY="optional"
PKG_SECTION="lang"
PKG_SHORTDESC="nasm: A 80x86 assembler which can create a wide rande of object formats"
PKG_LONGDESC="The Netwide Assembler, NASM, is an 80x86 assembler designed for portability and modularity. It supports a range of object file formats, including Linux, Microsoft 16-bit OBJ and Win32. It will also output plain binary files. Its syntax is designed to be sim- ple and easy to understand, similar to Intel's but less complex. It supports Pentium, P6 and MMX opcodes, and has macro capability. It includes a disassembler as well."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
pre_configure_host() {
# nasm fails to build in subdirs
cd $ROOT/$PKG_BUILD
rm -rf .$HOST_NAME
}

View File

@ -22,7 +22,7 @@
PKG_NAME="bcm_sta"
PKG_VERSION="6.30.223.248"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com/"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
@ -36,14 +36,8 @@ PKG_LONGDESC="These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$TARGET_ARCH" = "i386" ]; then
DRIVER_ARCH="x86-32"
elif [ "$TARGET_ARCH" = "x86_64" ]; then
DRIVER_ARCH="x86-64"
fi
make_target() {
cd $DRIVER_ARCH
cd x86-64
KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$TARGET_ARCH
}

View File

@ -19,7 +19,7 @@
PKG_NAME="tbs-linux-drivers"
PKG_VERSION="141225"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.tbsdtv.com/english/Download.html"
PKG_URL="http://www.tbsdtv.com/download/document/common/tbs-linux-drivers_v${PKG_VERSION}.zip"
@ -40,8 +40,7 @@ post_unpack() {
make_target() {
cd $ROOT/$PKG_BUILD/linux-tbs-drivers
[ "$TARGET_ARCH" = "i386" ] && ./v4l/tbs-x86_r3.sh
[ "$TARGET_ARCH" = "x86_64" ] && ./v4l/tbs-x86_64.sh
./v4l/tbs-x86_64.sh
LDFLAGS="" make DIR=$(kernel_path) prepare
LDFLAGS="" make DIR=$(kernel_path)
}

View File

@ -61,11 +61,6 @@ case "$TARGET_ARCH" in
FFMPEG_TABLES="--enable-hardcoded-tables"
FFMPEG_PIC="--enable-pic"
;;
i?86)
FFMPEG_CPU=""
FFMPEG_TABLES="--disable-hardcoded-tables"
FFMPEG_PIC="--disable-pic"
;;
x86_64)
FFMPEG_CPU=""
FFMPEG_TABLES="--disable-hardcoded-tables"

View File

@ -39,7 +39,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-test \
--disable-silent-rules \
--with-gnu-ld"
if [ $TARGET_ARCH = "i386" -o $TARGET_ARCH = "x86_64" ]; then
if [ $TARGET_ARCH = "x86_64" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET yasm:host"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-asm"
fi

View File

@ -19,7 +19,7 @@
PKG_NAME="libva-intel-driver"
PKG_VERSION="1.5.1"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
PKG_URL="http://www.freedesktop.org/software/vaapi/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"

View File

@ -19,7 +19,7 @@
PKG_NAME="libva"
PKG_VERSION="1.5.1"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
PKG_URL="http://cgit.freedesktop.org/vaapi/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"

View File

@ -32,9 +32,7 @@ PKG_LONGDESC="IR Trans transforms your PC into a programmable remote control: It
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$TARGET_ARCH" = "i386" ]; then
IRSERVER_BIN="irserver"
elif [ "$TARGET_ARCH" = "x86_64" ]; then
if [ "$TARGET_ARCH" = "x86_64" ]; then
IRSERVER_BIN="irserver64"
elif [ "$TARGET_ARCH" = "arm" ]; then
IRSERVER_BIN="irserver_arm"

View File

@ -19,7 +19,7 @@
PKG_NAME="pciutils"
PKG_VERSION="3.3.0"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://mj.ucw.cz/pciutils.shtml"
PKG_URL="http://www.kernel.org/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.xz"
@ -46,7 +46,7 @@ makeinstall_target() {
make $PKG_MAKE_OPTS DESTDIR=$SYSROOT_PREFIX install
make $PKG_MAKE_OPTS DESTDIR=$SYSROOT_PREFIX install-lib
make $PKG_MAKE_OPTS DESTDIR=$INSTALL install-lib
if [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then
if [ "$TARGET_ARCH" = x86_64 ]; then
make $PKG_MAKE_OPTS DESTDIR=$INSTALL install
fi
}

View File

@ -19,7 +19,7 @@
PKG_NAME="v86d"
PKG_VERSION="0.1.10"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://dev.gentoo.org/~spock/projects/uvesafb/"
PKG_URL="http://dev.gentoo.org/~spock/projects/uvesafb/archive/$PKG_NAME-$PKG_VERSION.tar.bz2"

View File

@ -19,7 +19,7 @@
PKG_NAME="flashrom"
PKG_VERSION="0.9.6"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.flashrom.org"
PKG_URL="http://download.flashrom.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"

View File

@ -32,7 +32,7 @@ PKG_LONGDESC="OpenELEC.tv Install manager to install the system on any disk"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
if [ "$TARGET_ARCH" = "x86_64" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET flashrom"
fi

View File

@ -19,7 +19,7 @@
PKG_NAME="syslinux"
PKG_VERSION="6.03"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://syslinux.zytor.com/"
PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"

View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
PKG_DEPENDS_TARGET="make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host scons:host yasm:host nasm:host"
PKG_DEPENDS_TARGET="make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host scons:host yasm:host"
PKG_PRIORITY="optional"
PKG_SECTION="virtual"
PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"

View File

@ -19,7 +19,7 @@
PKG_NAME="xf86-video-ati"
PKG_VERSION="7.5.0"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="OSS"
PKG_SITE="http://www.x.org/"
PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"

View File

@ -19,7 +19,7 @@
PKG_NAME="xf86-video-intel"
PKG_VERSION="2.99.910"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="OSS"
PKG_SITE="http://intellinuxgraphics.org/"
PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"

View File

@ -1,33 +0,0 @@
Section "Device"
Identifier "nvidia"
Driver "nvidia"
Option "DynamicTwinView" "False"
Option "NoFlip" "false"
Option "NoLogo" "true"
Option "ConnectToAcpid" "0"
Option "ModeValidation" "NoVesaModes, NoXServerModes"
Option "HWCursor" "false"
# To put Xorg in debug mode change "false" to "true" in the line below:
Option "ModeDebug" "false"
# To use a local edid.bin file uncomment the 4 lines below (change DFP-0 to match your card)
# Option "ConnectedMonitor" "DFP-0"
# Option "CustomEDID" "DFP-0:/storage/.config/edid.bin"
# Option "IgnoreEDID" "false"
# Option "UseEDID" "true"
EndSection
Section "Screen"
Identifier "screen"
Device "nvidia"
DefaultDepth 24
Option "ColorRange" "Full"
# Option "ColorRange" "Limited"
# Option "ColorSpace" "RGB"
SubSection "Display"
Depth 24
EndSubSection
EndSection
Section "Extensions"
Option "Composite" "false"
EndSection

View File

@ -1,81 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="xf86-video-nvidia-legacy"
PKG_VERSION="304.125"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.nvidia.com/"
[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run"
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server libvdpau"
PKG_NEED_UNPACK="$LINUX_DEPENDS"
PKG_PRIORITY="optional"
PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-video-nvidia-legacy: The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices too"
PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported. This version only supports GeForce 6xxx and higher of the Geforce GPUs plus complimentary Quadros and nforce."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
unpack() {
NV_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`"
[ -d $PKG_BUILD ] && rm -rf $PKG_BUILD
sh $SOURCES/$PKG_NAME/$NV_PKG --extract-only --target $BUILD/$PKG_NAME-$PKG_VERSION
}
make_target() {
unset LDFLAGS
cd kernel
make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path)
cd ..
}
makeinstall_target() {
mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
cp -P nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions
# rename to not conflicting with Mesa libGL.so
cp -P libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so
mkdir -p $INSTALL/etc/X11
cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
mkdir -p $INSTALL/usr/lib
cp -P libnvidia-glcore.so.$PKG_VERSION $INSTALL/usr/lib
cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib
ln -sf libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib/libnvidia-ml.so.1
cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib
# rename to not conflicting with Mesa libGL.so
cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1
mkdir -p $INSTALL/lib/modules/$(get_module_dir)/nvidia
cp kernel/nvidia.ko $INSTALL/lib/modules/$(get_module_dir)/nvidia
mkdir -p $INSTALL/usr/bin
cp nvidia-smi $INSTALL/usr/bin
cp nvidia-xconfig $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/vdpau
cp libvdpau_nvidia.so* $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so.1
ln -sf libvdpau_nvidia.so.1 $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so
}

View File

@ -1,30 +0,0 @@
diff -Naur xf86-video-nvidia-legacy-304.125/kernel/nv.c xf86-video-nvidia-legacy-304.125.patch/kernel/nv.c
--- xf86-video-nvidia-legacy-304.125/kernel/nv.c 2014-12-02 04:55:59.000000000 +0100
+++ xf86-video-nvidia-legacy-304.125.patch/kernel/nv.c 2015-02-11 19:07:09.844431593 +0100
@@ -17,7 +17,7 @@
#include "rmil.h"
#if defined(MODULE_LICENSE)
-MODULE_LICENSE("NVIDIA");
+MODULE_LICENSE("GPL\0NVIDIA");
#endif
#if defined(MODULE_INFO)
MODULE_INFO(supported, "external");
@@ -2026,7 +2026,7 @@
unsigned long i_arg
)
{
- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
}
long nv_kern_compat_ioctl(
@@ -2035,7 +2035,7 @@
unsigned long i_arg
)
{
- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg);
+ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg);
}
/*

View File

@ -19,11 +19,10 @@
PKG_NAME="xf86-video-nvidia"
PKG_VERSION="340.76"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_ARCH="x86_64"
PKG_LICENSE="nonfree"
PKG_SITE="http://www.nvidia.com/"
[ "$TARGET_ARCH" = "i386" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-$PKG_VERSION.run"
[ "$TARGET_ARCH" = "x86_64" ] && PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run"
PKG_DEPENDS_TARGET="toolchain util-macros linux xorg-server libvdpau"
PKG_NEED_UNPACK="$LINUX_DEPENDS"
PKG_PRIORITY="optional"

View File

@ -39,7 +39,7 @@ if [ "$TARGET_ARCH" = arm ]; then
PIXMAN_NEON="--disable-arm-neon"
fi
PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $PIXMAN_NEON --disable-arm-iwmmxt"
elif [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then
elif [ "$TARGET_ARCH" = x86_64 ]; then
PIXMAN_CONFIG="--enable-mmx --enable-sse2 --disable-ssse3 --disable-vmx --disable-arm-simd --disable-arm-neon"
fi

File diff suppressed because one or more lines are too long

View File

@ -5,18 +5,6 @@
# The TARGET_CPU variable controls which processor should be targeted for
# generated code.
case $TARGET_ARCH in
i386)
# (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
# athlon-fx athlon-mp athlon-xp athlon-4
# athlon-tbird athlon k6-3 k6-2 k6 geode
# (Intel CPUs) atom core2 nocona prescott pentium4[m] pentium3[m]
# pentium-m pentium2 pentiumpro pentium-mmx pentium
# i686 i586 i486 i386
# (VIA CPUs) c3 c3-2
#
TARGET_CPU="i686"
;;
x86_64)
# (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
# athlon-fx amdfam10 barcelona

View File

@ -203,7 +203,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
KERNEL_IMAGE="bzImage"
fi
if [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then
if [ "$TARGET_ARCH" = x86_64 ]; then
KERNEL_ARCH="x86"
elif [ "$TARGET_ARCH" = arm ]; then
KERNEL_ARCH="arm"

View File

@ -119,7 +119,7 @@ if [ "$(type -t pre_patch)" = "function" ]; then
pre_patch
fi
if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
if [ "$TARGET_ARCH" = "x86_64" ]; then
PATCH_ARCH="x86"
else
PATCH_ARCH="$TARGET_ARCH"