* [ndctl PATCH 0/3] misc updates for release scripts
@ 2022-01-06 5:09 Vishal Verma
2022-01-06 5:09 ` [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg Vishal Verma
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Vishal Verma @ 2022-01-06 5:09 UTC (permalink / raw)
To: nvdimm; +Cc: Dan Williams, Vishal Verma
A few updates to the release helper scripts that fix fedpkg invocation,
move the scripts to the new scripts/ directory, and teach them about cxl
and libcxl.
Vishal Verma (3):
scripts: fix contrib/do_abidiff for updated fedpkg
scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/
scripts: teach release helper scripts about cxl and libcxl
{contrib => scripts}/do_abidiff | 5 +++--
{contrib => scripts}/prepare-release.sh | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
rename {contrib => scripts}/do_abidiff (97%)
rename {contrib => scripts}/prepare-release.sh (97%)
base-commit: addc5fd8511b8436d89dcef3dd12131147236b09
--
2.33.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg 2022-01-06 5:09 [ndctl PATCH 0/3] misc updates for release scripts Vishal Verma @ 2022-01-06 5:09 ` Vishal Verma 2022-01-06 17:08 ` Dan Williams 2022-01-06 5:09 ` [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ Vishal Verma 2022-01-06 5:09 ` [ndctl PATCH 3/3] scripts: teach release helper scripts about cxl and libcxl Vishal Verma 2 siblings, 1 reply; 6+ messages in thread From: Vishal Verma @ 2022-01-06 5:09 UTC (permalink / raw) To: nvdimm; +Cc: Dan Williams, Vishal Verma A recent fedpkg update wants --name instead of --module-name. Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> --- 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}/ -- 2.33.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg 2022-01-06 5:09 ` [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg Vishal Verma @ 2022-01-06 17:08 ` Dan Williams 0 siblings, 0 replies; 6+ messages in thread From: Dan Williams @ 2022-01-06 17:08 UTC (permalink / raw) To: Vishal Verma; +Cc: Linux NVDIMM On Wed, Jan 5, 2022 at 9:09 PM Vishal Verma <vishal.l.verma@intel.com> wrote: > > A recent fedpkg update wants --name instead of --module-name. Ugh, how annoying. > > Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> > --- > 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 Would it be worthwhile to document the version of the fedpkg that this script targets? Otherwise, looks good to me. Reviewed-by: Dan Williams <dan.j.williams@intel.com> > [ "$?" -eq 0 ] || err "error building $ref" > mkdir -p release/rel_${ref}/ > cp results_ndctl/*/*/*.x86_64.rpm release/rel_${ref}/ > -- > 2.33.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ 2022-01-06 5:09 [ndctl PATCH 0/3] misc updates for release scripts Vishal Verma 2022-01-06 5:09 ` [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg Vishal Verma @ 2022-01-06 5:09 ` Vishal Verma 2022-01-06 22:46 ` Dan Williams 2022-01-06 5:09 ` [ndctl PATCH 3/3] scripts: teach release helper scripts about cxl and libcxl Vishal Verma 2 siblings, 1 reply; 6+ messages in thread From: Vishal Verma @ 2022-01-06 5:09 UTC (permalink / raw) To: nvdimm; +Cc: Dan Williams, Vishal Verma 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 <vishal.l.verma@intel.com> --- {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 -- 2.33.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ 2022-01-06 5:09 ` [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ Vishal Verma @ 2022-01-06 22:46 ` Dan Williams 0 siblings, 0 replies; 6+ messages in thread From: Dan Williams @ 2022-01-06 22:46 UTC (permalink / raw) To: Vishal Verma; +Cc: Linux NVDIMM On Wed, Jan 5, 2022 at 9:10 PM Vishal Verma <vishal.l.verma@intel.com> wrote: > > 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. > LGTM Reviewed-by: Dan Williams <dan.j.williams@intel.com> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ndctl PATCH 3/3] scripts: teach release helper scripts about cxl and libcxl 2022-01-06 5:09 [ndctl PATCH 0/3] misc updates for release scripts Vishal Verma 2022-01-06 5:09 ` [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg Vishal Verma 2022-01-06 5:09 ` [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ Vishal Verma @ 2022-01-06 5:09 ` Vishal Verma 2 siblings, 0 replies; 6+ messages in thread From: Vishal Verma @ 2022-01-06 5:09 UTC (permalink / raw) To: nvdimm; +Cc: Dan Williams, Vishal Verma 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 <dan.j.williams@intel.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> --- 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 -- 2.33.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-06 22:47 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-06 5:09 [ndctl PATCH 0/3] misc updates for release scripts Vishal Verma 2022-01-06 5:09 ` [ndctl PATCH 1/3] scripts: fix contrib/do_abidiff for updated fedpkg Vishal Verma 2022-01-06 17:08 ` Dan Williams 2022-01-06 5:09 ` [ndctl PATCH 2/3] scripts: move 'prepare-release.sh' and 'do_abidiff' into scripts/ Vishal Verma 2022-01-06 22:46 ` Dan Williams 2022-01-06 5:09 ` [ndctl PATCH 3/3] scripts: teach release helper scripts about cxl and libcxl Vishal Verma
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).