Skip to content

Commit

Permalink
kconfig*.sh: fix shellcheck errors
Browse files Browse the repository at this point in the history
used double-quotes and export

tested with: "shellcheck kconfig-*.sh"

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
  • Loading branch information
plbossart committed Apr 29, 2024
1 parent bf11017 commit 8fee06f
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 90 deletions.
24 changes: 12 additions & 12 deletions kconfig-distro-sof-dev-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

echo "-sof" > localversion
make olddefconfig
make localmodconfig

$COMMAND .config \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/sof-dev-defconfig \
$KCONFIG_DIR/amd-defconfig \
$KCONFIG_DIR/mach-driver-defconfig \
$KCONFIG_DIR/hdaudio-codecs-defconfig \
$KCONFIG_DIR/lock-stall-defconfig \
$KCONFIG_DIR/soundwire-defconfig \
$KCONFIG_DIR/soundwire-codecs-defconfig \
$@
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/sof-dev-defconfig \
"$KCONFIG_DIR"/amd-defconfig \
"$KCONFIG_DIR"/mach-driver-defconfig \
"$KCONFIG_DIR"/hdaudio-codecs-defconfig \
"$KCONFIG_DIR"/lock-stall-defconfig \
"$KCONFIG_DIR"/soundwire-defconfig \
"$KCONFIG_DIR"/soundwire-codecs-defconfig \
"$@"
20 changes: 10 additions & 10 deletions kconfig-distro-sof-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

echo "-sof" > localversion
make olddefconfig
make localmodconfig

$COMMAND .config \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/amd-defconfig \
$KCONFIG_DIR/mach-driver-defconfig \
$KCONFIG_DIR/hdaudio-codecs-defconfig \
$KCONFIG_DIR/lock-stall-defconfig \
$KCONFIG_DIR/soundwire-defconfig \
$@
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/amd-defconfig \
"$KCONFIG_DIR"/mach-driver-defconfig \
"$KCONFIG_DIR"/hdaudio-codecs-defconfig \
"$KCONFIG_DIR"/lock-stall-defconfig \
"$KCONFIG_DIR"/soundwire-defconfig \
"$@"
14 changes: 7 additions & 7 deletions kconfig-hda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

make defconfig
$COMMAND .config \
$KCONFIG_DIR/base-defconfig \
$KCONFIG_DIR/devices-defconfig \
$KCONFIG_DIR/hdaudio-codecs-defconfig \
$@
"$KCONFIG_DIR"/base-defconfig \
"$KCONFIG_DIR"/devices-defconfig \
"$KCONFIG_DIR"/hdaudio-codecs-defconfig \
"$@"
4 changes: 3 additions & 1 deletion kconfig-lib.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@

#!/bin/bash
# shellcheck disable=SC2034
# ^-----^ SC2034 (warning): COMMAND appears unused.
BUILD_DIR=$(pwd)

# find merge_config in code directory
Expand Down
24 changes: 12 additions & 12 deletions kconfig-minimize-distro-add-sof-defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

$COMMAND .config \
$KCONFIG_DIR/minimize-defconfig \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/sof-dev-defconfig \
$KCONFIG_DIR/mach-driver-defconfig \
$KCONFIG_DIR/hdaudio-codecs-defconfig \
$KCONFIG_DIR/telemetry-debugfs-defconfig \
$KCONFIG_DIR/lock-stall-defconfig \
$KCONFIG_DIR/soundwire-defconfig \
$@
"$KCONFIG_DIR"/minimize-defconfig \
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/sof-dev-defconfig \
"$KCONFIG_DIR"/mach-driver-defconfig \
"$KCONFIG_DIR"/hdaudio-codecs-defconfig \
"$KCONFIG_DIR"/telemetry-debugfs-defconfig \
"$KCONFIG_DIR"/lock-stall-defconfig \
"$KCONFIG_DIR"/soundwire-defconfig \
"$@"
14 changes: 7 additions & 7 deletions kconfig-sof-arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

