From 5a40ed915d7b376d461fd26e07902006c0f84dcf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 20 Dec 2013 16:07:40 +0100 Subject: [PATCH] arm-mem: convert to new package format Signed-off-by: Stephan Raue --- packages/devel/arm-mem/build | 27 -------------- packages/devel/arm-mem/install | 29 --------------- packages/devel/arm-mem/{meta => package.mk} | 28 +++++++++++++-- packages/devel/eglibc/package.mk | 2 +- .../initramfs/devel/arm-mem-initramfs/install | 31 ---------------- .../initramfs/devel/arm-mem-initramfs/meta | 36 ------------------- 6 files changed, 27 insertions(+), 126 deletions(-) delete mode 100755 packages/devel/arm-mem/build delete mode 100755 packages/devel/arm-mem/install rename packages/devel/arm-mem/{meta => package.mk} (75%) delete mode 100755 packages/initramfs/devel/arm-mem-initramfs/install delete mode 100644 packages/initramfs/devel/arm-mem-initramfs/meta diff --git a/packages/devel/arm-mem/build b/packages/devel/arm-mem/build deleted file mode 100755 index a877c396c3..0000000000 --- a/packages/devel/arm-mem/build +++ /dev/null @@ -1,27 +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 - -cd $PKG_BUILD - -make libarmmem.so diff --git a/packages/devel/arm-mem/install b/packages/devel/arm-mem/install deleted file mode 100755 index 4f30da30db..0000000000 --- a/packages/devel/arm-mem/install +++ /dev/null @@ -1,29 +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/lib - cp -P $PKG_BUILD/*.so* $INSTALL/lib - -mkdir -p $INSTALL/etc - echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload diff --git a/packages/devel/arm-mem/meta b/packages/devel/arm-mem/package.mk similarity index 75% rename from packages/devel/arm-mem/meta rename to packages/devel/arm-mem/package.mk index 3525492cbd..a2906704cb 100644 --- a/packages/devel/arm-mem/meta +++ b/packages/devel/arm-mem/package.mk @@ -26,11 +26,35 @@ PKG_LICENSE="GPL" PKG_SITE="https://github.com/bavison/arm-mem" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_TARGET="toolchain" +PKG_BUILD_DEPENDS_INIT="toolchain" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="arm-mem: ARM-accelerated versions of selected functions from string.h" PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h" -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_MAKE_OPTS_TARGET="libarmmem.so" + +make_init() { + : # reuse make_target() +} + +makeinstall_target() { + mkdir -p $INSTALL/lib + cp -P libarmmem.so $INSTALL/lib + + mkdir -p $INSTALL/etc + echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload +} + +makeinstall_init() { + mkdir -p $INSTALL/lib + cp -P libarmmem.so $INSTALL/lib + + mkdir -p $INSTALL/etc + echo "/lib/libarmmem.so" >> $INSTALL/etc/ld.so.preload +} + diff --git a/packages/devel/eglibc/package.mk b/packages/devel/eglibc/package.mk index f9887f4c5c..e6d14a366d 100644 --- a/packages/devel/eglibc/package.mk +++ b/packages/devel/eglibc/package.mk @@ -38,7 +38,7 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$XBMCPLAYER_DRIVER" = "bcm2835-driver" ]; then - PKG_DEPENDS="$PKG_DEPENDS arm-mem" + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem" PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT arm-mem:init" fi diff --git a/packages/initramfs/devel/arm-mem-initramfs/install b/packages/initramfs/devel/arm-mem-initramfs/install deleted file mode 100755 index bfffd2db05..0000000000 --- a/packages/initramfs/devel/arm-mem-initramfs/install +++ /dev/null @@ -1,31 +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 - -ARMMEM_DIR="$BUILD/arm-mem-*" - -mkdir -p $INSTALL/lib - cp -P $ARMMEM_DIR/*.so* $INSTALL/lib - -mkdir -p $INSTALL/etc - echo "/lib/libarmmem.so" > $INSTALL/etc/ld.so.preload diff --git a/packages/initramfs/devel/arm-mem-initramfs/meta b/packages/initramfs/devel/arm-mem-initramfs/meta deleted file mode 100644 index 891c2db126..0000000000 --- a/packages/initramfs/devel/arm-mem-initramfs/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="arm-mem" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="arm" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/bavison/arm-mem" -PKG_URL="" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="devel" -PKG_SHORTDESC="arm-mem: ARM-accelerated versions of selected functions from string.h" -PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h" -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no"