diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index 4c7aeb50e6..eb0896d380 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -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" ;; diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh index bc4807e300..0131a8d1f7 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek-update-driver.sh @@ -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 diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk index 69e64d5433..d234e78f36 100644 --- a/packages/audio/flac/package.mk +++ b/packages/audio/flac/package.mk @@ -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" diff --git a/packages/devel/gnu-efi/package.mk b/packages/devel/gnu-efi/package.mk index 83b833b70e..297b699d6e 100644 --- a/packages/devel/gnu-efi/package.mk +++ b/packages/devel/gnu-efi/package.mk @@ -20,7 +20,7 @@ PKG_NAME="gnu-efi" PKG_VERSION="3.0" PKG_VERSION_SRC="${PKG_VERSION}u" PKG_REV="1" -PKG_ARCH="i386 x86_64" +PKG_ARCH="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" @@ -44,8 +44,6 @@ pre_make_target() { if [ "$TARGET_ARCH" = "x86_64" ]; then EFI_ARCH="x86_64" - elif [ "$TARGET_ARCH" = "i386" ]; then - EFI_ARCH="ia32" fi } diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk index b8a37674f1..3530e3e13d 100644 --- a/packages/lang/llvm/package.mk +++ b/packages/lang/llvm/package.mk @@ -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" diff --git a/packages/linux-drivers/bcm_sta/package.mk b/packages/linux-drivers/bcm_sta/package.mk index 9a75c7face..6a693825b1 100644 --- a/packages/linux-drivers/bcm_sta/package.mk +++ b/packages/linux-drivers/bcm_sta/package.mk @@ -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 } diff --git a/packages/linux-drivers/tbs-linux-drivers/package.mk b/packages/linux-drivers/tbs-linux-drivers/package.mk index 99ecdc44fa..b1e9cde9ca 100644 --- a/packages/linux-drivers/tbs-linux-drivers/package.mk +++ b/packages/linux-drivers/tbs-linux-drivers/package.mk @@ -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) } diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 95f1988f4a..adcd53bcc2 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -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" diff --git a/packages/multimedia/libass/package.mk b/packages/multimedia/libass/package.mk index 918f5cd783..3448ec3208 100644 --- a/packages/multimedia/libass/package.mk +++ b/packages/multimedia/libass/package.mk @@ -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 diff --git a/packages/multimedia/libva-intel-driver/package.mk b/packages/multimedia/libva-intel-driver/package.mk index a64b446db8..8bf994e6b3 100644 --- a/packages/multimedia/libva-intel-driver/package.mk +++ b/packages/multimedia/libva-intel-driver/package.mk @@ -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" diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk index 5e2aeccba8..a34404afbc 100644 --- a/packages/multimedia/libva/package.mk +++ b/packages/multimedia/libva/package.mk @@ -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" diff --git a/packages/sysutils/irserver/package.mk b/packages/sysutils/irserver/package.mk index f8e06201e0..2c43006b3b 100644 --- a/packages/sysutils/irserver/package.mk +++ b/packages/sysutils/irserver/package.mk @@ -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" diff --git a/packages/sysutils/pciutils/package.mk b/packages/sysutils/pciutils/package.mk index 136f3bef3f..28069293cd 100644 --- a/packages/sysutils/pciutils/package.mk +++ b/packages/sysutils/pciutils/package.mk @@ -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 } diff --git a/packages/sysutils/v86d/package.mk b/packages/sysutils/v86d/package.mk index 1781b83baf..dc5b497511 100644 --- a/packages/sysutils/v86d/package.mk +++ b/packages/sysutils/v86d/package.mk @@ -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" diff --git a/packages/tools/flashrom/package.mk b/packages/tools/flashrom/package.mk index 33fc717bf6..125dc1f270 100644 --- a/packages/tools/flashrom/package.mk +++ b/packages/tools/flashrom/package.mk @@ -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" diff --git a/packages/tools/installer/package.mk b/packages/tools/installer/package.mk index 38ca22ee6d..76612b598e 100644 --- a/packages/tools/installer/package.mk +++ b/packages/tools/installer/package.mk @@ -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 diff --git a/packages/tools/syslinux/package.mk b/packages/tools/syslinux/package.mk index eae7513fcf..c0546eb8b1 100644 --- a/packages/tools/syslinux/package.mk +++ b/packages/tools/syslinux/package.mk @@ -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" diff --git a/packages/x11/driver/xf86-video-ati/package.mk b/packages/x11/driver/xf86-video-ati/package.mk index f407aec87a..0e7f0c0964 100644 --- a/packages/x11/driver/xf86-video-ati/package.mk +++ b/packages/x11/driver/xf86-video-ati/package.mk @@ -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" diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index c7a7ac16c1..230ba92a8c 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -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" diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index f840714f3a..ab2f06994b 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -19,11 +19,10 @@ PKG_NAME="xf86-video-nvidia-legacy" PKG_VERSION="304.125" 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" diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 9cd7fdbe3e..9d222d1636 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -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" diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk index 2f2dd5b6b1..903c578364 100644 --- a/packages/x11/lib/pixman/package.mk +++ b/packages/x11/lib/pixman/package.mk @@ -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