diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-04-02 19:30:17 +0100 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-04-04 11:28:15 +0100 |
| commit | c14c6902f597b5b7410da32842b31c6229b3a998 (patch) | |
| tree | 5a4f20087ab259ac1d851666e51e01d11c0cbc45 | |
| parent | fdac4c085daccd774b4eba6b8c3fca2739cbb8dd (diff) | |
| download | upstream-c14c6902f597b5b7410da32842b31c6229b3a998.tar.gz upstream-c14c6902f597b5b7410da32842b31c6229b3a998.tar.bz2 upstream-c14c6902f597b5b7410da32842b31c6229b3a998.zip | |
treewide: convert sed -r to posix -E
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
| -rw-r--r-- | include/image.mk | 2 | ||||
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/image.mk b/include/image.mk index 441f55b741..984b64fb9c 100644 --- a/include/image.mk +++ b/include/image.mk @@ -45,7 +45,7 @@ IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$ IMG_ROOTFS:=$(IMG_PREFIX)-rootfs IMG_COMBINED:=$(IMG_PREFIX)-combined IMG_PART_SIGNATURE:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | mkhash md5 | cut -b1-8) -IMG_PART_DISKGUID:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | mkhash md5 | sed -r 's/(.{8})(.{4})(.{4})(.{4})(.{10})../\1-\2-\3-\4-\500/') +IMG_PART_DISKGUID:=$(shell echo $(SOURCE_DATE_EPOCH)$(LINUX_VERMAGIC) | mkhash md5 | sed -E 's/(.{8})(.{4})(.{4})(.{4})(.{10})../\1-\2-\3-\4-\500/') MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 2cbc69e5dd..49c2fa0e7b 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -5,7 +5,7 @@ RAM_ROOT=/tmp/root export BACKUP_FILE=sysupgrade.tgz # file extracted by preinit [ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; } -libs() { ldd $* 2>/dev/null | sed -r 's/(.* => )?(.*) .*/\2/'; } +libs() { ldd $* 2>/dev/null | sed -E 's/(.* => )?(.*) .*/\2/'; } install_file() { # <file> [ <file> ... ] local target dest dir |