Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ndctl for openSUSE:Factory checked in at 2022-04-12 21:43:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndctl (Old) and /work/SRC/openSUSE:Factory/.ndctl.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndctl" Tue Apr 12 21:43:15 2022 rev:39 rq:968231 version:73 Changes: -------- --- /work/SRC/openSUSE:Factory/ndctl/ndctl.changes 2022-03-13 20:25:04.339648653 +0100 +++ /work/SRC/openSUSE:Factory/.ndctl.new.1900/ndctl.changes 2022-04-12 21:43:20.751677204 +0200 @@ -1,0 +2,43 @@ +Sun Apr 10 11:46:05 UTC 2022 - Michal Suchanek <[email protected]> + +- Provide compatibility symlink for libdaxctl.h in the old location + +------------------------------------------------------------------- +Tue Mar 8 12:57:40 UTC 2022 - Michal Suchanek <[email protected]> + +- Update to version 73: + * Many CXL fixes + * Fix shipped monitor.conf (bsc#1194696 https://github.com/pmem/ndctl/pull/189) + * inject-smart: Add support for papr + * Switch to meson build system + + ndctl-build-Fix-systemd-unit-directory-detection.patch + + ndctl-meson-make-modprobedatadir-an-option.patch +- Add monitor.conf migration as upstream has (bsc#1194696) +- Use %%config(noreplace) for files in /etc as upstream does. +- Update to version 72.1 + * Add support for CXL interface + * Configuration file rework + * Add service for automatic reconfiguration + * Drop upstreamed patches + - ndctl-namespace-skip-zero-namespaces-when-processing.patch + - ndctl-namespace-Suppress-ENXIO-when-processing-all-n.patch + - 0001-ndctl-namespace-Fix-disable-namespace-accounting-rel.patch + - 0002-Expose-ndctl_bus_nfit_translate_spa-as-a-public-func.patch + - 0003-libndctl-Unify-adding-dimms-for-papr-and-nfit-famili.patch + - 0004-daxctl-fail-reconfigure-device-based-on-kernel-onlin.patch + - 0005-libdaxctl-add-an-API-to-check-if-a-device-is-active.patch + - 0006-libndctl-check-for-active-system-ram-before-disablin.patch + - 0007-daxctl-emit-counts-of-total-and-online-memblocks.patch + - 0008-ndctl-Update-nvdimm-mailing-list-address.patch + - 0009-libndctl-papr-Fix-probe-for-papr-scm-compatible-nvdi.patch + - 0010-ndctl-scrub-Stop-translating-return-values.patch + - 0011-ndctl-scrub-Reread-scrub-engine-status-at-start.patch + - 0012-ndctl-dimm-Fix-label-index-block-calculations.patch + - 0013-daxctl-Add-Soft-Reservation-theory-of-operation.patch + - 0014-Documentation-ndctl-fix-self-reference-of-ndctl-disa.patch + - 0015-ndctl-docs-Clarify-update-firwmware-activation-overf.patch + - 0016-libndctl-papr-Add-support-for-reporting-shutdown-cou.patch +- Add rpmlinrc filter for libcxl and libdaxctl (boo#1191773). +- Fix asciidoctor conditional + +------------------------------------------------------------------- Old: ---- 0001-ndctl-namespace-Fix-disable-namespace-accounting-rel.patch 0002-Expose-ndctl_bus_nfit_translate_spa-as-a-public-func.patch 0003-libndctl-Unify-adding-dimms-for-papr-and-nfit-famili.patch 0004-daxctl-fail-reconfigure-device-based-on-kernel-onlin.patch 0005-libdaxctl-add-an-API-to-check-if-a-device-is-active.patch 0006-libndctl-check-for-active-system-ram-before-disablin.patch 0007-daxctl-emit-counts-of-total-and-online-memblocks.patch 0008-ndctl-Update-nvdimm-mailing-list-address.patch 0009-libndctl-papr-Fix-probe-for-papr-scm-compatible-nvdi.patch 0010-ndctl-scrub-Stop-translating-return-values.patch 0011-ndctl-scrub-Reread-scrub-engine-status-at-start.patch 0012-ndctl-dimm-Fix-label-index-block-calculations.patch 0013-daxctl-Add-Soft-Reservation-theory-of-operation.patch 0014-Documentation-ndctl-fix-self-reference-of-ndctl-disa.patch 0015-ndctl-docs-Clarify-update-firwmware-activation-overf.patch 0016-libndctl-papr-Add-support-for-reporting-shutdown-cou.patch ndctl-71.1.tar.gz ndctl-namespace-Suppress-ENXIO-when-processing-all-n.patch ndctl-namespace-skip-zero-namespaces-when-processing.patch New: ---- ndctl-73.tar.gz ndctl-build-Fix-systemd-unit-directory-detection.patch ndctl-meson-make-modprobedatadir-an-option.patch ndctl-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndctl.spec ++++++ --- /var/tmp/diff_new_pack.qz7S3s/_old 2022-04-12 21:43:21.479668832 +0200 +++ /var/tmp/diff_new_pack.qz7S3s/_new 2022-04-12 21:43:21.487668740 +0200 @@ -25,36 +25,21 @@ %define lname libndctl6 %define dname libndctl-devel Name: ndctl -Version: 71.1 +Version: 73 Release: 0 Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) License: GPL-2.0-only Group: Hardware/Other URL: https://github.com/pmem/ndctl Source0: https://github.com/pmem/ndctl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch9: %{name}-namespace-skip-zero-namespaces-when-processing.patch -Patch13: %{name}-namespace-Suppress-ENXIO-when-processing-all-n.patch +Source1: ndctl-rpmlintrc Patch14: harden_ndctl-monitor.service.patch -Patch15: 0001-ndctl-namespace-Fix-disable-namespace-accounting-rel.patch -Patch16: 0002-Expose-ndctl_bus_nfit_translate_spa-as-a-public-func.patch -Patch17: 0003-libndctl-Unify-adding-dimms-for-papr-and-nfit-famili.patch -Patch18: 0004-daxctl-fail-reconfigure-device-based-on-kernel-onlin.patch -Patch19: 0005-libdaxctl-add-an-API-to-check-if-a-device-is-active.patch -Patch20: 0006-libndctl-check-for-active-system-ram-before-disablin.patch -Patch21: 0007-daxctl-emit-counts-of-total-and-online-memblocks.patch -Patch22: 0008-ndctl-Update-nvdimm-mailing-list-address.patch -Patch23: 0009-libndctl-papr-Fix-probe-for-papr-scm-compatible-nvdi.patch -Patch24: 0010-ndctl-scrub-Stop-translating-return-values.patch -Patch25: 0011-ndctl-scrub-Reread-scrub-engine-status-at-start.patch -Patch26: 0012-ndctl-dimm-Fix-label-index-block-calculations.patch -Patch27: 0013-daxctl-Add-Soft-Reservation-theory-of-operation.patch -Patch28: 0014-Documentation-ndctl-fix-self-reference-of-ndctl-disa.patch -Patch29: 0015-ndctl-docs-Clarify-update-firwmware-activation-overf.patch -Patch30: 0016-libndctl-papr-Add-support-for-reporting-shutdown-cou.patch -BuildRequires: autoconf -BuildRequires: automake +Patch15: ndctl-build-Fix-systemd-unit-directory-detection.patch +Patch16: ndctl-meson-make-modprobedatadir-an-option.patch BuildRequires: keyutils-devel +BuildRequires: libiniparser-devel BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros BuildRequires: xmlto @@ -64,16 +49,18 @@ BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(uuid) ExclusiveArch: x86_64 aarch64 ppc64le %{?systemd_requires} # required for documentation -#if 0%{?suse_version} >= 1330 -%if %{defined rubygem(asciidoctor)} +%if 0%{?suse_version} >= 1330 BuildRequires: rubygem(asciidoctor) +%define asciidoc -Dasciidoctor=enabled %else BuildRequires: asciidoc BuildRequires: libxslt-tools +%define asciidoc -Dasciidoctor=disabled %endif %description @@ -115,23 +102,19 @@ %if 0%{?suse_version} > 1500 export CFLAGS="%optflags -fcommon" %endif -echo "%{version}" > version -./autogen.sh -CONF_FLAGS="--disable-static" -%if ! %{defined rubygem(asciidoctor)} -CONF_FLAGS="$CONF_FLAGS --disable-asciidoctor" -%endif -%configure $CONF_FLAGS -make %{?_smp_mflags} +%meson %{?asciidoc} -Dversion-tag=%{version} -Dmodprobedatadir=%{_modprobedir} +%meson_build %install %if 0%{?suse_version} > 1500 export CFLAGS="%optflags -fcommon" %endif -%make_install modprobedir=%{_modprobedir} +%meson_install find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_sbindir} ln -sf service %{buildroot}%{_sbindir}/rcndctl-monitor +# libdaxctl.h has moved breaking users of libdaxctl, provide a compatibility symlink +ln -s ../daxctl/libdaxctl.h %{buildroot}%{_includedir}/ndctl %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig @@ -143,9 +126,30 @@ [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || : done +if [ -f %{_sysconfdir}/ndctl/monitor.conf ] ; then + if ! [ -f %{_sysconfdir}/ndctl.conf.d/monitor.conf ] ; then + cp -a %{_sysconfdir}/ndctl/monitor.conf /var/run/ndctl-monitor.conf-migration + fi +fi %post %service_add_post ndctl-monitor.service +if [ -f /var/run/ndctl-monitor.conf-migration ] ; then + config_found=false + while read line ; do + [ -n "$line" ] || continue + case "$line" in + \#*) continue ;; + esac + config_found=true + break + done < /var/run/ndctl-monitor.conf-migration + if $config_found ; then + echo "[monitor]" > %{_sysconfdir}/ndctl.conf.d/monitor.conf + cat /var/run/ndctl-monitor.conf-migration >> %{_sysconfdir}/ndctl.conf.d/monitor.conf + fi + rm /var/run/ndctl-monitor.conf-migration +fi %preun %service_del_preun ndctl-monitor.service @@ -163,19 +167,28 @@ %files %license COPYING LICENSES/*/* %doc README.md CONTRIBUTING.md -%{_bindir}/ndctl +%{_bindir}/cxl %{_bindir}/daxctl +%{_bindir}/ndctl %{_sbindir}/rcndctl-monitor +%{_unitdir}/[email protected] +%{_udevrulesdir}/90-daxctl-device.rules %{_mandir}/man1/* +%dir %{_sysconfdir}/daxctl.conf.d +%config(noreplace) %{_sysconfdir}/daxctl.conf.d/daxctl.example.conf %dir %{_sysconfdir}/ndctl +%dir %{_sysconfdir}/ndctl.conf.d %dir %{_sysconfdir}/ndctl/keys %{_sysconfdir}/ndctl/keys/keys.readme -%config %{_sysconfdir}/ndctl/monitor.conf +%config(noreplace) %{_sysconfdir}/ndctl.conf.d/monitor.conf +%config(noreplace) %{_sysconfdir}/ndctl.conf.d/ndctl.conf %dir %{_modprobedir} %{_modprobedir}/nvdimm-security.conf %{_unitdir}/ndctl-monitor.service %dir %{_datadir}/bash-completion/ %dir %{_datadir}/bash-completion/completions/ +%{_datadir}/bash-completion/completions/cxl +%{_datadir}/bash-completion/completions/daxctl %{_datadir}/bash-completion/completions/ndctl %dir %{_datadir}/daxctl %{_datadir}/daxctl/daxctl.conf @@ -183,17 +196,22 @@ %files -n %{lname} %license COPYING LICENSES/*/* %doc README.md CONTRIBUTING.md -%{_libdir}/libndctl.so.* +%{_libdir}/libcxl.so.* %{_libdir}/libdaxctl.so.* +%{_libdir}/libndctl.so.* %files -n %{dname} %license COPYING LICENSES/*/* %doc README.md CONTRIBUTING.md -%{_includedir}/ndctl/ -%{_libdir}/libndctl.so -%{_libdir}/pkgconfig/libndctl.pc +%{_includedir}/cxl/ +%{_libdir}/libcxl.so +%{_libdir}/pkgconfig/libcxl.pc %{_includedir}/daxctl/ %{_libdir}/libdaxctl.so %{_libdir}/pkgconfig/libdaxctl.pc +%{_includedir}/ndctl/ +%{_libdir}/libndctl.so +%{_libdir}/pkgconfig/libndctl.pc +%{_mandir}/man3/* %changelog ++++++ ndctl-71.1.tar.gz -> ndctl-73.tar.gz ++++++ ++++ 24392 lines of diff (skipped) ++++++ ndctl-build-Fix-systemd-unit-directory-detection.patch ++++++ >From 26335a73f671b0f520e62547e6a5fd1b633fc06a Mon Sep 17 00:00:00 2001 From: Dan Williams <[email protected]> Date: Tue, 8 Mar 2022 21:28:05 -0800 Subject: [PATCH] build: Fix systemd unit directory detection Upstream: https://lore.kernel.org/nvdimm/164680368507.2861995.11649228118524518218.st...@dwillia2-desk3.amr.corp.intel.com Older distributions (like CentOS Stream 8) define the systemd unit directory variable in pkgconfig as ${systemdsystemunitdir}, instead of ${systemd_system_unit_dir}. Newer systemd pkgconfig uses both. Pick the older more compatible name for use. Fixes: 4e5faa1726d2 ("build: Add meson build infrastructure") Signed-off-by: Dan Williams <[email protected]> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 42e11aa..17ca65a 100644 --- a/meson.build +++ b/meson.build @@ -150,7 +150,7 @@ endif if get_option('systemd').enabled() systemd = dependency('systemd', required : true) - systemdunitdir = systemd.get_pkgconfig_variable('systemd_system_unit_dir') + systemdunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir') udev = dependency('udev', required : true) udevdir = udev.get_pkgconfig_variable('udevdir') udevrulesdir = udevdir / 'rules.d' -- 2.35.1 ++++++ ndctl-meson-make-modprobedatadir-an-option.patch ++++++ >From e5b064b2edc314d729dfe542e6928325011f2b91 Mon Sep 17 00:00:00 2001 From: Michal Suchanek <[email protected]> Date: Thu, 10 Mar 2022 14:10:25 +0100 Subject: [PATCH] meson: make modprobedatadir an option. Upstream: https://lore.kernel.org/nvdimm/[email protected]/T/#u The modprobe.d directory location is hardcoded. Fixes: 4e5faa1 ("build: Add meson build infrastructure") Signed-off-by: Michal Suchanek <[email protected]> --- contrib/meson.build | 5 ++++- meson_options.txt | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/meson.build b/contrib/meson.build index 4ed3c20..ad63a50 100644 --- a/contrib/meson.build +++ b/contrib/meson.build @@ -24,5 +24,8 @@ if bashcompletiondir != 'no' install_data('ndctl', rename : 'cxl', install_dir : bashcompletiondir) endif -modprobedatadir = get_option('sysconfdir') + '/modprobe.d/' +modprobedatadir = get_option('modprobedatadir') +if modprobedatadir == '' + modprobedatadir = get_option('modprobedatadir') +endif install_data('nvdimm-security.conf', install_dir : modprobedatadir) diff --git a/meson_options.txt b/meson_options.txt index aa4a6dc..3a68460 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -23,3 +23,5 @@ option('pkgconfiglibdir', type : 'string', value : '', description : 'directory for standard pkg-config files') option('bashcompletiondir', type : 'string', description : '''${datadir}/bash-completion/completions''') +option('modprobedatadir', type : 'string', + description : '''${sysconfdir}/modprobe.d/''') -- 2.35.1 ++++++ ndctl-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * # libraries shipped together with libndctl, no separate versioning addFilter("shlib-policy-name-error .* libcxl.so") addFilter("shlib-policy-name-error .* libdaxctl.so")
