From e33f0b9f7632ff72d8b684a138858e9e00230adf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 21 Dec 2013 10:21:29 +0100 Subject: [PATCH] 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 --- packages/tools/berryboot-tools/install | 39 ------------- packages/tools/berryboot-tools/meta | 36 ------------ .../berryboot-tools/scripts/berryboot-init | 56 ------------------- projects/ARCTIC_MC/options | 5 +- projects/ATV/options | 5 +- projects/Generic/options | 5 +- projects/RPi/options | 5 +- projects/Virtual/options | 5 +- scripts/image | 3 - 9 files changed, 15 insertions(+), 144 deletions(-) delete mode 100644 packages/tools/berryboot-tools/install delete mode 100644 packages/tools/berryboot-tools/meta delete mode 100644 packages/tools/berryboot-tools/scripts/berryboot-init diff --git a/packages/tools/berryboot-tools/install b/packages/tools/berryboot-tools/install deleted file mode 100644 index d22fc5c7d0..0000000000 --- a/packages/tools/berryboot-tools/install +++ /dev/null @@ -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 diff --git a/packages/tools/berryboot-tools/meta b/packages/tools/berryboot-tools/meta deleted file mode 100644 index af11d40563..0000000000 --- a/packages/tools/berryboot-tools/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="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" diff --git a/packages/tools/berryboot-tools/scripts/berryboot-init b/packages/tools/berryboot-tools/scripts/berryboot-init deleted file mode 100644 index 87b35f7e04..0000000000 --- a/packages/tools/berryboot-tools/scripts/berryboot-init +++ /dev/null @@ -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 diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options index 7c02c0d47b..2361399d88 100755 --- a/projects/ARCTIC_MC/options +++ b/projects/ARCTIC_MC/options @@ -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 diff --git a/projects/ATV/options b/projects/ATV/options index 28e2fb9697..cb3d86e7ff 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -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 diff --git a/projects/Generic/options b/projects/Generic/options index 2dd063bd88..2282fb5a5f 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -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 diff --git a/projects/RPi/options b/projects/RPi/options index 5606865582..7d8dd8f251 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -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 diff --git a/projects/Virtual/options b/projects/Virtual/options index 6bf7617990..f56fb18777 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -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 diff --git a/scripts/image b/scripts/image index 65018f1d9d..f131a1d046 100755 --- a/scripts/image +++ b/scripts/image @@ -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