diff options
| author | Rosen Penev <rosenp@gmail.com> | 2022-02-05 09:42:42 -0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-02-07 00:03:27 +0100 |
| commit | 8cfce165a7e3605c22b045cdc1f745b4d6b49fb9 (patch) | |
| tree | c802cdab7112aaff02a6fc35176a1619ec9ae3f0 | |
| parent | 7994461a5a1c2cdd8bf4cc3fa38c4d496534f080 (diff) | |
| download | upstream-8cfce165a7e3605c22b045cdc1f745b4d6b49fb9.tar.gz upstream-8cfce165a7e3605c22b045cdc1f745b4d6b49fb9.tar.bz2 upstream-8cfce165a7e3605c22b045cdc1f745b4d6b49fb9.zip | |
target/linux: replace egrep with grep -E
egrep is deprecated and replaced by grep -E. The latter is used
throughout the tree.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
4 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/bcm4908/base-files/lib/upgrade/platform.sh b/target/linux/bcm4908/base-files/lib/upgrade/platform.sh index e7d4bfe4de..1b94801fb0 100644 --- a/target/linux/bcm4908/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm4908/base-files/lib/upgrade/platform.sh @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause -RAMFS_COPY_BIN="bcm4908img expr egrep fdtget fw_printenv fw_setenv tr" +RAMFS_COPY_BIN="bcm4908img expr grep fdtget fw_printenv fw_setenv tr" PART_NAME=firmware @@ -112,19 +112,19 @@ platform_pkgtb_get_image() { local image_name=$(platform_pkgtb_get_image_name "$1" "$cmd" "$3") - $cmd < $1 | fdtget -p - /images/$image_name | egrep -q "^data$" && { + $cmd < $1 | fdtget -p - /images/$image_name | grep -Eq "^data$" && { $cmd < $1 | fdtget -t r - /images/$image_name data return } - $cmd < $1 | fdtget -p - /images/$image_name | egrep -q "^data-position$" && { + $cmd < $1 | fdtget -p - /images/$image_name | grep -Eq "^data-position$" && { local data_position=$($cmd < $1 | fdtget - /images/$image_name data-position) local data_size=$($cmd < $1 | fdtget - /images/$image_name data-size) $cmd < $1 2>/dev/null | dd skip=$data_position count=$data_size iflag=skip_bytes,count_bytes return } - $cmd < $1 | fdtget -p - /images/$image_name | egrep -q "^data-offset" && { + $cmd < $1 | fdtget -p - /images/$image_name | grep -Eq "^data-offset" && { local data_offset=$($cmd < $1 | fdtget - /images/$image_name data-offset) local totalsize=$(get_hex_u32_be "$1" 4) local data_position=$(((0x$totalsize + data_offset + 3) & ~3)) diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh index 29f4763451..1feffc7aa2 100644 --- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh +++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh @@ -9,7 +9,7 @@ linksys_get_target_firmware() { cur_boot_part=$(/usr/sbin/fw_printenv -n boot_part) if [ -z "${cur_boot_part}" ] ; then mtd_ubi0=$(cat /sys/devices/virtual/ubi/ubi0/mtd_num) - case $(egrep ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in + case $(grep -E ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in kernel1|rootfs1) cur_boot_part=1 ;; diff --git a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh index 1f2596ea88..7e20276fe5 100644 --- a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh +++ b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh @@ -9,7 +9,7 @@ linksys_get_target_firmware() { cur_boot_part=$(/usr/sbin/fw_printenv -n boot_part) if [ -z "${cur_boot_part}" ] ; then mtd_ubi0=$(cat /sys/devices/virtual/ubi/ubi0/mtd_num) - case $(egrep ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in + case $(grep -E ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in kernel|rootfs) cur_boot_part=1 ;; diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh index aaa32eb4ea..826bf8c9b5 100644 --- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh +++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh @@ -9,7 +9,7 @@ linksys_get_target_firmware() { cur_boot_part=$(/usr/sbin/fw_printenv -n boot_part) if [ -z "${cur_boot_part}" ] ; then mtd_ubi0=$(cat /sys/devices/virtual/ubi/ubi0/mtd_num) - case $(egrep ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in + case $(grep -E ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in kernel1|rootfs1) cur_boot_part=1 ;; |