mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge pull request #3483 from MilhouseVH/le10_equality_fixup
packages: use single = not == for string comparison
This commit is contained in:
commit
9ba70c2b8d
@ -14,7 +14,7 @@ PKG_BUILD_FLAGS="-gold"
|
|||||||
# Dependencies
|
# Dependencies
|
||||||
get_graphicdrivers
|
get_graphicdrivers
|
||||||
|
|
||||||
if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
|
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
|
||||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
|
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -40,7 +40,7 @@ pre_configure_target() {
|
|||||||
CFLAGS="$CFLAGS -I$(get_build_dir gnutls)/.INSTALL_PKG/usr/include"
|
CFLAGS="$CFLAGS -I$(get_build_dir gnutls)/.INSTALL_PKG/usr/include"
|
||||||
LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"
|
LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"
|
||||||
|
|
||||||
if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
|
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
|
||||||
CFLAGS="$CFLAGS -DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL"
|
CFLAGS="$CFLAGS -DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL"
|
||||||
PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
|
PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
|
||||||
fi
|
fi
|
||||||
@ -48,7 +48,7 @@ pre_configure_target() {
|
|||||||
# HW encoders
|
# HW encoders
|
||||||
|
|
||||||
# RPi 0-3
|
# RPi 0-3
|
||||||
if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
|
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
|
||||||
PKG_FFMPEG_HW_ENCODERS_RPi="\
|
PKG_FFMPEG_HW_ENCODERS_RPi="\
|
||||||
`#Video encoders` \
|
`#Video encoders` \
|
||||||
--enable-omx-rpi \
|
--enable-omx-rpi \
|
||||||
|
@ -21,9 +21,9 @@ make_target() {
|
|||||||
PTR64="0"
|
PTR64="0"
|
||||||
NOASM="0"
|
NOASM="0"
|
||||||
|
|
||||||
if [ "$ARCH" == "arm" ]; then
|
if [ "$ARCH" = "arm" ]; then
|
||||||
NOASM="1"
|
NOASM="1"
|
||||||
elif [ "$ARCH" == "x86_64" ]; then
|
elif [ "$ARCH" = "x86_64" ]; then
|
||||||
PTR64="1"
|
PTR64="1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ pre_configure_host() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
make_host() {
|
make_host() {
|
||||||
if [ "$ARCH" == "arm" ]; then
|
if [ "$ARCH" = "arm" ]; then
|
||||||
make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h
|
make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -195,7 +195,7 @@ make_target() {
|
|||||||
|
|
||||||
# arm64 target does not support creating uImage.
|
# arm64 target does not support creating uImage.
|
||||||
# Build Image first, then wrap it using u-boot's mkimage.
|
# Build Image first, then wrap it using u-boot's mkimage.
|
||||||
if [[ "$TARGET_KERNEL_ARCH" == "arm64" && "$KERNEL_TARGET" == uImage* ]]; then
|
if [[ "$TARGET_KERNEL_ARCH" = "arm64" && "$KERNEL_TARGET" = uImage* ]]; then
|
||||||
if [ -z "$KERNEL_UIMAGE_LOADADDR" -o -z "$KERNEL_UIMAGE_ENTRYADDR" ]; then
|
if [ -z "$KERNEL_UIMAGE_LOADADDR" -o -z "$KERNEL_UIMAGE_ENTRYADDR" ]; then
|
||||||
die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting"
|
die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting"
|
||||||
fi
|
fi
|
||||||
|
@ -185,8 +185,8 @@ def dep_resolve(node, resolved, unresolved, noreorder):
|
|||||||
for edge in node.edges:
|
for edge in node.edges:
|
||||||
if edge not in resolved:
|
if edge not in resolved:
|
||||||
if edge in unresolved:
|
if edge in unresolved:
|
||||||
raise Exception('Circular reference detected: %s -> %s\nRemove %s from %s package.mk::PKG_DEPENDS_%s' % \
|
raise Exception('Circular reference detected: %s -> %s\nRemove %s from %s package.mk::PKG_DEPENDS_%s' % \
|
||||||
(node.fqname, edge.commonName(), edge.commonName(), node.name, node.target.upper()))
|
(node.fqname, edge.commonName(), edge.commonName(), node.name, node.target.upper()))
|
||||||
dep_resolve(edge, resolved, unresolved, noreorder)
|
dep_resolve(edge, resolved, unresolved, noreorder)
|
||||||
|
|
||||||
if node not in resolved:
|
if node not in resolved:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user