From 02d5330409810a2bbc60b4c83eebea4c90f89bb2 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:44 +0000 Subject: [PATCH] debug: automated code cleanup Signed-off-by: Ian Leonard --- packages/debug/edid-decode/package.mk | 10 +++++----- packages/debug/gdb/package.mk | 10 +++++----- packages/debug/libunwind/package.mk | 2 +- packages/debug/libva-utils/package.mk | 6 +++--- packages/debug/memtester/package.mk | 4 ++-- packages/debug/vadumpcaps/package.mk | 6 +++--- packages/debug/valgrind/package.mk | 6 +++--- packages/debug/vdpauinfo/package.mk | 2 +- packages/debug/xorg-intel-gpu-tools/package.mk | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/debug/edid-decode/package.mk b/packages/debug/edid-decode/package.mk index ab20880272..d3263f68f1 100644 --- a/packages/debug/edid-decode/package.mk +++ b/packages/debug/edid-decode/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="15df4aebf06da579241c58949493b866139d0e2b" PKG_SHA256="58743c8ba768134ef1421e1ce9f4edf0eafdae29377fe5b8f4cb285f16dc142e" PKG_LICENSE="None" PKG_SITE="https://git.linuxtv.org/edid-decode.git/" -PKG_URL="https://git.linuxtv.org/edid-decode.git/snapshot/$PKG_VERSION.tar.xz" +PKG_URL="https://git.linuxtv.org/edid-decode.git/snapshot/${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Decode EDID data in human-readable format" make_target() { - echo "$CC $CFLAGS -Wall $LDFLAGS -o edid-decode edid-decode.c -lm" - $CC $CFLAGS -Wall $LDFLAGS -o edid-decode edid-decode.c -lm + echo "${CC} ${CFLAGS} -Wall ${LDFLAGS} -o edid-decode edid-decode.c -lm" + ${CC} ${CFLAGS} -Wall ${LDFLAGS} -o edid-decode edid-decode.c -lm } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp edid-decode $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp edid-decode ${INSTALL}/usr/bin } diff --git a/packages/debug/gdb/package.mk b/packages/debug/gdb/package.mk index 4828267623..adaa370db2 100644 --- a/packages/debug/gdb/package.mk +++ b/packages/debug/gdb/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="10.1" PKG_SHA256="f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/gdb/" -PKG_URL="https://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnu.org/gnu/gdb/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib ncurses expat" PKG_DEPENDS_HOST="toolchain:host zlib:host ncurses:host expat:host" PKG_LONGDESC="GNU Project debugger, allows you to see what is going on inside another program while it executes." @@ -43,14 +43,14 @@ PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_COMMON} \ --target=${TARGET_NAME}" pre_configure_target() { - CC_FOR_BUILD="$HOST_CC" - CFLAGS_FOR_BUILD="$HOST_CFLAGS" + CC_FOR_BUILD="${HOST_CC}" + CFLAGS_FOR_BUILD="${HOST_CFLAGS}" } makeinstall_target() { - make DESTDIR=$INSTALL install + make DESTDIR=${INSTALL} install } post_makeinstall_target() { - rm -rf $INSTALL/usr/share/gdb/python + rm -rf ${INSTALL}/usr/share/gdb/python } diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk index 7faae4cdf2..e45a6864ac 100644 --- a/packages/debug/libunwind/package.mk +++ b/packages/debug/libunwind/package.mk @@ -18,5 +18,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-tests" makeinstall_target() { - make DESTDIR=$SYSROOT_PREFIX install + make DESTDIR=${SYSROOT_PREFIX} install } diff --git a/packages/debug/libva-utils/package.mk b/packages/debug/libva-utils/package.mk index a96393a791..8850f31dd5 100644 --- a/packages/debug/libva-utils/package.mk +++ b/packages/debug/libva-utils/package.mk @@ -6,11 +6,11 @@ PKG_VERSION="2.10.0" PKG_SHA256="cbb7f9f6eae21d772e31b67bc8c311be6e35fe9c65e63acc57f9b16d72bf8dc0" PKG_LICENSE="GPL" PKG_SITE="https://github.com/01org/libva-utils" -PKG_URL="https://github.com/intel/libva-utils/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/libva-utils/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Libva-utils is a collection of tests for VA-API (VIdeo Acceleration API)" PKG_TOOLCHAIN="meson" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET="toolchain libva libdrm libX11" DISPLAYSERVER_LIBVA="-Dx11=true" else @@ -19,7 +19,7 @@ else fi PKG_MESON_OPTS_TARGET="-Ddrm=true \ - $DISPLAYSERVER_LIBVA \ + ${DISPLAYSERVER_LIBVA} \ -Dwayland=false \ -Dtests=false" diff --git a/packages/debug/memtester/package.mk b/packages/debug/memtester/package.mk index 41604a7412..399579e7c7 100644 --- a/packages/debug/memtester/package.mk +++ b/packages/debug/memtester/package.mk @@ -16,6 +16,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp memtester $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp memtester ${INSTALL}/usr/bin } diff --git a/packages/debug/vadumpcaps/package.mk b/packages/debug/vadumpcaps/package.mk index bee3fbff41..14fc9bd850 100644 --- a/packages/debug/vadumpcaps/package.mk +++ b/packages/debug/vadumpcaps/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="fb4dfef76c0fa08f853af377d5d4945d5fb3001c" PKG_SHA256="4362084e366ef66dc6bd9336baa570a5b459dade57783b24001b2847818a8b69" PKG_LICENSE="GPL" PKG_SITE="https://github.com/fhvwy/vadumpcaps" -PKG_URL="https://github.com/fhvwy/vadumpcaps/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/fhvwy/vadumpcaps/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="This is a utility to show all capabilities of a VAAPI device/driver." PKG_DEPENDS_TARGET="toolchain libva" PKG_TOOLCHAIN="make" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp vadumpcaps $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp vadumpcaps ${INSTALL}/usr/bin } diff --git a/packages/debug/valgrind/package.mk b/packages/debug/valgrind/package.mk index eba0afab2f..e9d5b9fb17 100644 --- a/packages/debug/valgrind/package.mk +++ b/packages/debug/valgrind/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="3.16.1" PKG_SHA256="c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" PKG_LICENSE="GPL" PKG_SITE="http://valgrind.org/" -PKG_URL="ftp://sourceware.org/pub/valgrind/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://sourceware.org/pub/valgrind/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A tool to help find memory-management problems in programs" -if [ "$TARGET_ARCH" = "arm" ]; then +if [ "${TARGET_ARCH}" = "arm" ]; then PKG_CONFIGURE_OPTS_TARGET="--enable-only32bit" -elif [ "$TARGET_ARCH" = "aarch64" -o "$TARGET_ARCH" = "x86_64" ]; then +elif [ "${TARGET_ARCH}" = "aarch64" -o "${TARGET_ARCH}" = "x86_64" ]; then PKG_CONFIGURE_OPTS_TARGET="--enable-only64bit" fi diff --git a/packages/debug/vdpauinfo/package.mk b/packages/debug/vdpauinfo/package.mk index b8725e2164..6e373d1c3f 100644 --- a/packages/debug/vdpauinfo/package.mk +++ b/packages/debug/vdpauinfo/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="1.0" PKG_SHA256="4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/VDPAU" -PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libvdpau" PKG_LONGDESC="A tool to show vdpau infos." diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk index 79b453aa8e..9918319e8e 100644 --- a/packages/debug/xorg-intel-gpu-tools/package.mk +++ b/packages/debug/xorg-intel-gpu-tools/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="2257a73d6a5d431dfbea4dec0dae07397b1e3269416049ced978550853616a2b" PKG_LICENSE="GPL" PKG_DEPENDS_TARGET="toolchain cairo procps-ng" PKG_SITE="https://github.com/freedesktop/xorg-intel-gpu-tools" -PKG_URL="https://github.com/freedesktop/xorg-intel-gpu-tools/archive/igt-gpu-tools-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/freedesktop/xorg-intel-gpu-tools/archive/igt-gpu-tools-${PKG_VERSION}.tar.gz" PKG_LONGDESC="Test suite and tools for DRM/KMS drivers" PKG_TOOLCHAIN="meson"