From bc459cf9cb400500d2822ab244e8a5ab8eb0510a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 17 Dec 2013 00:51:11 +0100 Subject: [PATCH] v86d: convert to new package format Signed-off-by: Stephan Raue --- .../initramfs/sysutils/plymouth-lite/meta | 4 +-- packages/initramfs/sysutils/v86d/build | 30 ------------------- packages/initramfs/sysutils/v86d/install | 26 ---------------- .../v86d/meta => sysutils/v86d/package.mk} | 12 ++++++-- .../patches/v86d-0.1.10-crosscompiling.patch | 0 ...6d-0.1.10-dont-include-kernelheaders.patch | 0 6 files changed, 12 insertions(+), 60 deletions(-) delete mode 100755 packages/initramfs/sysutils/v86d/build delete mode 100755 packages/initramfs/sysutils/v86d/install rename packages/{initramfs/sysutils/v86d/meta => sysutils/v86d/package.mk} (90%) rename packages/{initramfs => }/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch (100%) rename packages/{initramfs => }/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch (100%) diff --git a/packages/initramfs/sysutils/plymouth-lite/meta b/packages/initramfs/sysutils/plymouth-lite/meta index 23e43090f4..9ef4bbd744 100644 --- a/packages/initramfs/sysutils/plymouth-lite/meta +++ b/packages/initramfs/sysutils/plymouth-lite/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.meego.com" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="gcc-initramfs zlib-initramfs" +PKG_DEPENDS="gcc-initramfs zlib:init" PKG_BUILD_DEPENDS="toolchain zlib libpng" PKG_PRIORITY="optional" PKG_SECTION="system" @@ -36,5 +36,5 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$UVESAFB_SUPPORT" = yes ]; then - PKG_DEPENDS="$PKG_DEPENDS v86d" + PKG_DEPENDS="$PKG_DEPENDS v86d:init" fi diff --git a/packages/initramfs/sysutils/v86d/build b/packages/initramfs/sysutils/v86d/build deleted file mode 100755 index 0704ba97f3..0000000000 --- a/packages/initramfs/sysutils/v86d/build +++ /dev/null @@ -1,30 +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 - -$SCRIPTS/unpack linux - -cd $PKG_BUILD -./configure --with-x86emu - -make diff --git a/packages/initramfs/sysutils/v86d/install b/packages/initramfs/sysutils/v86d/install deleted file mode 100755 index d4735e4d5a..0000000000 --- a/packages/initramfs/sysutils/v86d/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/sbin - cp -P $PKG_BUILD/v86d $INSTALL/sbin \ No newline at end of file diff --git a/packages/initramfs/sysutils/v86d/meta b/packages/sysutils/v86d/package.mk similarity index 90% rename from packages/initramfs/sysutils/v86d/meta rename to packages/sysutils/v86d/package.mk index e6e232acee..47cc0552e7 100644 --- a/packages/initramfs/sysutils/v86d/meta +++ b/packages/sysutils/v86d/package.mk @@ -26,11 +26,19 @@ 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" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS_INIT="toolchain" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="v86d: A userspace helper that runs x86 code in an emulated environment." PKG_LONGDESC="v86d is the userspace helper that runs x86 code in an emulated environment. uvesafb will not work without v86d. v86d currently supports the x86 and amd64 (x86-64) architectures." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +INIT_CONFIGURE_OPTS="--with-x86emu" + +pre_configure_init() { +# v86d fails to build in subdirs + cd $ROOT/$PKG_BUILD + rm -rf .$TARGET_NAME-init +} diff --git a/packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch b/packages/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch similarity index 100% rename from packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch rename to packages/sysutils/v86d/patches/v86d-0.1.10-crosscompiling.patch diff --git a/packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch b/packages/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch similarity index 100% rename from packages/initramfs/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch rename to packages/sysutils/v86d/patches/v86d-0.1.10-dont-include-kernelheaders.patch