From 8d17352253e20ca74fc1139298b055631e432115 Mon Sep 17 00:00:00 2001 From: Umer Saleem Date: Fri, 29 Apr 2022 01:12:30 +0500 Subject: [PATCH] Revert "NAS-115872 / ZFS send: Fix -V operation for Linux" --- .github/workflows/checkstyle.yaml | 2 +- .github/workflows/zfs-tests-functional.yml | 2 +- .github/workflows/zfs-tests-sanity.yml | 2 +- .github/workflows/zloop.yml | 2 +- cmd/zfs/zfs_main.c | 7 ------- contrib/truenas/control | 2 +- lib/libuutil/libuutil.abi | 21 +++++++++++++++++++-- lib/libzfs/libzfs.abi | 1 - lib/libzfs_core/libzfs_core.abi | 21 +++++++++++++++++++-- tests/zfs-tests/cmd/getversion/getversion.c | 1 - 10 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml index 6b0d47c2d786..553d5df39796 100644 --- a/.github/workflows/checkstyle.yaml +++ b/.github/workflows/checkstyle.yaml @@ -15,7 +15,7 @@ jobs: run: | sudo apt-get update sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot linux-headers-$(uname -r) - sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev libbsd-dev python-dev python-setuptools python-cffi python3 python3-dev python3-setuptools python3-cffi + sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev python-dev python-setuptools python-cffi python3 python3-dev python3-setuptools python3-cffi # packages for tests sudo apt-get install --yes -qq parted lsscsi ksh attr acl nfs-kernel-server fio sudo apt-get install --yes -qq mandoc cppcheck pax-utils devscripts diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml index 43aff9dcaa47..adcbcb15681a 100644 --- a/.github/workflows/zfs-tests-functional.yml +++ b/.github/workflows/zfs-tests-functional.yml @@ -25,7 +25,7 @@ jobs: zlib1g-dev uuid-dev libblkid-dev libselinux-dev \ xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \ libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \ - libpam0g-dev libbsd-dev pamtester python-dev python-setuptools python-cffi \ + libpam0g-dev pamtester python-dev python-setuptools python-cffi \ python3 python3-dev python3-setuptools python3-cffi python3-packaging \ libcurl4-openssl-dev - name: Autogen.sh diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml index 294e11124870..c1e257dd1572 100644 --- a/.github/workflows/zfs-tests-sanity.yml +++ b/.github/workflows/zfs-tests-sanity.yml @@ -21,7 +21,7 @@ jobs: zlib1g-dev uuid-dev libblkid-dev libselinux-dev \ xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \ libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \ - libpam0g-dev libbsd-dev pamtester python-dev python-setuptools python-cffi \ + libpam0g-dev pamtester python-dev python-setuptools python-cffi \ python3 python3-dev python3-setuptools python3-cffi python3-packaging \ libcurl4-openssl-dev - name: Autogen.sh diff --git a/.github/workflows/zloop.yml b/.github/workflows/zloop.yml index 40835d59440f..cf81ad4bcafc 100644 --- a/.github/workflows/zloop.yml +++ b/.github/workflows/zloop.yml @@ -21,7 +21,7 @@ jobs: zlib1g-dev uuid-dev libblkid-dev libselinux-dev \ xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \ libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \ - libpam0g-dev libbsd-dev \ + libpam0g-dev \ python-dev python-setuptools python-cffi python-packaging \ python3 python3-dev python3-setuptools python3-cffi python3-packaging - name: Autogen.sh diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 9f793ed6171a..f8c9f2e86b19 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -8698,13 +8698,6 @@ main(int argc, char **argv) libzfs_print_on_error(g_zfs, B_TRUE); -#ifdef __linux__ -#ifdef HAVE_PROCTITLE - extern char **environ; - setproctitle_init(argc, argv, environ); -#endif -#endif - /* * Many commands modify input strings for string parsing reasons. * We create a copy to protect the original argv. diff --git a/contrib/truenas/control b/contrib/truenas/control index 59a08d25a28a..b5ee7c4a3e31 100644 --- a/contrib/truenas/control +++ b/contrib/truenas/control @@ -2,7 +2,7 @@ Source: openzfs Maintainer: Ryan Moeller Section: truenas Priority: extra -Build-Depends: build-essential, autoconf, automake, libtool, gawk, alien, fakeroot, libblkid-dev, uuid-dev, libudev-dev, libssl-dev, zlib1g-dev, libaio-dev, libattr1-dev, libelf-dev, linux-image-amd64, linux-headers-amd64, python3, python3-dev, python3-setuptools, python3-cffi, python3-packaging, python3-distlib, libffi-dev, libbsd-dev +Build-Depends: build-essential, autoconf, automake, libtool, gawk, alien, fakeroot, libblkid-dev, uuid-dev, libudev-dev, libssl-dev, zlib1g-dev, libaio-dev, libattr1-dev, libelf-dev, linux-image-amd64, linux-headers-amd64, python3, python3-dev, python3-setuptools, python3-cffi, python3-packaging, python3-distlib, libffi-dev Package: openzfs Architecture: amd64 diff --git a/lib/libuutil/libuutil.abi b/lib/libuutil/libuutil.abi index 4f01afb945f0..dac5032acdb4 100644 --- a/lib/libuutil/libuutil.abi +++ b/lib/libuutil/libuutil.abi @@ -1,6 +1,5 @@ - @@ -176,6 +175,8 @@ + + @@ -984,10 +985,26 @@ + - + + + + + + + + + + + + + + + + diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi index 22b7bed1bc6b..72c75571a7c3 100644 --- a/lib/libzfs/libzfs.abi +++ b/lib/libzfs/libzfs.abi @@ -6,7 +6,6 @@ - diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi index 8a3ed98df967..544f84ff3487 100644 --- a/lib/libzfs_core/libzfs_core.abi +++ b/lib/libzfs_core/libzfs_core.abi @@ -7,7 +7,6 @@ - @@ -245,6 +244,8 @@ + + @@ -1286,10 +1287,26 @@ + - + + + + + + + + + + + + + + + + diff --git a/tests/zfs-tests/cmd/getversion/getversion.c b/tests/zfs-tests/cmd/getversion/getversion.c index 0cee785c1bbc..62c1c5b6abc0 100644 --- a/tests/zfs-tests/cmd/getversion/getversion.c +++ b/tests/zfs-tests/cmd/getversion/getversion.c @@ -18,7 +18,6 @@ * Linux exposes it instead through an ioctl. */ -#include #include #include #include