[ndctl PATCH v2 0/5] misc updates for release scripts

[ndctl PATCH v2 0/5] misc updates for release scripts

[Vishal Verma]

Cleaning up pending branches, I noticed I had missed this series in the
last release, so resending it with some updates.

Changes since v1[1]:
- Add a gitignore update
- Update for the meson conversion

[1]: https://lore.kernel.org/nvdimm/20220106050940.743232-1-vishal.l.verma@intel.com/

---

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 (5):
  ndctl: move developer scripts from contrib/ to scripts/
  ndctl: remove obsolete m4 directory
  ndctl: update .gitignore
  scripts: fix contrib/do_abidiff for updated fedpkg
  scripts: update release helper scripts for meson and cxl

 .gitignore                                  | 3 +++
 m4/.gitignore                               | 6 ------
 {contrib => scripts}/daxctl-qemu-hmat-setup | 0
 {contrib => scripts}/do_abidiff             | 5 +++--
 {contrib => scripts}/prepare-release.sh     | 5 +++--
 5 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 m4/.gitignore
 rename {contrib => scripts}/daxctl-qemu-hmat-setup (100%)
 rename {contrib => scripts}/do_abidiff (97%)
 rename {contrib => scripts}/prepare-release.sh (97%)

-- 
2.36.1

[ndctl PATCH v2 1/5] ndctl: move developer scripts from contrib/ to scripts/

[Vishal Verma]

Allow for scripts/ to be the defacto location for scripts and tooling
that may be useful for developers of ndctl, but isn't distributed or
installed. Move such scripts currently in contrib/ to scripts/.

Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 {contrib => scripts}/daxctl-qemu-hmat-setup | 0
 {contrib => scripts}/do_abidiff             | 0
 {contrib => scripts}/prepare-release.sh     | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {contrib => scripts}/daxctl-qemu-hmat-setup (100%)
 rename {contrib => scripts}/do_abidiff (100%)
 rename {contrib => scripts}/prepare-release.sh (99%)

diff --git a/contrib/daxctl-qemu-hmat-setup b/scripts/daxctl-qemu-hmat-setup
similarity index 100%
rename from contrib/daxctl-qemu-hmat-setup
rename to scripts/daxctl-qemu-hmat-setup
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.36.1

[ndctl PATCH v2 2/5] ndctl: remove obsolete m4 directory

[Vishal Verma]

With the conversion to meson, the m4 directory, which may have held
symlinks to libtool.m4 and friends, is no longer needed. Remove it.

Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 m4/.gitignore | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 m4/.gitignore

diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index 8bab51c..0000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-libtool.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
-
-- 
2.36.1

[ndctl PATCH v2 3/5] ndctl: update .gitignore

[Vishal Verma]

Add a few files and dirs to .gitignore:
  - cscope.* (since we already ignore 'tags')
  - release/ (created by scripts/prepare_release)
  - scripts/docsurgeon_parser.sh (parser generated by argbash)

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index aa0ce8e..eeb275f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 build/
+release/
 rhel/ndctl.spec
 sles/ndctl.spec
 *.swp
 tags
+cscope.*
+scripts/docsurgeon_parser.sh
-- 
2.36.1

[ndctl PATCH v2 4/5] scripts: fix contrib/do_abidiff for updated fedpkg

[Vishal Verma]

A recent fedpkg update wants --name instead of --module-name.

Link: https://lore.kernel.org/r/20220106050940.743232-2-vishal.l.verma@intel.com
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 scripts/do_abidiff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/do_abidiff b/scripts/do_abidiff
index 0bd7a16..e8c3a65 100755
--- a/scripts/do_abidiff
+++ b/scripts/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.36.1

[ndctl PATCH v2 5/5] scripts: update release helper scripts for meson and cxl

[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.

Additionally, move the checks over to the new meson regime. This does
break any checking for the older autotools based build, but that should
be okay.

Link: https://lore.kernel.org/r/20220106050940.743232-4-vishal.l.verma@intel.com
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.36.1