Merge pull request #3437 from chewitt/fixup_dtname_dtfile

busybox: improvements to dtname/dtfile
This commit is contained in:
MilhouseVH 2019-04-18 01:03:33 +01:00 committed by GitHub
commit c3eae6d415
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
COMPATIBLE=$(cat /proc/device-tree/compatible | tr -d '\000' | sed -n -e 's/.*\(allwinner\|amlogic\|rockchip\).*/\1/p')
COMPATIBLE=$(cat /proc/device-tree/compatible 2>/dev/null | tr -d '\000' | sed -n -e 's/.*\(allwinner\|amlogic\|rockchip\).*/\1/p')
if [ -n "$COMPATIBLE" ]; then
if [ -e /flash/extlinux/extlinux.conf ]; then

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
COMPATIBLE=$(cat /proc/device-tree/compatible | tr -d '\000' | sed -n -e 's/.*\(allwinner\|amlogic\|rockchip\).*/\1/p')
COMPATIBLE=$(cat /proc/device-tree/compatible 2>/dev/null | tr -d '\000' | sed -n -e 's/.*\(allwinner\|amlogic\|rockchip\).*/\1/p')
if [ -n "$COMPATIBLE" ]; then
DTNAME=$(cat /proc/device-tree/compatible | cut -f1,2 -d',' | head -n 1)