make defconfig ARCH=arm64
$COMMAND -m .config \
$KCONFIG_DIR/arm64-nobloat-defconfig \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/sof-dev-defconfig \
$@
"$KCONFIG_DIR"/arm64-nobloat-defconfig \
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/sof-dev-defconfig \
"$@"
make olddefconfig ARCH=arm64
22 changes: 11 additions & 11 deletions kconfig-sof-default-nodev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

make defconfig
$COMMAND .config \
$KCONFIG_DIR/base-defconfig \
$KCONFIG_DIR/devices-defconfig \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/amd-defconfig \
$KCONFIG_DIR/mach-driver-defconfig \
$KCONFIG_DIR/hdaudio-codecs-defconfig \
$KCONFIG_DIR/soundwire-defconfig \
$@
"$KCONFIG_DIR"/base-defconfig \
"$KCONFIG_DIR"/devices-defconfig \
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/amd-defconfig \
"$KCONFIG_DIR"/mach-driver-defconfig \
"$KCONFIG_DIR"/hdaudio-codecs-defconfig \
"$KCONFIG_DIR"/soundwire-defconfig \
"$@"
34 changes: 17 additions & 17 deletions kconfig-sof-default.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

make defconfig
$COMMAND .config \
$KCONFIG_DIR/base-defconfig \
$KCONFIG_DIR/devices-defconfig \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/sof-dev-defconfig \
$KCONFIG_DIR/amd-defconfig \
$KCONFIG_DIR/avs-defconfig \
$KCONFIG_DIR/mach-driver-defconfig \
$KCONFIG_DIR/hdaudio-codecs-defconfig \
$KCONFIG_DIR/telemetry-debugfs-defconfig \
$KCONFIG_DIR/lock-stall-defconfig \
$KCONFIG_DIR/soundwire-defconfig \
$KCONFIG_DIR/soundwire-codecs-defconfig \
$KCONFIG_DIR/bpf-defconfig \
$@
"$KCONFIG_DIR"/base-defconfig \
"$KCONFIG_DIR"/devices-defconfig \
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/sof-dev-defconfig \
"$KCONFIG_DIR"/amd-defconfig \
"$KCONFIG_DIR"/avs-defconfig \
"$KCONFIG_DIR"/mach-driver-defconfig \
"$KCONFIG_DIR"/hdaudio-codecs-defconfig \
"$KCONFIG_DIR"/telemetry-debugfs-defconfig \
"$KCONFIG_DIR"/lock-stall-defconfig \
"$KCONFIG_DIR"/soundwire-defconfig \
"$KCONFIG_DIR"/soundwire-codecs-defconfig \
"$KCONFIG_DIR"/bpf-defconfig \
"$@"
26 changes: 13 additions & 13 deletions kconfig-sof-nocodec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

set -e

KCONFIG_DIR=$(dirname ${BASH_SOURCE[0]})
echo $KCONFIG_DIR
KCONFIG_DIR=$(dirname "${BASH_SOURCE[0]}")
echo "$KCONFIG_DIR"

. $KCONFIG_DIR/kconfig-lib.sh
. "$KCONFIG_DIR"/kconfig-lib.sh

make defconfig
$COMMAND .config \
$KCONFIG_DIR/base-defconfig \
$KCONFIG_DIR/devices-defconfig \
$KCONFIG_DIR/sof-defconfig \
$KCONFIG_DIR/sof-dev-defconfig \
$KCONFIG_DIR/amd-defconfig \
$KCONFIG_DIR/nocodec-defconfig \
$KCONFIG_DIR/telemetry-debugfs-defconfig \
$KCONFIG_DIR/lock-stall-defconfig \
$KCONFIG_DIR/bpf-defconfig \
$@
"$KCONFIG_DIR"/base-defconfig \
"$KCONFIG_DIR"/devices-defconfig \
"$KCONFIG_DIR"/sof-defconfig \
"$KCONFIG_DIR"/sof-dev-defconfig \
"$KCONFIG_DIR"/amd-defconfig \
"$KCONFIG_DIR"/nocodec-defconfig \
"$KCONFIG_DIR"/telemetry-debugfs-defconfig \
"$KCONFIG_DIR"/lock-stall-defconfig \
"$KCONFIG_DIR"/bpf-defconfig \
"$@"

0 comments on commit 8fee06f

Please sign in to comment.