From ad9e7560c860ec51db16e1c9da7c71ea078e5854 Mon Sep 17 00:00:00 2001
From: Adam Green <greena88@gmail.com>
Date: Fri, 5 Jan 2018 13:47:37 +0000
Subject: [PATCH] buildsystem: add support for building extra packages
 specified in project or device options

this has been added at the end of the virtual debug package as
this is the last point in the build system that any packages are
compiled before images are created
---
 config/show_config                        |  3 +++
 distributions/LibreELEC/options           |  5 ++++
 packages/virtual/misc-packages/package.mk | 28 +++++++++++++++++++++++
 scripts/image                             |  3 +++
 4 files changed, 39 insertions(+)
 create mode 100644 packages/virtual/misc-packages/package.mk

diff --git a/config/show_config b/config/show_config
index dbc90a6522..3de77b49e5 100644
--- a/config/show_config
+++ b/config/show_config
@@ -110,6 +110,9 @@ show_config() {
   fi
   config_message="$config_message\n - UDevil support:\t\t\t $UDEVIL"
   config_message="$config_message\n - Installer support:\t\t\t $INSTALLER_SUPPORT"
+  for config_package in $ADDITIONAL_PACKAGES; do
+    config_message="$config_message\n - Include package:\t\t\t $config_package"
+  done
 
   # Misc. Filesystems
 
diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options
index c90a8883a0..0855ebbd7b 100644
--- a/distributions/LibreELEC/options
+++ b/distributions/LibreELEC/options
@@ -165,6 +165,11 @@
 # swapfile size if SWAP_SUPPORT=yes in MB
   SWAPFILESIZE="128"
 
+# additional packages to install:
+# Space separated list is supported,
+# e.g. ADDITIONAL_PACKAGES="PACKAGE1 PACKAGE2"
+  ADDITIONAL_PACKAGES=""
+
 # build with installer (yes / no)
   INSTALLER_SUPPORT="yes"
 
diff --git a/packages/virtual/misc-packages/package.mk b/packages/virtual/misc-packages/package.mk
new file mode 100644
index 0000000000..f790b1619d
--- /dev/null
+++ b/packages/virtual/misc-packages/package.mk
@@ -0,0 +1,28 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-present 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="misc-packages"
+PKG_VERSION=""
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://libreelec.tv"
+PKG_URL=""
+PKG_DEPENDS_TARGET="toolchain $ADDITIONAL_PACKAGES"
+PKG_SECTION="virtual"
+PKG_SHORTDESC="misc-packages: Metapackage for miscellaneous packages"
+PKG_LONGDESC="misc-packages: Metapackage for miscellaneous packages"
diff --git a/scripts/image b/scripts/image
index fe8e46d9db..d21e067a0a 100755
--- a/scripts/image
+++ b/scripts/image
@@ -182,6 +182,9 @@ $SCRIPTS/install network
 # Remote support
 [ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote
 
+# Install miscellaneous packages
+$SCRIPTS/install misc-packages
+
 # Virtual image creation support
 [ "$PROJECT" = "Generic" ] && $SCRIPTS/install virtual