diff --git a/config/functions b/config/functions index ee9b636886..2db7df64f8 100644 --- a/config/functions +++ b/config/functions @@ -1010,6 +1010,12 @@ source_package() { [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)" fi + if [ -n "${PKG_IS_KERNEL_PKG}" -a "${PKG_NAME}" != "linux" ]; then + PKG_DEPENDS_TARGET="toolchain linux ${PKG_DEPENDS_TARGET}" + PKG_DEPENDS_UNPACK="linux ${PKG_DEPENDS_UNPACK}" + PKG_NEED_UNPACK="${LINUX_DEPENDS} ${PKG_NEED_UNPACK}" + fi + if [ -n "${PKG_DEPENDS_UNPACK}" ]; then for _p in ${PKG_DEPENDS_UNPACK}; do PKG_NEED_UNPACK+=" $(get_pkg_directory ${_p})" diff --git a/packages/addons/driver/sapphire/package.mk b/packages/addons/driver/sapphire/package.mk index 0c8ddf28a6..2b03f76f5d 100644 --- a/packages/addons/driver/sapphire/package.mk +++ b/packages/addons/driver/sapphire/package.mk @@ -9,7 +9,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://libreelec.tv" PKG_URL="http://www.rtr.ca/sapphire_remote/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux bash" +PKG_DEPENDS_TARGET="bash" PKG_SECTION="driver.remote" PKG_SHORTDESC="A Linux driver to add support for sapphire remotes" PKG_LONGDESC="A Linux driver to add support for sapphire remotes" diff --git a/packages/linux-driver-addons/dvb/crazycat/package.mk b/packages/linux-driver-addons/dvb/crazycat/package.mk index 2cc34987de..5feeb4aa13 100644 --- a/packages/linux-driver-addons/dvb/crazycat/package.mk +++ b/packages/linux-driver-addons/dvb/crazycat/package.mk @@ -7,8 +7,8 @@ PKG_SHA256="6b44a96d82c4a3e052864a995baceaede46b37c048c5718a6f62a009492d08ff" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/CrazyCat/media_build" PKG_URL="https://bitbucket.org/CrazyCat/media_build/get/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux media_tree_cc" -PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory media_tree_cc)" +PKG_DEPENDS_TARGET="media_tree_cc" +PKG_NEED_UNPACK="$(get_pkg_directory media_tree_cc)" PKG_SECTION="driver.dvb" PKG_LONGDESC="DVB driver for TBS cards with CrazyCats additions" diff --git a/packages/linux-driver-addons/dvb/dvb-latest/package.mk b/packages/linux-driver-addons/dvb/dvb-latest/package.mk index 6a58f3a1ea..b55bd8f8e7 100644 --- a/packages/linux-driver-addons/dvb/dvb-latest/package.mk +++ b/packages/linux-driver-addons/dvb/dvb-latest/package.mk @@ -7,8 +7,8 @@ PKG_SHA256="71294995cff2bc556bcf9aa7ade595a4ccd91a1972b73d1e537d99d2ce86dbed" PKG_LICENSE="GPL" PKG_SITE="http://git.linuxtv.org/media_build.git" PKG_URL="https://git.linuxtv.org/media_build.git/snapshot/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux media_tree" -PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory media_tree)" +PKG_DEPENDS_TARGET="media_tree" +PKG_NEED_UNPACK="$(get_pkg_directory media_tree)" PKG_SECTION="driver.dvb" PKG_LONGDESC="DVB drivers from the latest kernel (media_build)" diff --git a/packages/linux-drivers/RTL8188EU/package.mk b/packages/linux-drivers/RTL8188EU/package.mk index d9574b9f7a..c1432c14d3 100644 --- a/packages/linux-drivers/RTL8188EU/package.mk +++ b/packages/linux-drivers/RTL8188EU/package.mk @@ -9,8 +9,6 @@ PKG_LICENSE="GPL" # realtek: PKG_SITE="http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PFid=48&Level=5&Conn=4&ProdID=274&DownTypeID=3&GetDown=false&Downloads=true" PKG_SITE="https://github.com/lwfinger/rtl8188eu" PKG_URL="https://github.com/lwfinger/rtl8188eu/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Realtek RTL81xxEU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/RTL8192CU/package.mk b/packages/linux-drivers/RTL8192CU/package.mk index 9db216f0c4..3fa1a529f5 100644 --- a/packages/linux-drivers/RTL8192CU/package.mk +++ b/packages/linux-drivers/RTL8192CU/package.mk @@ -8,8 +8,6 @@ PKG_SHA256="1488e6fdfc51d7a7ec8fb95d1c3b212d64f3e66e8d2f7e6637bf3dd642a75289" PKG_LICENSE="GPL" PKG_SITE="https://github.com/pvaret/rtl8192cu-fixes" PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Realtek RTL81xxCU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk index 397d5079e4..521e671faf 100644 --- a/packages/linux-drivers/RTL8192DU/package.mk +++ b/packages/linux-drivers/RTL8192DU/package.mk @@ -8,8 +8,6 @@ PKG_SHA256="63007fe5a19606303b4666ec54fe48527c9504e136c6e30f5f119a39517115cf" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lwfinger/rtl8192du" PKG_URL="https://github.com/lwfinger/rtl8192du/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Realtek RTL8192DU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk index 0c4f20746f..ed52ad77a5 100644 --- a/packages/linux-drivers/RTL8192EU/package.mk +++ b/packages/linux-drivers/RTL8192EU/package.mk @@ -8,8 +8,6 @@ PKG_SHA256="09b6bf64ea0686a4ecc6ec25191b32e384b903edf9cc1d2f891c56cf7b7e6d5e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver" PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Realtek RTL8192EU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk index bc235c3fa6..bdc6b9038a 100644 --- a/packages/linux-drivers/RTL8812AU/package.mk +++ b/packages/linux-drivers/RTL8812AU/package.mk @@ -8,8 +8,6 @@ PKG_SHA256="fa8f55a1998f860c4629c6e5ccc79e01164fbcfd59fb511fd22027962dc2d36a" PKG_LICENSE="GPL" PKG_SITE="https://github.com/MilhouseVH/RTL8812AU" PKG_URL="https://github.com/MilhouseVH/RTL8812AU/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Realtek RTL8812AU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/bcm_sta/package.mk b/packages/linux-drivers/bcm_sta/package.mk index 0eca39128a..fbe7fa5889 100644 --- a/packages/linux-drivers/bcm_sta/package.mk +++ b/packages/linux-drivers/bcm_sta/package.mk @@ -12,8 +12,6 @@ PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver." PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/intel_nuc_led/package.mk b/packages/linux-drivers/intel_nuc_led/package.mk index c792fe7d7e..eca8137174 100644 --- a/packages/linux-drivers/intel_nuc_led/package.mk +++ b/packages/linux-drivers/intel_nuc_led/package.mk @@ -8,8 +8,6 @@ PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/milesp20/intel_nuc_led/" PKG_URL="https://github.com/milesp20/intel_nuc_led/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="Intel NUC7i[x]BN and NUC6CAY LED Control for Linux" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/mali-bifrost/package.mk b/packages/linux-drivers/mali-bifrost/package.mk index f0d59b4ee5..acd4690379 100644 --- a/packages/linux-drivers/mali-bifrost/package.mk +++ b/packages/linux-drivers/mali-bifrost/package.mk @@ -8,8 +8,6 @@ PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://developer.arm.com/products/software/mali-drivers/bifrost-kernel" PKG_URL="https://github.com/LibreELEC/mali-bifrost/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="mali-bifrost: the Linux kernel driver for ARM Mali Bifrost GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/mali-midgard/package.mk b/packages/linux-drivers/mali-midgard/package.mk index 1e7eeb4118..3e01ba7857 100644 --- a/packages/linux-drivers/mali-midgard/package.mk +++ b/packages/linux-drivers/mali-midgard/package.mk @@ -8,8 +8,6 @@ PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://developer.arm.com/products/software/mali-drivers/" PKG_URL="https://github.com/LibreELEC/mali-midgard/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="mali-midgard: Linux drivers for Mali Midgard GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/mali-utgard/package.mk b/packages/linux-drivers/mali-utgard/package.mk index 2718978dbd..b564b3b2e4 100644 --- a/packages/linux-drivers/mali-utgard/package.mk +++ b/packages/linux-drivers/mali-utgard/package.mk @@ -8,8 +8,6 @@ PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://developer.arm.com/products/software/mali-drivers/utgard-kernel" PKG_URL="https://github.com/LibreELEC/mali-utgard/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="mali-utgard: Linux drivers for Mali Utgard GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" diff --git a/packages/linux-drivers/slice-drivers/package.mk b/packages/linux-drivers/slice-drivers/package.mk index 4c9f8fec45..b8d5418f25 100644 --- a/packages/linux-drivers/slice-drivers/package.mk +++ b/packages/linux-drivers/slice-drivers/package.mk @@ -8,8 +8,6 @@ PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/LibreELEC/slice-drivers" PKG_URL="https://github.com/LibreELEC/slice-drivers/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="linux kernel modules for the Slice box" PKG_IS_KERNEL_PKG="yes"