Commit b7947268 authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

scripts/common: Extract SPDK_GPT_PART_TYPE_GUID from source 



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


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@gmail.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 76f840c0

scripts/common.sh

+11 −0
Original line number Diff line number Diff line
@@ -345,6 +345,17 @@ block_in_use() { 
	return 0

}



get_spdk_gpt() {

	local spdk_guid



	[[ -e $rootdir/module/bdev/gpt/gpt.h ]] || return 1



	IFS="()" read -r _ spdk_guid _ < <(grep SPDK_GPT_PART_TYPE_GUID "$rootdir/module/bdev/gpt/gpt.h")

	spdk_guid=${spdk_guid//, /-} spdk_guid=${spdk_guid//0x/}



	echo "$spdk_guid"

}



if [[ -e "$CONFIG_WPDK_DIR/bin/wpdk_common.sh" ]]; then

	# Adjust uname to report the operating system as WSL, Msys or Cygwin

	# and the kernel name as Windows. Define kill() to invoke the SIGTERM

test/bdev/blockdev.sh

+1 −3
Original line number Diff line number Diff line
@@ -79,9 +79,7 @@ function setup_gpt_conf() { 
		# Create gpt partition table

		parted -s "$gpt_nvme" mklabel gpt mkpart first '0%' '50%' mkpart second '50%' '100%'

		# change the GUID to SPDK GUID value

		# FIXME: Hardcode this in some common place, this value should not be changed much

		IFS="()" read -r _ SPDK_GPT_GUID _ < <(grep SPDK_GPT_PART_TYPE_GUID module/bdev/gpt/gpt.h)

		SPDK_GPT_GUID=${SPDK_GPT_GUID//, /-} SPDK_GPT_GUID=${SPDK_GPT_GUID//0x/}

		SPDK_GPT_GUID=$(get_spdk_gpt)

		sgdisk -t "1:$SPDK_GPT_GUID" "$gpt_nvme"

		sgdisk -t "2:$SPDK_GPT_GUID" "$gpt_nvme"

		"$rootdir/scripts/setup.sh"