From patchwork Thu Jan 6 05:09:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 12705134 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A44622CA6 for ; Thu, 6 Jan 2022 05:10:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641445817; x=1672981817; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eE0j/Kjfk2j4VrokHn/u7alhQJpaYBabh8MEtcy+Trc=; b=JW6A3/RD01pEZIAJWywBeaGUdQTcGqRWhx/09BC8F3kx3eQyBmCXxMSl hpikG8S31tjF108tdLvbGanWt0u5UyCB7s/ZJRjO5dmTdYlAG1liiIgRL pKCQVQNcrO1McAUUahEA7mlU04vJ3tLStNHo3RrAP/+3bLAKkgSmVDetu e9KzbisOI183tfdO8Vqhypxxrlg1QLFlN3PrBrcHVSKjkTF0gFlj2hGVe KeBJOPn4T+h39iYhc3Bl4dCmUM2bH6/hKUGtnc7Pzurvh+3kCoPX0/c6c RbrAVpzBFXmVjWXVZOeZz5Ss0q1/6ma47p2yAHRlJ6ov4IiJsy4/Fb9dy A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="240138578" X-IronPort-AV: E=Sophos;i="5.88,266,1635231600"; d="scan'208";a="240138578" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 21:09:51 -0800 X-IronPort-AV: E=Sophos;i="5.88,266,1635231600"; d="scan'208";a="689272619" Received: from asamymu-mobl.amr.corp.intel.com (HELO vverma7-desk.amr.corp.intel.com) ([10.251.136.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 21:09:50 -0800 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg Date: Wed, 5 Jan 2022 22:09:38 -0700 Message-Id: <20220106050940.743232-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220106050940.743232-1-vishal.l.verma@intel.com> References: <20220106050940.743232-1-vishal.l.verma@intel.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=835; h=from:subject; bh=eE0j/Kjfk2j4VrokHn/u7alhQJpaYBabh8MEtcy+Trc=; b=owGbwMvMwCXGf25diOft7jLG02pJDInXKqe8uL7o+o3mR+sYS2vSc9/Obf7Jezt5SvD+dQFfbz76 zfyGu6OUhUGMi0FWTJHl756PjMfktufzBCY4wsxhZQIZwsDFKQATec/D8Fde+puigoZxujFT1zZRUQ fVA3dqpA4c/v3W/H0Eu9nh/BhGhiWT/ER6XAqfyRbkxfOIKz3tloyY4btzW9Sm321Lly7V4QIA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF A recent fedpkg update wants --name instead of --module-name. Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- contrib/do_abidiff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/do_abidiff b/contrib/do_abidiff index 0bd7a16..e8c3a65 100755 --- a/contrib/do_abidiff +++ b/contrib/do_abidiff @@ -29,7 +29,7 @@ build_rpm() version="$(./git-version)" release="f$(basename $(readlink -f /etc/mock/default.cfg) | cut -d- -f2)" git archive --format=tar --prefix="ndctl-${version}/" HEAD | gzip > ndctl-${version}.tar.gz - fedpkg --release $release --module-name ndctl mockbuild + fedpkg --release $release --name=ndctl mockbuild [ "$?" -eq 0 ] || err "error building $ref" mkdir -p release/rel_${ref}/ cp results_ndctl/*/*/*.x86_64.rpm release/rel_${ref}/ From patchwork Thu Jan 6 05:09:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 12705136 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF4572CAC for ; Thu, 6 Jan 2022 05:10:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641445817; x=1672981817; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=knA9L0JV1q5gtOzAaRwc0SNbswMXJu2IiJ/H3h7ej44=; b=V4Ip/mx+1g6fnYkzMFeM6SdYnzBqMxSD2YKMRFZME3WYHBJs1UZ/yKvY FnWUfqvSVeJwy4MeW8QH/8gbahPu1VS8Jp1JKNMyzE56WOAh/0bzrBpZH B3486sbr8i8WnHHtNTGCpe/JCvYVrXeVSFbo+YoKih1TXLEzumbtXXPy5 y0UjqDjnLUVQ84DOdaflqwqpuQw16C9ioixCHJs3eD9SPGKHPTEmFsmJl r8PotHHrbU3OxVNrDhzfi+dpcmjE4N9h9bXeS55HS/7F9RtWhAx31/JRx Sc56INCMx+QiV9XXiZ5DMo66QrsDZa3KQNYz7ypv1adGK/TLsRaIsvc7M Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="240138580" X-IronPort-AV: E=Sophos;i="5.88,266,1635231600"; d="scan'208";a="240138580" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 21:09:51 -0800 X-IronPort-AV: E=Sophos;i="5.88,266,1635231600"; d="scan'208";a="689272626" Received: from asamymu-mobl.amr.corp.intel.com (HELO vverma7-desk.amr.corp.intel.com) ([10.251.136.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 21:09:51 -0800 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ Date: Wed, 5 Jan 2022 22:09:39 -0700 Message-Id: <20220106050940.743232-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220106050940.743232-1-vishal.l.verma@intel.com> References: <20220106050940.743232-1-vishal.l.verma@intel.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1296; h=from:subject; bh=knA9L0JV1q5gtOzAaRwc0SNbswMXJu2IiJ/H3h7ej44=; b=owGbwMvMwCXGf25diOft7jLG02pJDInXKqeEPZD9qtN5Z9XbpWz8H3O+/dz/+1qSU/vrXJ+4+aeV 2hR2dZSyMIhxMciKKbL83fOR8Zjc9nyewARHmDmsTCBDGLg4BWAiIVsZGSasPr/2o41pwS2W6zPXem 7275hiIvCR98DUa4FKaxc19C1nZHi89tO3mIY1rjHZzZ12qbGvah//NQsW1rBjZq29pCLryAwA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF The scripts directory in the ndctl tree is designated as the place for useful developer scripts that don't need to get packaged or distributed. Move the above out of contrib/ which does contain files that get packaged. Signed-off-by: Vishal Verma Reviewed-by: Dan Williams --- {contrib => scripts}/do_abidiff | 0 {contrib => scripts}/prepare-release.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {contrib => scripts}/do_abidiff (100%) rename {contrib => scripts}/prepare-release.sh (99%) diff --git a/contrib/do_abidiff b/scripts/do_abidiff similarity index 100% rename from contrib/do_abidiff rename to scripts/do_abidiff diff --git a/contrib/prepare-release.sh b/scripts/prepare-release.sh similarity index 99% rename from contrib/prepare-release.sh rename to scripts/prepare-release.sh index fb5cfe3..97ab964 100755 --- a/contrib/prepare-release.sh +++ b/scripts/prepare-release.sh @@ -186,7 +186,7 @@ check_libtool_vers "libdaxctl" gen_lists ${last_ref}..HEAD~1 # For ABI diff purposes, use the latest fixes tag -contrib/do_abidiff ${last_fix}..HEAD +scripts/do_abidiff ${last_fix}..HEAD # once everything passes, update the git-version sed -i -e "s/DEF_VER=[0-9]\+.*/DEF_VER=${next_ref#v}/" git-version From patchwork Thu Jan 6 05:09:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 12705135 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CA0C2CAF for ; Thu, 6 Jan 2022 05:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641445819; x=1672981819; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZkAhzl0Xl8wQCn0V5QtzzTRSh8WBwuYlWLZ2VvYZGsU=; b=bo2z2DPxdgiZQkENSNo6McnCpEG07l6taJ4gB1qXWKTv222c8TfkIPzI pFyRD30uS2W20b45/ltybOgZb/ysTjJqQZkr1kDww3TTIimRVos9He9+T m1sWUovCApE1PdJ1hERwx5cCOZhBsLh8kJBcWk3HT0SBAYiSrpiAayluD 5VNnWkz+Ja0SU+xM6FM9ywpiJ1B0ZHu65TI+DTSkXLritQ4P4rqm4UHuc 7uHIpLdR8ivwwzPn2LmGy1rQI/ox0RW4EqlS85rD46zs+AZw0bvXVJMtY 6/ugaofEUXm97PAVBVT/4+OnMPoiG1GXlYTV9S8PIvQ2+/E2p2QUhlXfR Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="240138582" X-IronPort-AV: E=Sophos;i="5.88,266,1635231600"; d="scan'208";a="240138582" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 21:09:51 -0800 X-IronPort-AV: E=Sophos;i="5.88,266,1635231600"; d="scan'208";a="689272632" Received: from asamymu-mobl.amr.corp.intel.com (HELO vverma7-desk.amr.corp.intel.com) ([10.251.136.30]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 21:09:51 -0800 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH 3/3] scripts: teach release helper scripts about cxl and libcxl Date: Wed, 5 Jan 2022 22:09:40 -0700 Message-Id: <20220106050940.743232-4-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220106050940.743232-1-vishal.l.verma@intel.com> References: <20220106050940.743232-1-vishal.l.verma@intel.com> Precedence: bulk X-Mailing-List: nvdimm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2016; h=from:subject; bh=ZkAhzl0Xl8wQCn0V5QtzzTRSh8WBwuYlWLZ2VvYZGsU=; b=owGbwMvMwCXGf25diOft7jLG02pJDInXKqcwKi4sZJRlXK/QUZY16/u7yW/7Pr1XMvgw7fdBrUMm 0Y0PO0pZGMS4GGTFFFn+7vnIeExuez5PYIIjzBxWJpAhDFycAjCRG/YM//QrfZxvHJAxP568Ztuy7Z MzD51t8riQFly+qOXXs8Uf6pYyMpzcJ2E2f9U/Gf4oJzOlnZvluS+snTy9ujHCR9f+27qNZiwA X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF The prepare-release.sh and do_abidiff scripts perform sanity checking for library versioning and also guard against accidental ABI breakage by comparing the current release with the previous using 'abipkgdiff' from libabigail. Teach the scripts about libcxl, so that it too can participate in the above checks. Cc: Dan Williams Signed-off-by: Vishal Verma --- scripts/do_abidiff | 3 ++- scripts/prepare-release.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/do_abidiff b/scripts/do_abidiff index e8c3a65..ec3e344 100755 --- a/scripts/do_abidiff +++ b/scripts/do_abidiff @@ -53,7 +53,7 @@ do_diff() local old_lib="$(find . -regex "./release/rel_${old}/${pkg}-libs-[0-9]+.*" | head -1)" local new_lib="$(find . -regex "./release/rel_${new}/${pkg}-libs-[0-9]+.*" | head -1)" - [ -n "$pkg" ] || err "specify a package for diff (ndctl, daxctl)" + [ -n "$pkg" ] || err "specify a package for diff (ndctl, daxctl, cxl)" [ -n "$old_base" ] || err "$pkg: old_base empty, possible build failure" [ -n "$new_base" ] || err "$pkg: new_base empty, possible build failure" @@ -75,3 +75,4 @@ build_rpm $old > release/buildlog_$old 2>&1 build_rpm $new > release/buildlog_$new 2>&1 do_diff ndctl do_diff daxctl +do_diff cxl diff --git a/scripts/prepare-release.sh b/scripts/prepare-release.sh index 97ab964..8901b50 100755 --- a/scripts/prepare-release.sh +++ b/scripts/prepare-release.sh @@ -100,7 +100,7 @@ gen_lists() } # Check libtool versions in Makefile.am.in -# $1: lib name (currently libndctl or libdaxctl) +# $1: lib name (currently libndctl, libdaxctl, or libcxl) check_libtool_vers() { local lib="$1" @@ -181,6 +181,7 @@ next_fix=$(next_fix "$last_fix") check_libtool_vers "libndctl" check_libtool_vers "libdaxctl" +check_libtool_vers "libcxl" # HEAD~1 because HEAD would be the release commit gen_lists ${last_ref}..HEAD~1