Revert "new package: add package 'berryboot-tools'"

This reverts commit 804e2f52c4e58e8bfc717776867686a5f181788f.

Conflicts:
	projects/ARCTIC_MC/options
	projects/ATV/options
	projects/Fusion/options
	projects/Generic/options
	projects/Generic_OSS/options
	projects/ION/options
	projects/Intel/options
	projects/RPi/options
	projects/Ultra/options
	projects/Virtual/options
This commit is contained in:
Stephan Raue 2013-12-21 10:21:29 +01:00
parent 34625d8417
commit e33f0b9f76
9 changed files with 15 additions and 144 deletions

View File

@ -1,39 +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
PLYMOUTH_DIR="$BUILD/plymouth-lite-*"
PLYMOUTH_PKG_DIR=`find $PACKAGES -type d -name plymouth-lite 2>/dev/null`
mkdir -p $INSTALL
cp $PKG_DIR/scripts/berryboot-init $INSTALL
mkdir -p $INSTALL/bin
cp $PLYMOUTH_DIR/ply-image $INSTALL/bin
mkdir -p $INSTALL/splash
if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then
cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/splash
else
cp $PLYMOUTH_PKG_DIR/splash/splash.png $INSTALL/splash
fi

View File

@ -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="berryboot-tools"
PKG_VERSION="0.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"
PKG_URL=""
PKG_DEPENDS="zlib"
PKG_BUILD_DEPENDS="toolchain zlib libpng plymouth-lite"
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="berryboot-tools: tools for berryboot support"
PKG_LONGDESC="berryboot-tools: tools for berryboot support"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

View File

@ -1,56 +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
################################################################################
UPDATEDIR=${DATADIR}/storage/.update
UPDATEFILE=${UPDATEDIR}/SYSTEM
SPLASHIMAGE="/squashfs/splash/splash.png"
#
# load splash
# berryboot is based on uClibc, so run ply-image via ld.so directly
#
if [ -e /dev/fb0 -a -f "${SPLASHIMAGE}" ]; then
# set framebuffer to a default resolution (1024x768-32)
LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \
/squashfs/bin/busybox fbset -g 1024 768 1024 768 32
# load splash
LD_LIBRARY_PATH=/squashfs/lib /squashfs/lib/ld.so \
/squashfs/bin/ply-image ${SPLASHIMAGE} > /dev/null 2>&1
fi
#
# Check if OpenELEC downloaded an update
#
if [ -f "${UPDATEFILE}" ]; then
echo "Updating OpenELEC..."
cd /
umount -f /squashfs > /dev/null 2>&1
mv -f "${UPDATEFILE}" "/mnt/images/${IMAGE}"
rm -rf "${UPDATEDIR}/*"
sync
echo "Done, rebooting now..."
sleep 5
reboot -f
fi

View File

@ -97,8 +97,9 @@
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# install Berryboot support tools
BERRYBOOT_TOOLS="no"
# GCC to use. values can be:
# default: default mainline gcc
GCC_VERSION="default"
# Kernel to use. values can be:
# default: default mainline kernel

View File

@ -97,8 +97,9 @@
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# install Berryboot support tools
BERRYBOOT_TOOLS="no"
# GCC to use. values can be:
# default: default mainline gcc
GCC_VERSION="default"
# Kernel to use. values can be:
# default: default mainline kernel

View File

@ -97,8 +97,9 @@
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# install Berryboot support tools
BERRYBOOT_TOOLS="no"
# GCC to use. values can be:
# default: default mainline gcc
GCC_VERSION="default"
# Kernel to use. values can be:
# default: default mainline kernel

View File

@ -97,8 +97,9 @@
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# install Berryboot support tools
BERRYBOOT_TOOLS="yes"
# GCC to use. values can be:
# default: default mainline gcc
GCC_VERSION="4.7"
# Kernel to use. values can be:
# default: default mainline kernel

View File

@ -92,8 +92,9 @@
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# install Berryboot support tools
BERRYBOOT_TOOLS="no"
# GCC to use. values can be:
# default: default mainline gcc
GCC_VERSION="default"
# Kernel to use. values can be:
# default: default mainline kernel

View File

@ -138,9 +138,6 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
# Sensors support
[ "$SENSOR_SUPPORT" = "yes" ] && $SCRIPTS/install lm_sensors
# Berryboot support
[ "$BERRYBOOT_TOOLS" = "yes" ] && $SCRIPTS/install berryboot-tools
# Installer support
[ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer