From patchwork Wed Jun 15 22:48:09 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: 12883000 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 600D62902 for ; Wed, 15 Jun 2022 22:48:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655333298; x=1686869298; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rg1xVaXuh+EZ3wuydqZXQxCDboU/B/Aw6yTV4A4bjgI=; b=FwGoDvbA8JEa4ZQVFPpg8mXtSNxeT7gK83YNBhNxMj7mH8RkxbaA5i0z yN+sRCGITHTbJOSrddOwaKUXChocMJ1lDda31VEp6U4LhLXb73qZZwbWj ppvmoqv4IJW7dbwpVyzW0ndNzZv+641kDbmwe8XmwHzH8d9TMPNMucbOW ze5a1AaP2CailPE3lFcJRlOGWIlt/C1NFOOv50IpOdWfrsWuj+O2jr+Gi CLYEzt9yHidleguyEK4bv/jn60DikOVoANXyWr7rJCyXGaiuNCkDUXVZL NHdvRDy5jO/Ernzqe9dpKS5o66DemiRbLwWzVGychE3LUoJzZWdceVIPr Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="280150961" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="280150961" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911896780" Received: from rshirckx-mobl.amr.corp.intel.com (HELO vverma7-desk1.intel.com) ([10.212.81.6]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:15 -0700 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH v2 1/5] ndctl: move developer scripts from contrib/ to scripts/ Date: Wed, 15 Jun 2022 16:48:09 -0600 Message-Id: <20220615224813.523053-2-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615224813.523053-1-vishal.l.verma@intel.com> References: <20220615224813.523053-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=1638; h=from:subject; bh=rg1xVaXuh+EZ3wuydqZXQxCDboU/B/Aw6yTV4A4bjgI=; b=owGbwMvMwCXGf25diOft7jLG02pJDEmrEtfEPWlYYRpgvZL7XprCBMfSWP93Eo0CK+5L3NS0XhC9 Kbqpo5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABMR2cLwV+Ttm8L12a6r7x9SjjydwV 15//D+kuOZL2/Ol/Gb0pk5/x8jw9nPhtuj10dt8fiwMNHiR1vbk+nzw2UeTTrcuDVDtLRhPR8A X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF 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 Signed-off-by: Vishal Verma --- {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 From patchwork Wed Jun 15 22:48:10 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: 12883001 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 78F2629A7 for ; Wed, 15 Jun 2022 22:48:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655333298; x=1686869298; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jCpWOwYzHjw8QvhM/4XM25Qd2W1lZ7YWrqVX/rIMZuA=; b=anPYCDRMvdUfVcqGOjG8njLtFenjqL9aG/PQ7fxJjE0zoLMJgO5dOh9Y /jo6nhfrH/vn3E9WAmPbXxiIweA6nzKZNjCSsIyjgDnx+WDAxagej00Nu dRpkXfKy+Id3jShWpuVNkb9BDvBXg3ic+GbeFZ2dQxPLEqTAY2Gx3M7kG yk44Mxmtbdv9ab388JjPrxbvD5k+0FYrOFsSyxg/RVx/VluXMv04E+ryn bEYbzf6zM7qfKOpEGvVmBqIibMbPcoyd8bLyh8WBclfGVySYPBmsDJV93 ZC10/00B4TVbk+S2GtRZok32iZFPMsjWdyQrHJfqGgxLFevKH2dw6dFS1 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="280150962" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="280150962" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911896783" Received: from rshirckx-mobl.amr.corp.intel.com (HELO vverma7-desk1.intel.com) ([10.212.81.6]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH v2 2/5] ndctl: remove obsolete m4 directory Date: Wed, 15 Jun 2022 16:48:10 -0600 Message-Id: <20220615224813.523053-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615224813.523053-1-vishal.l.verma@intel.com> References: <20220615224813.523053-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=579; h=from:subject; bh=jCpWOwYzHjw8QvhM/4XM25Qd2W1lZ7YWrqVX/rIMZuA=; b=owGbwMvMwCXGf25diOft7jLG02pJDEmrEtcU6Fs/faRe/kp6te2p1y3pDKLXg95fy13vGTNRN51T vtG0o5SFQYyLQVZMkeXvno+Mx+S25/MEJjjCzGFlAhnCwMUpABMJz2f47/xm+et9wlvehk/Xrjmo6T thtx9XRfc69qd8IseLkssNmxgZlqZszZp8o2Kx478PP78kZNm16WTs8tBm9BI+lJzgWD+bGwA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF 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 Signed-off-by: Vishal Verma --- 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 - From patchwork Wed Jun 15 22:48:11 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: 12883002 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 1316829AD for ; Wed, 15 Jun 2022 22:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655333300; x=1686869300; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Qm5AEPFNsAHwyaFOPV4CwAQQPSwK3iaN1PQNwM50yEA=; b=L1tsk1iiVBzPJHR4lg/S6NmKIMUckAZRsU9L7HNLBTagV0uUh0kTjkij wGm5b4XLhlWlM9JOlgB7G1EkAGRnbqxEulJVkx7icZQEpPjJOlkadTS5Z n2UtwLes4DDksWiXub41dXVjyDPa7ExuhwYe45ZG75UawfeG57eA4jmu5 /Uylr8i7F/ITqGkuUXispII0kiXvqP/fF+MFt9DV0uhuqRBNS36m/+U0d vghCI4mCEHipjdcPUXYWJyzT/BX6c3jpvYUYKFoqzqpY1xGugNUA0g5PO GDejyKkK+JvVvb0zyk2WqoUB7y8xydMzFM4cLVJvNg/1F2MOR2oQOhgFy A==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="280150964" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="280150964" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911896787" Received: from rshirckx-mobl.amr.corp.intel.com (HELO vverma7-desk1.intel.com) ([10.212.81.6]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH v2 3/5] ndctl: update .gitignore Date: Wed, 15 Jun 2022 16:48:11 -0600 Message-Id: <20220615224813.523053-4-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615224813.523053-1-vishal.l.verma@intel.com> References: <20220615224813.523053-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=571; h=from:subject; bh=Qm5AEPFNsAHwyaFOPV4CwAQQPSwK3iaN1PQNwM50yEA=; b=owGbwMvMwCXGf25diOft7jLG02pJDEmrEtfk7XPceTow6/JGPq5/oqv+ySfMOjzz+2n7qZbvZ3fe UmvL7ihlYRDjYpAVU2T5u+cj4zG57fk8gQmOMHNYmUCGMHBxCsBELkcx/K+arXfzavfO3ZeMfj3Zuq jC7IL29zk5Bf0TK9J/Ta3TXKXKyPAlbsJs9yOfJfw63XYtfCFhvv4ij9+Kop93xdtt9L97qXMDAA== X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF 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 --- .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 From patchwork Wed Jun 15 22:48:12 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: 12883003 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 29EE43FDF for ; Wed, 15 Jun 2022 22:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655333300; x=1686869300; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+GoN0JKQwPR9kQh2/EvFvfDQG4fe645oBNCl7sLo6+o=; b=FHvH7kz/vSmfBx4jdl9KvY5aukrUTtrQZ019WsYkYBVCtt7S9Tm1puzh 4hg4i1d/qXOfBERjtCD4j7ytpHSauzmt5OOV7ab9QNnDLvv6BLYb9Iu6O yaHFc34ULh+XJsyPz0W1f8kP9FisiDXgIcl7HWyWm2yeFXwn7Bvs2Jhdj hjQSy89cf7pefITk2qboK+E/2xRNYSwNXVO2EDcaW++u2WKBQkuoYEAxa SYhW4WdsxyrEhTaryYpV2HHpdr09nn71wEOtan7pZ7DKQ7LmVB+zWJDYj mavrj0YpFuU6WNRJz0hwP3ns5nHBszv/aPBvNJ65Do3JOLQFXoE+bpMhb Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="280150966" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="280150966" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911896792" Received: from rshirckx-mobl.amr.corp.intel.com (HELO vverma7-desk1.intel.com) ([10.212.81.6]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH v2 4/5] scripts: fix contrib/do_abidiff for updated fedpkg Date: Wed, 15 Jun 2022 16:48:12 -0600 Message-Id: <20220615224813.523053-5-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615224813.523053-1-vishal.l.verma@intel.com> References: <20220615224813.523053-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=971; h=from:subject; bh=+GoN0JKQwPR9kQh2/EvFvfDQG4fe645oBNCl7sLo6+o=; b=owGbwMvMwCXGf25diOft7jLG02pJDEmrEtdEOMoXvrwoEnX4+cVzp1ObbXdvCD28IYQhxlCALdAm 6Rp3RykLgxgXg6yYIsvfPR8Zj8ltz+cJTHCEmcPKBDKEgYtTACaiXczwT1PRp/RWg2bLAU1JlQ6h9x uOPhTnW5Crs0vnZHmwxgdjCUaGvyF1X9Ye3Jmt80yaWyHs/hLzKZ4Vq1jMf27wSDHJKTFlBAA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF 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 Signed-off-by: Vishal Verma --- 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}/ From patchwork Wed Jun 15 22:48:13 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: 12883004 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 4D9133FFA for ; Wed, 15 Jun 2022 22:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655333300; x=1686869300; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tdv5b4Bp16qerqfxpTdHw00vLaLugS2dKqAgB14VwCA=; b=RW5y4DzyI6ZUi22DWAGU9QrCQLrqbVdhtQg4INJoYkWR0//3qdUPZ3zK UaF1Rs7/ikyRgNh93tmFSrfDTKJlaIkjqdIz3qj7s5SadC6jvOhjSnAwD Swr5L3OsjId5UXNS+GBBdXhcHSWpT2sNBvauftk158tu6DGbImChjLePW oUBXFGdPlrlmxGWSXHT0EQrfzAADyGegdPQ7HhVira6iynvAcEypH2ugp TYicWrhe+sdSV2cNs+wMFy4UpK45hM9vi1KwfeOf6yI3PBxPdXh5RVTo/ uYMLimjoM0wpmwPo9xvRtW2+M7FPf/cMglN2JXX+Q53JhNySSznebxalP Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10379"; a="280150969" X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="280150969" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:17 -0700 X-IronPort-AV: E=Sophos;i="5.91,302,1647327600"; d="scan'208";a="911896796" Received: from rshirckx-mobl.amr.corp.intel.com (HELO vverma7-desk1.intel.com) ([10.212.81.6]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 15:48:16 -0700 From: Vishal Verma To: Cc: Dan Williams , Vishal Verma Subject: [ndctl PATCH v2 5/5] scripts: update release helper scripts for meson and cxl Date: Wed, 15 Jun 2022 16:48:13 -0600 Message-Id: <20220615224813.523053-6-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615224813.523053-1-vishal.l.verma@intel.com> References: <20220615224813.523053-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=2254; h=from:subject; bh=Tdv5b4Bp16qerqfxpTdHw00vLaLugS2dKqAgB14VwCA=; b=owGbwMvMwCXGf25diOft7jLG02pJDEmrEtfaSk9/LL+ji62m+XvViWLP15ffu9v6zVtfsTpx733t GSrTO0pZGMS4GGTFFFn+7vnIeExuez5PYIIjzBxWJpAhDFycAjARhjKG//H9KnUSWyQ+81jmXXgZvi F+Rrzi/swn9zesTZ6ixmYkxMfwhzvx5Jv3PyJ4dpVcX/n+E//+NGNpjVXbbd6nnQp14bu+mx0A 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. 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 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