From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 16B5670F03 for ; Tue, 7 Sep 2021 15:18:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 08CEF1C3FD for ; Tue, 7 Sep 2021 15:18:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B22A81C3F4 for ; Tue, 7 Sep 2021 15:18:16 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 898C9445EE for ; Tue, 7 Sep 2021 15:18:16 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 7 Sep 2021 15:17:53 +0200 Message-Id: <20210907131755.1016175-4-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210907131755.1016175-1-s.ivanov@proxmox.com> References: <20210907131755.1016175-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.275 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [abigail.am, makefile.am, autogen.sh] Subject: [pve-devel] [RFC zfsonlinux 3/5] port changes to abi tracking from master X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Sep 2021 13:18:48 -0000 upstream/master has a few commits addressing an incompatibility of the files generated by abigail-tools > 1.8 with the ones generated with earlier versions. This commit adds 2 patches porting these changes. Without it building in bullseye fails (due to the abigail-tools version) Note: this commit will break building zfs on buster. Signed-off-by: Stoiko Ivanov --- debian/control | 2 +- .../0010-Check-for-libabigail-version.patch | 45 +++++++++++++++++++ ...c-storabi-abidw-invocation-with-mast.patch | 33 ++++++++++++++ debian/patches/series | 2 + 4 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0010-Check-for-libabigail-version.patch create mode 100644 debian/patches/0011-abi-tracking-sync-storabi-abidw-invocation-with-mast.patch diff --git a/debian/control b/debian/control index 89f51393..168dfb91 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: zfs-linux Section: contrib/kernel Priority: optional Maintainer: Proxmox Support Team -Build-Depends: abigail-tools, +Build-Depends: abigail-tools (>= 1.8-1), debhelper-compat (= 12), dh-python, libblkid-dev, diff --git a/debian/patches/0010-Check-for-libabigail-version.patch b/debian/patches/0010-Check-for-libabigail-version.patch new file mode 100644 index 00000000..70a6e6db --- /dev/null +++ b/debian/patches/0010-Check-for-libabigail-version.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: George Melikov +Date: Tue, 31 Aug 2021 20:49:29 +0300 +Subject: [PATCH] Check for libabigail version + +We need to use 1.8.0+ version, older versions +may segfault and give inconsistent results. + +Reviewed-by: John Kennedy +Reviewed-by: Brian Behlendorf +Signed-off-by: George Melikov +Closes #12529 +(cherry picked from commit a9655fc2bd1f83f1b305ff7ed16f698b87834e73) +Signed-off-by: Stoiko Ivanov +--- + Makefile.am | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4e7e29589..060729642 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -129,10 +129,20 @@ SHELLCHECKDIRS = cmd contrib etc scripts tests + SHELLCHECKSCRIPTS = autogen.sh + + PHONY += checkabi storeabi +-checkabi: lib ++ ++checklibabiversion: ++ libabiversion=`abidw -v | $(SED) 's/[^0-9]//g'`; \ ++ if test $$libabiversion -lt "180"; then \ ++ /bin/echo -e "\n" \ ++ "*** Please use libabigail 1.8.0 version or newer;\n" \ ++ "*** otherwise results are not consistent!\n"; \ ++ exit 1; \ ++ fi; ++ ++checkabi: checklibabiversion lib + $(MAKE) -C lib checkabi + +-storeabi: lib ++storeabi: checklibabiversion lib + $(MAKE) -C lib storeabi + + PHONY += mancheck diff --git a/debian/patches/0011-abi-tracking-sync-storabi-abidw-invocation-with-mast.patch b/debian/patches/0011-abi-tracking-sync-storabi-abidw-invocation-with-mast.patch new file mode 100644 index 00000000..12b3d632 --- /dev/null +++ b/debian/patches/0011-abi-tracking-sync-storabi-abidw-invocation-with-mast.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Stoiko Ivanov +Date: Fri, 3 Sep 2021 18:42:31 +0200 +Subject: [PATCH] abi-tracking: sync storabi abidw invocation with master + +This commit combines the changes to the storeabi invocation from: +739cfb965b00e9cc3155c4a0d6c24bd779b1a245 +0b072481afe26be3314a34bbb69556753ebb97ed +1aaebea2f58743b8d4b1bd7ec4b3b41d52cec30b + +this approach was chosen instead of cherry-picking due to the changes +in the first commit touching quite a few other code areas as well. + +Signed-off-by: Stoiko Ivanov +--- + config/Abigail.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/config/Abigail.am b/config/Abigail.am +index 599f61194..94687b90e 100644 +--- a/config/Abigail.am ++++ b/config/Abigail.am +@@ -25,5 +25,9 @@ checkabi: + storeabi: + cd .libs ; \ + for lib in $(lib_LTLIBRARIES) ; do \ +- abidw $${lib%.la}.so > ../$${lib%.la}.abi ; \ ++ abidw --no-show-locs \ ++ --no-corpus-path \ ++ --no-comp-dir-path \ ++ --type-id-style hash \ ++ $${lib%.la}.so > ../$${lib%.la}.abi ; \ + done diff --git a/debian/patches/series b/debian/patches/series index 91b8a3b1..3bbe6a8b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,5 @@ 0007-Use-installed-python3.patch 0008-Add-systemd-unit-for-importing-specific-pools.patch 0009-Patch-move-manpage-arcstat-1-to-arcstat-8.patch +0010-Check-for-libabigail-version.patch +0011-abi-tracking-sync-storabi-abidw-invocation-with-mast.patch -- 2.30.2