diff --git a/packages/initramfs/package.mk b/packages/initramfs/package.mk index 0c01466e41..ed6362bec8 100644 --- a/packages/initramfs/package.mk +++ b/packages/initramfs/package.mk @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS="eglibc-initramfs busybox-initramfs linux-initramfs plymouth-lite diskdev_cmds:init" +PKG_DEPENDS="eglibc-initramfs busybox-initramfs linux-initramfs plymouth-lite:init diskdev_cmds:init" PKG_BUILD_DEPENDS_TARGET="toolchain eglibc-initramfs busybox-initramfs" PKG_PRIORITY="optional" PKG_SECTION="virtual" diff --git a/packages/initramfs/sysutils/plymouth-lite/build b/packages/initramfs/sysutils/plymouth-lite/build deleted file mode 100755 index 3509d65826..0000000000 --- a/packages/initramfs/sysutils/plymouth-lite/build +++ /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 - -LDFLAGS="$LDFLAGS -fwhole-program" - -cd $PKG_BUILD - -make diff --git a/packages/initramfs/sysutils/plymouth-lite/install b/packages/initramfs/sysutils/plymouth-lite/install deleted file mode 100755 index c9e714b758..0000000000 --- a/packages/initramfs/sysutils/plymouth-lite/install +++ /dev/null @@ -1,37 +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/bin - cp $PKG_BUILD/ply-image $INSTALL/bin - -mkdir -p $INSTALL/splash - if [ -f $PROJECT_DIR/$PROJECT/splash/splash.conf ]; then - cp $PROJECT_DIR/$PROJECT/splash/splash.conf $INSTALL/splash - cp $PROJECT_DIR/$PROJECT/splash/*.png $INSTALL/splash - elif [ -f $PROJECT_DIR/$PROJECT/splash/splash-1024.png \ - -o -f $PROJECT_DIR/$PROJECT/splash/splash-full.png ]; then - cp $PROJECT_DIR/$PROJECT/splash/splash-*.png $INSTALL/splash - else - cp $PKG_DIR/splash/splash-*.png $INSTALL/splash - fi diff --git a/packages/initramfs/sysutils/plymouth-lite/meta b/packages/tools/plymouth-lite/package.mk similarity index 65% rename from packages/initramfs/sysutils/plymouth-lite/meta rename to packages/tools/plymouth-lite/package.mk index 9ef4bbd744..afac81aa0a 100644 --- a/packages/initramfs/sysutils/plymouth-lite/meta +++ b/packages/tools/plymouth-lite/package.mk @@ -26,15 +26,39 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.meego.com" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="gcc-initramfs zlib:init" -PKG_BUILD_DEPENDS="toolchain zlib libpng" +PKG_BUILD_DEPENDS_INIT="toolchain zlib libpng" PKG_PRIORITY="optional" -PKG_SECTION="system" +PKG_SECTION="tools" PKG_SHORTDESC="plymouth-lite: Boot splash screen based on Fedora's Plymouth code" PKG_LONGDESC="Boot splash screen based on Fedora's Plymouth code" -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$UVESAFB_SUPPORT" = yes ]; then PKG_DEPENDS="$PKG_DEPENDS v86d:init" fi + +pre_configure_init() { + export LDFLAGS="$LDFLAGS -fwhole-program" + + # plymouth-lite dont support to build in subdirs + cd $ROOT/$PKG_BUILD + rm -rf .$TARGET_NAME-init +} + +makeinstall_init() { + mkdir -p $INSTALL/bin + cp ply-image $INSTALL/bin + + mkdir -p $INSTALL/splash + if [ -f $PROJECT_DIR/$PROJECT/splash/splash.conf ]; then + cp $PROJECT_DIR/$PROJECT/splash/splash.conf $INSTALL/splash + cp $PROJECT_DIR/$PROJECT/splash/*.png $INSTALL/splash + elif [ -f $PROJECT_DIR/$PROJECT/splash/splash-1024.png \ + -o -f $PROJECT_DIR/$PROJECT/splash/splash-full.png ]; then + cp $PROJECT_DIR/$PROJECT/splash/splash-*.png $INSTALL/splash + else + cp $PKG_DIR/splash/splash-*.png $INSTALL/splash + fi +} diff --git a/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-01-fix-build.patch b/packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-01-fix-build.patch similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-01-fix-build.patch rename to packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-01-fix-build.patch diff --git a/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-02-libpng_1.4.0.patch b/packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-02-libpng_1.4.0.patch similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-02-libpng_1.4.0.patch rename to packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-02-libpng_1.4.0.patch diff --git a/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-11-cursor.patch b/packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-11-cursor.patch similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-11-cursor.patch rename to packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-11-cursor.patch diff --git a/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-12-resize.patch b/packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-12-resize.patch similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-12-resize.patch rename to packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-12-resize.patch diff --git a/packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-21-16bpp.patch b/packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-21-16bpp.patch similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/patches/plymouth-lite-0.6.0-21-16bpp.patch rename to packages/tools/plymouth-lite/patches/plymouth-lite-0.6.0-21-16bpp.patch diff --git a/packages/initramfs/sysutils/plymouth-lite/splash/backup/splash-1024.png b/packages/tools/plymouth-lite/splash/backup/splash-1024.png similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/splash/backup/splash-1024.png rename to packages/tools/plymouth-lite/splash/backup/splash-1024.png diff --git a/packages/initramfs/sysutils/plymouth-lite/splash/backup/splash-full.png b/packages/tools/plymouth-lite/splash/backup/splash-full.png similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/splash/backup/splash-full.png rename to packages/tools/plymouth-lite/splash/backup/splash-full.png diff --git a/packages/initramfs/sysutils/plymouth-lite/splash/backup/splash1.png b/packages/tools/plymouth-lite/splash/backup/splash1.png similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/splash/backup/splash1.png rename to packages/tools/plymouth-lite/splash/backup/splash1.png diff --git a/packages/initramfs/sysutils/plymouth-lite/splash/backup/splash2.png b/packages/tools/plymouth-lite/splash/backup/splash2.png similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/splash/backup/splash2.png rename to packages/tools/plymouth-lite/splash/backup/splash2.png diff --git a/packages/initramfs/sysutils/plymouth-lite/splash/splash-1024.png b/packages/tools/plymouth-lite/splash/splash-1024.png similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/splash/splash-1024.png rename to packages/tools/plymouth-lite/splash/splash-1024.png diff --git a/packages/initramfs/sysutils/plymouth-lite/splash/splash-full.png b/packages/tools/plymouth-lite/splash/splash-full.png similarity index 100% rename from packages/initramfs/sysutils/plymouth-lite/splash/splash-full.png rename to packages/tools/plymouth-lite/splash/splash-full.png