From 646bcdefd9344feefa5411999450d8b7b1bd470f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jun 2012 20:17:12 +0200 Subject: [PATCH] prelink-cross, remove package, it breaks more then improve Signed-off-by: Stephan Raue --- packages/toolchain/devel/prelink-cross/build | 32 ----------------- .../devel/prelink-cross/config/prelink.conf | 7 ---- .../toolchain/devel/prelink-cross/install | 26 -------------- packages/toolchain/devel/prelink-cross/meta | 36 ------------------- projects/ATV/options | 3 -- projects/Fusion/options | 3 -- projects/Generic/options | 3 -- projects/Generic_OSS/options | 3 -- projects/ION/options | 3 -- projects/Intel/options | 3 -- projects/RPi/options | 3 -- projects/Ultra/options | 3 -- projects/Virtual/options | 3 -- scripts/image | 7 ---- 14 files changed, 135 deletions(-) delete mode 100755 packages/toolchain/devel/prelink-cross/build delete mode 100644 packages/toolchain/devel/prelink-cross/config/prelink.conf delete mode 100755 packages/toolchain/devel/prelink-cross/install delete mode 100644 packages/toolchain/devel/prelink-cross/meta diff --git a/packages/toolchain/devel/prelink-cross/build b/packages/toolchain/devel/prelink-cross/build deleted file mode 100755 index 06040da796..0000000000 --- a/packages/toolchain/devel/prelink-cross/build +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -setup_toolchain host - -cd $PKG_BUILD -./configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN -make -make install diff --git a/packages/toolchain/devel/prelink-cross/config/prelink.conf b/packages/toolchain/devel/prelink-cross/config/prelink.conf deleted file mode 100644 index b0b3cf5b58..0000000000 --- a/packages/toolchain/devel/prelink-cross/config/prelink.conf +++ /dev/null @@ -1,7 +0,0 @@ -/lib -/usr/lib -/bin -/sbin -/usr/bin -/usr/sbin -/usr/lib/xbmc diff --git a/packages/toolchain/devel/prelink-cross/install b/packages/toolchain/devel/prelink-cross/install deleted file mode 100755 index 14d0f9d9fb..0000000000 --- a/packages/toolchain/devel/prelink-cross/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/etc - cp $PKG_DIR/config/prelink.conf $INSTALL/etc diff --git a/packages/toolchain/devel/prelink-cross/meta b/packages/toolchain/devel/prelink-cross/meta deleted file mode 100644 index 6744ad19ae..0000000000 --- a/packages/toolchain/devel/prelink-cross/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program 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, or (at your option) -# any later version. -# -# This Program 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.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="prelink-cross" -PKG_VERSION="e35fcac" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.yoctoproject.org/projects/cross-prelink" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="elfutils" -PKG_PRIORITY="optional" -PKG_SECTION="toolchain/devel" -PKG_SHORTDESC="prelink-cross: modifies ELF-shared libraries and ELF-dynamically linked binaries by pre-assigning load addresses for each ELF object." -PKG_LONGDESC="prelink-cross modifies ELF-shared libraries and ELF-dynamically linked binaries by pre-assigning load addresses for each ELF object." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" diff --git a/projects/ATV/options b/projects/ATV/options index 19a3e15e78..7f2fb1e11a 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) # BOOTLOADER="atv-bootloader" disabled for now BOOTLOADER="" diff --git a/projects/Fusion/options b/projects/Fusion/options index acdaa315ef..5d54732747 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/projects/Generic/options b/projects/Generic/options index 1902c00a99..7293f9d940 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 0998a8f2c4..3c50f7ef17 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/projects/ION/options b/projects/ION/options index a7ce8aced0..e800b327fa 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/projects/Intel/options b/projects/Intel/options index 1257a9c170..a032682625 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/projects/RPi/options b/projects/RPi/options index 378e5ab3a0..cd595aab86 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="yes" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader / bcm2835-bootloader) BOOTLOADER="bcm2835-bootloader" diff --git a/projects/Ultra/options b/projects/Ultra/options index 671e2ea888..5f9a001f05 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -93,9 +93,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/projects/Virtual/options b/projects/Virtual/options index 74014d69f9..86c9b1d504 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -88,9 +88,6 @@ # LTO (Link Time Optimization) support LTO_SUPPORT="no" -# Prelink binarys and librarys - PRELINK_SUPPORT="yes" - # Bootloader to use (syslinux / u-boot / atv-bootloader) BOOTLOADER="syslinux" diff --git a/scripts/image b/scripts/image index 631336fb3d..d02ffc9572 100755 --- a/scripts/image +++ b/scripts/image @@ -159,13 +159,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" $STRIP --strip-debug $MOD done -if [ "$PRELINK_SUPPORT" = "yes" ]; then - $SCRIPTS/install prelink-cross - LINKER=`basename $INSTALL/lib/ld-linux*` - $TOOLCHAIN/sbin/prelink -amRvf --root=$INSTALL --dynamic-linker /lib/$LINKER - rm -rf $INSTALL/etc/prelink.conf -fi - # make target dir mkdir -p $TARGET_IMG rm -rf $TARGET_IMG/$IMAGE_NAME.kernel