Commit f8d6541d authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

freebsd: Replace use of \s with [[:space:]] 

In latest 13.0 release of freebsd sed is not accepting \s anymore,
hence it needs to be replaced. Note that only parts of the repo
which are touched by freebsd during the tests are updated.

Details https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=253893



Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: I217208511af8f98e7033f8f24a343b5ca9c48825
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7986


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 022ecaa7

configure

+2 −2
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ if (($(grep -cE "^\s*CONFIG_[[:alnum:]_]+=" "$rootdir/CONFIG") != ${#CONFIG[@]}) 
	echo "BUG: Some configuration options are not present in CONFIG file. Please update this file."

	echo "Missing options in CONFIG (+) file and in current config (-): "

	diff -u --label "CONFIG file" --label "CONFIG[@]" \

		<(sed -r -e '/^\s*$/d; /^\s*#.*/d; s/(CONFIG_[[:alnum:]_]+)=.*/\1/g' CONFIG | sort) \

		<(sed -r -e '/^[[:space:]]*$/d; /^[[:space:]]*#.*/d; s/(CONFIG_[[:alnum:]_]+)=.*/\1/g' CONFIG | sort) \

		<(printf "CONFIG_%s\n" "${!CONFIG[@]}" | sort)

	exit 1

fi
@@ -860,7 +860,7 @@ fi 
echo -n "Creating mk/config.mk..."

cp -f $rootdir/CONFIG $rootdir/mk/config.mk

for key in "${!CONFIG[@]}"; do

	sed -i.bak -r "s#^\s*CONFIG_${key}=.*#CONFIG_${key}\?=${CONFIG[$key]}#g" $rootdir/mk/config.mk

	sed -i.bak -r "s#[[:space:]]*CONFIG_${key}=.*#CONFIG_${key}\?=${CONFIG[$key]}#g" $rootdir/mk/config.mk

done

# On FreeBSD sed -i 'SUFFIX' - SUFFIX is mandatory. So no way but to delete the backed file.

rm -f $rootdir/mk/config.mk.bak

dpdkbuild/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ ifeq ($(MAKE_PID),) 
MAKE_PID := $(shell echo $$PPID)

endif



MAKE_NUMJOBS := $(shell ps T | sed -nE 's/\s*$(MAKE_PID)\s.* (-j|--jobs=)( *[0-9]+).*/\1\2/p')

MAKE_NUMJOBS := $(shell ps T | sed -nE 's/[[:space:]]*$(MAKE_PID)[[:space:]].* (-j|--jobs=)( *[0-9]+).*/\1\2/p')



all: $(SPDK_ROOT_DIR)/dpdk/build-tmp

	$(Q)# DPDK doesn't handle nested make calls, so unset MAKEFLAGS