installer: replace dialog with whiptail

* glibc: include UTF-8 charmap * newt: add dialog replacement * installer: replace dialog with whiptail * installer: small fixes * glibc: only add UTF-8 charmap for Generic project * installer: ditch repair/upgrade mode * installer: cosmetics * mkimage: rebranding and prompt change
LibreELEC · Oct 21, 2016 · 7c882d4 · 7c882d4
2 parents 5d9abe5 + cbb43e5
commit 7c882d4
Show file tree

Hide file tree

Showing 9 changed files with 377 additions and 442 deletions.
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
@@ -64,7 +64,7 @@ fi
 NSS_CONF_DIR="$PKG_BUILD/nss"
 
 GLIBC_EXCLUDE_BIN="catchsegv gencat getconf iconv iconvconfig ldconfig"
-GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump"
+GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN makedb mtrace pcprofiledump"
 GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof xtrace"
 
 pre_build_target() {
@@ -139,6 +139,13 @@ post_makeinstall_target() {
 # remove locales and charmaps
   rm -rf $INSTALL/usr/share/i18n/charmaps
 
+# add UTF-8 charmap for Generic (charmap is needed for installer)
+  if [ "$PROJECT" = "Generic" ]; then
+    mkdir -p $INSTALL/usr/share/i18n/charmaps
+    cp -PR $ROOT/$PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps
+    gzip $INSTALL/usr/share/i18n/charmaps/UTF-8
+  fi
+
   if [ ! "$GLIBC_LOCALES" = yes ]; then
     rm -rf $INSTALL/usr/share/i18n/locales
 

diff --git a/packages/devel/popt/package.mk b/packages/devel/popt/package.mk
@@ -0,0 +1,44 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="popt"
+PKG_VERSION="1.16"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://rpm5.org/files/popt/"
+PKG_URL="http://rpm5.org/files/popt/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="popt: library for parsing command line options."
+PKG_LONGDESC="The popt library exists essentially for parsing command-line options. It is found superior in many ways when compared to parsing the argv array by hand or using the getopt functions getopt() and getopt_long()."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+
+pre_configure_target() {
+ cd $ROOT/$PKG_BUILD
+ rm -rf .$TARGET_NAME
+}
+
+pre_configure_host() {
+ cd $ROOT/$PKG_BUILD
+ rm -rf .$HOST_NAME
+}
diff --git a/packages/devel/slang/package.mk b/packages/devel/slang/package.mk
@@ -0,0 +1,48 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2016 Team LibreELEC
+#
+#  LibreELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC 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 LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="slang"
+PKG_VERSION="2.1.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://s-lang.org/"
+PKG_URL="ftp://space.mit.edu/pub/davis/slang/v2.1/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="slang: multi-platform programmer's library designed to allow a developer to create robust multi-platform software."
+PKG_LONGDESC="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software. It provides facilities required by interactive applications such as display/screen management, keyboard input, keymaps, and so on. The most exciting feature of the library is the slang interpreter that may be easily embedded into a program to make it extensible. While the emphasis has always been on the embedded nature of the interpreter, it may also be used in a stand-alone fashion through the use of slsh, which is part of the S-Lang distribution."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+MAKEFLAGS=-j1
+
+
+pre_configure_target() {
+ # slang fails to build in subdirs
+ cd $ROOT/$PKG_BUILD
+ rm -rf .$TARGET_NAME
+}
+
+pre_configure_host() {
+ # slang fails to build in subdirs
+ cd $ROOT/$PKG_BUILD
+ rm -rf .$HOST_NAME
+}
diff --git a/packages/tools/dialog/package.mk b/packages/tools/dialog/package.mk
diff --git a/packages/tools/installer/config/installer.conf b/packages/tools/installer/config/installer.conf
@@ -15,7 +15,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-# Disklabel for System an Storage partition
+# Disklabel for System and Storage partition
   DISKLABEL_SYSTEM="System"
   DISKLABEL_STORAGE="Storage"
 
@@ -36,3 +36,7 @@
 
 # location for BIOS backup (with filename)
   BIOS_BACKUP=""
+
+# color scheme to use for Whiptail/Newt
+# see http://askubuntu.com/questions/776831/whiptail-change-background-color-dynamically-from-magenta
+  WHIPTAIL_COLORS="root=,magenta;entry=,magenta;label=magenta,;actlistbox=,magenta;roottext=white,magenta"
diff --git a/packages/tools/installer/package.mk b/packages/tools/installer/package.mk
@@ -21,9 +21,9 @@ PKG_VERSION="1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.openelec.tv/"
+PKG_SITE="http://libreelec.tv/"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain busybox dialog parted e2fsprogs syslinux"
+PKG_DEPENDS_TARGET="toolchain busybox newt parted e2fsprogs syslinux"
 PKG_SECTION="tools"
 PKG_SHORTDESC="installer: LibreELEC.tv Install manager"
 PKG_LONGDESC="LibreELEC.tv Install manager to install the system on any disk"