diff --git a/config/functions b/config/functions index e9f2976414..3fc07d2ee1 100644 --- a/config/functions +++ b/config/functions @@ -653,6 +653,12 @@ show_config() { config_message="$config_message\n - Include driver:\t\t\t $config_driver" done + if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then + for config_driver_addons in $DRIVER_ADDONS; do + config_message="$config_message\n - Include driver add-ons:\t\t $config_driver_addons" + done + fi + for config_firmware in $FIRMWARE; do config_message="$config_message\n - Include firmware:\t\t\t $config_firmware" done diff --git a/config/path b/config/path index ed96f45eb9..8a0ddc822b 100644 --- a/config/path +++ b/config/path @@ -119,7 +119,7 @@ unset LD_LIBRARY_PATH if [ "$PKG_IS_ADDON" = "yes" ] ; then [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="${PKG_SECTION//\//.}.$PKG_NAME" - PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)" + [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)" fi # Automatically set PKG_SOURCE_NAME unless it is already defined. diff --git a/packages/virtual/linux-drivers/package.mk b/packages/virtual/linux-drivers/package.mk index d44273bb6d..05a5130134 100644 --- a/packages/virtual/linux-drivers/package.mk +++ b/packages/virtual/linux-drivers/package.mk @@ -20,9 +20,13 @@ PKG_NAME="linux-drivers" PKG_VERSION="" PKG_ARCH="any" PKG_LICENSE="GPL" -PKG_SITE="http://www.openelec.tv" +PKG_SITE="https://libreelec.tv" PKG_URL="" PKG_DEPENDS_TARGET="toolchain $ADDITIONAL_DRIVERS" PKG_SECTION="virtual" PKG_SHORTDESC="linux-drivers: Meta package to install additional drivers" PKG_LONGDESC="linux-drivers is a Meta package to install additional drivers" + +if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DRIVER_ADDONS driverselect" +fi diff --git a/projects/Generic/options b/projects/Generic/options index 9364fdb4db..41e6871c9e 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -88,3 +88,11 @@ # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS bcm_sta intel_nuc_led" + + # build and install driver addons (yes / no) + DRIVER_ADDONS_SUPPORT="no" + + # driver addons to install: + # for a list of additinoal drivers see packages/linux-driver-addons + # Space separated list is supported, + DRIVER_ADDONS="" diff --git a/projects/RPi/options b/projects/RPi/options index d8dbb7c474..940d7cc660 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -165,3 +165,11 @@ fi if [ "$DEVICE" = "Slice" -o "$DEVICE" = "Slice3" ]; then ADDITIONAL_DRIVERS="$ADDITIONAL_DRIVERS slice-drivers" fi + + # build and install driver addons (yes / no) + DRIVER_ADDONS_SUPPORT="no" + + # driver addons to install: + # for a list of additinoal drivers see packages/linux-driver-addons + # Space separated list is supported, + DRIVER_ADDONS=""