Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2016-10-06 12:28:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2016-02-23 16:53:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2016-10-06 12:28:50.000000000 +0200 @@ -1,0 +2,35 @@ +Wed Oct 5 13:12:53 UTC 2016 - [email protected] + +- Remove kdump-helpers from Provides. This was needed to allow + upgrading in SLE10, but this distribution is discontinued now. + +------------------------------------------------------------------- +Wed Oct 5 10:55:39 UTC 2016 - [email protected] + +- kdump-cmake-compat.patch: Build fix for pre-3.0.2 cmake. + +------------------------------------------------------------------- +Wed Oct 5 07:53:00 UTC 2016 - [email protected] + +- Update to 0.8.16 +- Drop patches now in mainline: + o 0001-multipath-Write-proper-regex-into-multipath-conf.patch + o kdump-add-IPv6-KDUMP_NETCONFIG-modes.patch + o kdump-bootloader-grub2.patch + o kdump-calibrate-systemd-initramfs.patch + o kdump-calibrate-systemd-runtime.patch + o kdump-count-const-slabs.patch + o kdump-count-framebuffer.patch + o kdump-enable-fadump-ppc64le.patch + o kdump-fadump-bootloader-always.patch + o kdump-fadump-keep-sysroot.patch + o kdump-get-multipath-wwid-from-sysfs.patch + o kdump-move-network-setup-to-module-setup.patch + o kdump-remove-root-and-resume.patch + o kdump-split-kdump_default_netdev.patch + o kdump-systemd-support.patch + o kdump-use-fstab-device.patch +- Drop obsolete patches: + o kdump-0.8.15-fix-shebang.patch + +------------------------------------------------------------------- Old: ---- 0001-multipath-Write-proper-regex-into-multipath-conf.patch kdump-0.8.15-fix-shebang.patch kdump-0.8.15.tar.bz2 kdump-add-IPv6-KDUMP_NETCONFIG-modes.patch kdump-bootloader-grub2.patch kdump-calibrate-systemd-initramfs.patch kdump-calibrate-systemd-runtime.patch kdump-count-const-slabs.patch kdump-count-framebuffer.patch kdump-enable-fadump-ppc64le.patch kdump-fadump-bootloader-always.patch kdump-fadump-keep-sysroot.patch kdump-get-multipath-wwid-from-sysfs.patch kdump-move-network-setup-to-module-setup.patch kdump-remove-root-and-resume.patch kdump-split-kdump_default_netdev.patch kdump-systemd-support.patch kdump-use-fstab-device.patch kdump.service New: ---- kdump-0.8.16.tar.bz2 kdump-cmake-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump.spec ++++++ --- /var/tmp/diff_new_pack.gEwUM5/_old 2016-10-06 12:28:52.000000000 +0200 +++ /var/tmp/diff_new_pack.gEwUM5/_new 2016-10-06 12:28:52.000000000 +0200 @@ -16,6 +16,10 @@ # +# on systemd distros, rpm-build requires systemd-rpm-macros, +# which in turn defines %systemd_requires +%define systemd_present %{defined systemd_requires} + %define dracutlibdir %{_prefix}/lib/dracut %{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev)} @@ -28,76 +32,57 @@ %endif %define _udevrulesdir %{_udevdir}/rules.d -Url: https://github.com/ptesarik/kdump - Name: kdump -Version: 0.8.15 +Version: 0.8.16 Release: 0 -Requires: curl -Requires: makedumpfile -Requires: openssh Summary: Script for kdump License: GPL-2.0+ Group: System/Kernel +Url: https://github.com/ptesarik/kdump +Source: %{name}-%{version}.tar.bz2 +Source2: %{name}-rpmlintrc +Patch1: %{name}-cmake-compat.patch BuildRequires: asciidoc BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libblkid-devel BuildRequires: libcurl-devel BuildRequires: libelf-devel BuildRequires: libesmtp-devel BuildRequires: libopenssl-devel -BuildRequires: libssh2-devel BuildRequires: libxslt -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: udev BuildRequires: zlib-devel +Requires: curl +Requires: kexec-tools +Requires: makedumpfile +Requires: openssh +PreReq: %insserv_prereq %fillup_prereq +PreReq: coreutils +PreReq: sed +Recommends: cifs-utils +Recommends: nfs-client #!BuildIgnore: fop -%if 0%{?suse_version} > 1220 +# update should detect the split-off from kexec-tools +Provides: kexec-tools:%{_initddir}/kdump +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExcludeArch: s390 ppc +%if %{systemd_present} BuildRequires: systemd %endif -PreReq: %insserv_prereq %fillup_prereq %if 0%{?suse_version} > 1310 PreReq: dracut %else PreReq: mkinitrd %endif -Source: %{name}-%{version}.tar.bz2 -Source2: %{name}-rpmlintrc -Source3: kdump.service -Patch0: 0001-multipath-Write-proper-regex-into-multipath-conf.patch -Patch1: %{name}-use-fstab-device.patch -Patch2: %{name}-count-framebuffer.patch -Patch3: %{name}-count-const-slabs.patch -Patch4: %{name}-remove-root-and-resume.patch -Patch5: %{name}-systemd-support.patch -Patch6: %{name}-calibrate-systemd-runtime.patch -Patch7: %{name}-calibrate-systemd-initramfs.patch -Patch8: %{name}-get-multipath-wwid-from-sysfs.patch -Patch9: %{name}-split-kdump_default_netdev.patch -Patch10: %{name}-move-network-setup-to-module-setup.patch -Patch11: %{name}-add-IPv6-KDUMP_NETCONFIG-modes.patch -Patch12: %{name}-enable-fadump-ppc64le.patch -Patch13: %{name}-fadump-bootloader-always.patch -Patch14: %{name}-bootloader-grub2.patch -Patch15: %{name}-fadump-keep-sysroot.patch -Patch16: %{name}-0.8.15-fix-shebang.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) -Provides: kdump-helpers = %{version} -Obsoletes: kdump-helpers < %{version} -# update should detect the split-off from kexec-tools -Provides: kexec-tools:/etc/init.d/kdump -Requires: kexec-tools -%if 0%{?suse_version} > 1220 +%if %{systemd_present} %systemd_requires %endif -Recommends: nfs-client cifs-utils -PreReq: coreutils sed -ExcludeArch: s390 ppc %description kdump is a package that includes several scripts for kdump, including -the init script /etc/init.d/kdump and the configuration file for kdump. +the kdump service and configuration files The kernel package and this package are all that are required for a crash dump to occur. However, if you wish to debug the crash dump @@ -112,125 +97,110 @@ These packages are not needed to create the dump and can be installed after a crash dump has occured. -Authors: --------- - Bernhard Walle <[email protected]> - %prep -%setup -%patch0 -p1 +%setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 %build -export CFLAGS="%optflags" -export CXXFLAGS="%optflags -std=gnu++98" +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags} -std=gnu++98" mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .. -make +make %{?_smp_mflags} cd - %check cd build -make test +make %{?_smp_mflags} test %install cd build -make DESTDIR=$RPM_BUILD_ROOT install +make %{?_smp_mflags} DESTDIR=%{buildroot} install cd - # move udev rules -mkdir -p $RPM_BUILD_ROOT/%{_udevrulesdir} -mv $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/* $RPM_BUILD_ROOT/%{_udevrulesdir}/ +mkdir -p %{buildroot}/%{_udevrulesdir} +mv %{buildroot}/%{_sysconfdir}/udev/rules.d/* %{buildroot}/%{_udevrulesdir}/ # remove executable bit from non-binaries -chmod -x $RPM_BUILD_ROOT/lib/kdump/setup-kdump.functions -# symlink for init script -mkdir -p $RPM_BUILD_ROOT/sbin -ln -s /etc/init.d/boot.kdump $RPM_BUILD_ROOT/sbin/rckdump +chmod -x %{buildroot}/lib/kdump/setup-kdump.functions # empty directory -mkdir $RPM_BUILD_ROOT/var/crash +mkdir %{buildroot}/var/crash %if 0%{?suse_version} > 1310 -rm -r $RPM_BUILD_ROOT/lib/mkinitrd +rm -r %{buildroot}/lib/mkinitrd %endif -%if 0%{?suse_version} > 1220 -mkdir -p $RPM_BUILD_ROOT%{_unitdir} -install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir} +# symlink for init script +%if %{systemd_present} +rm %{buildroot}%{_initddir}/boot.kdump +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckdump +%else +rm %{buildroot}/usr/lib/systemd/system/kdump.service +rm %{buildroot}/usr/lib/systemd/system/kdump-rebuild-initrd.service +ln -s ../..%{_initddir}/boot.kdump %{buildroot}%{_sbindir}/rckdump %endif -%if 0%{?suse_version} > 1220 +%if %{systemd_present} %pre %service_add_pre kdump.service +%service_add_pre kdump-rebuild-initrd.service %endif %post # change only permission if the file exists before /etc/sysconfig/kdump # has been created from /var/adm/fillup-templates/sysconfig.kdump change_permission=0 -if [ ! -f /etc/sysconfig/kdump ] ; then +if [ ! -f %{_sysconfdir}/sysconfig/kdump ] ; then change_permission=1 fi +%if %{systemd_present} +%{fillup_only -n kdump} +%service_add_post kdump.service +%service_add_post kdump-rebuild-initrd.service +%else %{fillup_and_insserv -n kdump boot.kdump} +%endif if [ "$change_permission" = 1 ]; then - chmod 0600 /etc/sysconfig/kdump + chmod 0600 %{_sysconfdir}/sysconfig/kdump fi # if /var/log/dump is empty, make it a symlink to /var/crash if test -d /var/log/dump && rmdir /var/log/dump >/dev/null 2>&1 || ! test -d /var/log/dump ; then ln -snf /var/crash /var/log/dump fi -%if 0%{?suse_version} > 1220 -%service_add_post kdump.service -%endif %preun echo "Stopping kdump ..." -%stop_on_removal boot.kdump -%if 0%{?suse_version} > 1220 +%if %{systemd_present} %service_del_preun kdump.service +%service_del_preun kdump-rebuild-initrd.service +%else +%stop_on_removal boot.kdump %endif %postun # force regeneration of kdumprd -touch /etc/sysconfig/kdump +touch %{_sysconfdir}/sysconfig/kdump # delete symbolic link rm /var/log/dump >/dev/null 2>&1 || true +%if %{systemd_present} +%service_del_postun kdump.service +%service_del_postun kdump-rebuild-initrd.service +%else %restart_on_update boot.kdump %insserv_cleanup -%if 0%{?suse_version} > 1220 -%service_del_postun kdump.service %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc ChangeLog COPYING README NEWS %{_sbindir}/kdumptool %{_sbindir}/mkdumprd %{_sbindir}/kdump-bootloader.pl -%{_mandir}/man5/kdump.5.gz -%{_mandir}/man7/kdump.7.gz -%{_mandir}/man8/kdumptool.8.gz -%{_mandir}/man8/mkdumprd.8.gz -/sbin/rckdump -%{_sysconfdir}/init.d/boot.kdump -/var/adm/fillup-templates/sysconfig.kdump +%{_mandir}/man5/kdump.5%{ext_man} +%{_mandir}/man7/kdump.7%{ext_man} +%{_mandir}/man8/kdumptool.8%{ext_man} +%{_mandir}/man8/mkdumprd.8%{ext_man} +%{_localstatedir}/adm/fillup-templates/sysconfig.kdump %if 0%{?suse_version} <= 1310 /lib/mkinitrd/scripts/*-kdump.sh /lib/mkinitrd/scripts/setup-kdumpfs.sh @@ -242,8 +212,12 @@ %dir /lib/kdump /lib/kdump/* %{_udevrulesdir}/70-kdump.rules -%if 0%{?suse_version} > 1220 +%if %{systemd_present} %{_unitdir}/kdump.service +%{_unitdir}/kdump-rebuild-initrd.service +%else +%{_sysconfdir}/init.d/boot.kdump %endif +%{_sbindir}/rckdump %changelog ++++++ kdump-0.8.15.tar.bz2 -> kdump-0.8.16.tar.bz2 ++++++ ++++ 8053 lines of diff (skipped) ++++++ kdump-cmake-compat.patch ++++++ From: Petr Tesarik <[email protected]> Date: Wed Oct 5 08:48:38 2016 +0200 Subject: Avoid using TARGET_* cmake directives Upstream: never; compatibility with older SUSE distros The TARGET_INCLUDE_DIRECTORIES directive was added in cmake 3.0.2. It is not recognized by older versions. This patch can be removed when we stop caring about SLES11... Signed-off-by: Petr Tesarik <[email protected]> --- init/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/init/CMakeLists.txt +++ b/init/CMakeLists.txt @@ -20,8 +20,8 @@ ADD_EXECUTABLE(device-timeout-generator device-timeout-generator.c ) -TARGET_INCLUDE_DIRECTORIES(device-timeout-generator - PUBLIC ${BLKID_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES( + ${BLKID_INCLUDE_DIRS}) TARGET_LINK_LIBRARIES(device-timeout-generator ${BLKID_LIBRARIES})
