diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 9cf2998d22..61a883b1e5 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -80,7 +80,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/libcap-[0-9]*/libcap/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib diff --git a/packages/devel/attr/build b/packages/devel/attr/build index d111afc6d0..c973115a5c 100755 --- a/packages/devel/attr/build +++ b/packages/devel/attr/build @@ -41,13 +41,13 @@ INSTALL_GROUP=root \ --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ - --enable-shared \ - --disable-static \ + --disable-shared \ + --enable-static \ make mkdir -p $SYSROOT_PREFIX/usr/lib/ - cp -P libattr/.libs/*.so* $SYSROOT_PREFIX/usr/lib/ + cp libattr/.libs/libattr.a $SYSROOT_PREFIX/usr/lib/ mkdir -p $SYSROOT_PREFIX/usr/include/attr - cp -P include/*.h $SYSROOT_PREFIX/usr/include/attr + cp include/*.h $SYSROOT_PREFIX/usr/include/attr diff --git a/packages/devel/attr/install b/packages/devel/attr/install deleted file mode 100755 index 7df7428c31..0000000000 --- a/packages/devel/attr/install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -#      Copyright (C) 2010-2011 Roman Weber (roman@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/usr/lib - cp -P $PKG_BUILD/libattr/.libs/*.so* $INSTALL/usr/lib - diff --git a/packages/devel/libcap/meta b/packages/devel/libcap/meta index ceb0cac5d1..4d5207255d 100644 --- a/packages/devel/libcap/meta +++ b/packages/devel/libcap/meta @@ -29,7 +29,7 @@ PKG_LICENSE="GPL" PKG_SITE="" #PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://www.mirrorservice.org/sites/ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="attr" +PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain attr" PKG_PRIORITY="optional" PKG_SECTION="devel" diff --git a/packages/network/samba/meta b/packages/network/samba/meta index d5d0874a39..75275f7d3f 100644 --- a/packages/network/samba/meta +++ b/packages/network/samba/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.samba.org" PKG_URL="http://samba.org/samba/ftp/stable/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="$ICONV zlib attr connman" +PKG_DEPENDS="$ICONV zlib connman" PKG_BUILD_DEPENDS="toolchain zlib attr $ICONV" PKG_PRIORITY="optional" PKG_SECTION="network" diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta index fa04fc623b..607855565f 100644 --- a/packages/sysutils/systemd/meta +++ b/packages/sysutils/systemd/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="attr libcap dbus kmod util-linux glib libgcrypt" +PKG_DEPENDS="libcap dbus kmod util-linux glib libgcrypt" PKG_BUILD_DEPENDS="toolchain attr libcap dbus kmod util-linux glib libgcrypt" PKG_PRIORITY="required" PKG_SECTION="system"