From 3d8c2d8522f43d78afd6b59473913d7862532eb3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 12 Aug 2013 17:56:40 +0200
Subject: [PATCH] installer: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/tools/installer/install              | 33 -------------------
 packages/tools/installer/{meta => package.mk} | 27 +++++++++++++--
 packages/tools/installer/scripts/installer    |  1 +
 3 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100755 packages/tools/installer/install
 rename packages/tools/installer/{meta => package.mk} (73%)

diff --git a/packages/tools/installer/install b/packages/tools/installer/install
deleted file mode 100755
index 177c1f94e5..0000000000
--- a/packages/tools/installer/install
+++ /dev/null
@@ -1,33 +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/usr/bin
-  cp $PKG_DIR/scripts/installer $INSTALL/usr/bin
-
-mkdir -p $INSTALL/etc
-  if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then
-    cp $PROJECT_DIR/$PROJECT/installer/installer.conf $INSTALL/etc
-  else
-    cp $PKG_DIR/config/installer.conf $INSTALL/etc
-  fi
diff --git a/packages/tools/installer/meta b/packages/tools/installer/package.mk
similarity index 73%
rename from packages/tools/installer/meta
rename to packages/tools/installer/package.mk
index 4b91990400..b99c8f0a2c 100644
--- a/packages/tools/installer/meta
+++ b/packages/tools/installer/package.mk
@@ -19,22 +19,43 @@
 ################################################################################
 
 PKG_NAME="installer"
-PKG_VERSION=""
+PKG_VERSION="1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv/"
 PKG_URL=""
 PKG_DEPENDS="busybox dialog parted e2fsprogs syslinux"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
 PKG_SHORTDESC="installer: OpenELEC.tv Install manager"
 PKG_LONGDESC="OpenELEC.tv Install manager to install the system on any disk"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
   PKG_DEPENDS="$PKG_DEPENDS flashrom"
 fi
+
+pre_build_target() {
+  mkdir -p $ROOT/$BUILD/$PKG_NAME-$PKG_VERSION
+  PKG_BUILD="$ROOT/$BUILD/$PKG_NAME-$PKG_VERSION"
+}
+
+make_target() {
+  : # nothing to make here
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+    cp $PKG_DIR/scripts/installer $INSTALL/usr/bin
+
+  mkdir -p $INSTALL/etc
+    if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then
+      cp $PROJECT_DIR/$PROJECT/installer/installer.conf $INSTALL/etc
+    else
+      cp $PKG_DIR/config/installer.conf $INSTALL/etc
+    fi
+}
diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer
index 56b5a1b3d7..370f800497 100755
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@@ -752,6 +752,7 @@ do_poweroff() {
   [ "$BETA" = "yes" ] && msg_warning_beta
 
   while true; do
+    clear
     menu_main
   done