jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildsystem: die if a kernel config is not available

Browse Source
This commit is contained in:
MilhouseVH 2019-06-15 06:15:17 +01:00
parent b6027210f5
commit 8a7f1edad0
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/functions
View File

@ -989,8 +989,10 @@ kernel_config_path() {
$pkg_linux_dir/config/$config_name \ $pkg_linux_dir/config/$config_name \
; do ; do
[[ $cfg =~ /devices//linux/ ]] && continue [[ $cfg =~ /devices//linux/ ]] && continue
[ -f "$cfg" ] && echo "$cfg" && break [ -f "$cfg" ] && echo "$cfg" && return
done done
die "ERROR: Unable to locate kernel config for ${LINUX} - looking for ${config_name}"
} }
kernel_make() { kernel_make() {

4
packages/linux-firmware/kernel-firmware/package.mk
View File

@ -48,10 +48,12 @@ makeinstall_target() {
done < "${fwlist}" done < "${fwlist}"
done done
PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die
# The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead. # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead.
# They are also not required at all if the kernel is not suitably configured. # They are also not required at all if the kernel is not suitably configured.
if listcontains "${FIRMWARE}" "brcmfmac_sdio-firmware-rpi" || \ if listcontains "${FIRMWARE}" "brcmfmac_sdio-firmware-rpi" || \
! grep -q "^CONFIG_BRCMFMAC_SDIO=y" $(kernel_config_path); then ! grep -q "^CONFIG_BRCMFMAC_SDIO=y" ${PKG_KERNEL_CFG_FILE}; then
rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.* rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.*
rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.* rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.*
fi fi

2
packages/linux/package.mk
View File

@ -36,7 +36,7 @@ case "$LINUX" in
;; ;;
esac esac
PKG_KERNEL_CFG_FILE=$(kernel_config_path) PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die
if [ -n "$KERNEL_TOOLCHAIN" ]; then if [ -n "$KERNEL_TOOLCHAIN" ]; then
PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-arm-$KERNEL_TOOLCHAIN:host" PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-arm-$KERNEL_TOOLCHAIN:host"