Skip to content

Commit

Permalink
Merge pull request LibreELEC#3483 from MilhouseVH/le10_equality_fixup
Browse files Browse the repository at this point in the history
packages: use single = not == for string comparison
  • Loading branch information
CvH authored May 4, 2019
2 parents f64c57b + c48d80f commit 9ba70c2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions packages/addons/addon-depends/ffmpegx/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PKG_BUILD_FLAGS="-gold"
# Dependencies
get_graphicdrivers

if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
fi

Expand All @@ -40,15 +40,15 @@ pre_configure_target() {
CFLAGS="$CFLAGS -I$(get_build_dir gnutls)/.INSTALL_PKG/usr/include"
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"
PKG_FFMPEG_LIBS="-lbcm_host -ldl -lmmal -lmmal_core -lmmal_util -lvchiq_arm -lvcos -lvcsm"
fi

# HW encoders

# RPi 0-3
if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
if [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_FFMPEG_HW_ENCODERS_RPi="\
`#Video encoders` \
--enable-omx-rpi \
Expand Down
4 changes: 2 additions & 2 deletions packages/emulation/libretro-mame/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ make_target() {
PTR64="0"
NOASM="0"

if [ "$ARCH" == "arm" ]; then
if [ "$ARCH" = "arm" ]; then
NOASM="1"
elif [ "$ARCH" == "x86_64" ]; then
elif [ "$ARCH" = "x86_64" ]; then
PTR64="1"
fi

Expand Down
2 changes: 1 addition & 1 deletion packages/emulation/libretro-picodrive/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pre_configure_host() {
}

make_host() {
if [ "$ARCH" == "arm" ]; then
if [ "$ARCH" = "arm" ]; then
make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h
fi
}
Expand Down
2 changes: 1 addition & 1 deletion packages/linux/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ make_target() {

# arm64 target does not support creating uImage.
# 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
die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting"
fi
Expand Down
4 changes: 2 additions & 2 deletions scripts/genbuildplan.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ def dep_resolve(node, resolved, unresolved, noreorder):
for edge in node.edges:
if edge not in resolved:
if edge in unresolved:
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()))
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()))
dep_resolve(edge, resolved, unresolved, noreorder)

if node not in resolved:
Expand Down

0 comments on commit 9ba70c2

Please sign in to comment.