From 207d5c728982d0a284b6905671195aaed285da744ab90b988909bb6fc8f4110e Mon Sep 17 00:00:00 2001 From: Jiri Bohac Date: Fri, 17 May 2024 14:10:25 +0000 Subject: [PATCH] - upgrade to version 2.0.5 * spec: differentiate between uninstall and upgrade in postun/preun (bsc#1191410) * spec: return success from pre, post, preun and postun scriplets (bsc#1222228) * add a note to README.txt about the flattened format (bsc#1221374) * use the same persistent device links as dracut (bsc#1222009, bsc#1219471) * remove dracut parse-root.sh hook (bsc#1221288) * always use nr_cpus, not maxcpus (bsc#1218180) * prevent mounting root in fadump (bsc#1219958) * update calibrate values OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=280 --- calibrate.conf.all | 202 ++++++++++++++++++++++++--------------------- kdump-2.0.1.tar.xz | 3 - kdump-2.0.5.tar.xz | 3 + kdump.changes | 13 +++ kdump.spec | 26 ++++-- 5 files changed, 140 insertions(+), 107 deletions(-) delete mode 100644 kdump-2.0.1.tar.xz create mode 100644 kdump-2.0.5.tar.xz diff --git a/calibrate.conf.all b/calibrate.conf.all index 88e7b26..3269f65 100644 --- a/calibrate.conf.all +++ b/calibrate.conf.all @@ -1,12 +1,12 @@ -alp1600.aarch64:INIT_CACHED=35308 -alp1600.aarch64:INIT_CACHED_NET=13196 -alp1600.aarch64:INIT_NET=4444 -alp1600.aarch64:KERNEL_BASE=93832 -alp1600.aarch64:KERNEL_INIT=23264 +alp1600.aarch64:INIT_CACHED=38920 +alp1600.aarch64:INIT_CACHED_NET=13580 +alp1600.aarch64:INIT_NET=4656 +alp1600.aarch64:KERNEL_BASE=79844 +alp1600.aarch64:KERNEL_INIT=25660 alp1600.aarch64:PAGESIZE=4096 -alp1600.aarch64:PERCPU=152 +alp1600.aarch64:PERCPU=144 alp1600.aarch64:SIZEOFPAGE=64 -alp1600.aarch64:USER_BASE=12132 +alp1600.aarch64:USER_BASE=14172 alp1600.aarch64:USER_NET=0 alp1600.i386:INIT_CACHED=42804 alp1600.i386:INIT_CACHED_NET=12916 @@ -18,46 +18,56 @@ alp1600.i386:PERCPU=136 alp1600.i386:SIZEOFPAGE=40 alp1600.i386:USER_BASE=13064 alp1600.i386:USER_NET=1868 -alp1600.ppc64:INIT_CACHED=92096 -alp1600.ppc64:INIT_CACHED_NET=20928 -alp1600.ppc64:INIT_NET=5056 -alp1600.ppc64:KERNEL_BASE=147840 -alp1600.ppc64:KERNEL_INIT=22208 +alp1600.ppc64:INIT_CACHED=85312 +alp1600.ppc64:INIT_CACHED_NET=21056 +alp1600.ppc64:INIT_NET=5184 +alp1600.ppc64:KERNEL_BASE=149184 +alp1600.ppc64:KERNEL_INIT=20544 alp1600.ppc64:PAGESIZE=65536 alp1600.ppc64:PERCPU=896 alp1600.ppc64:SIZEOFPAGE=64 -alp1600.ppc64:USER_BASE=87552 -alp1600.ppc64:USER_NET=4032 -alp1600.ppc64le:INIT_CACHED=81216 -alp1600.ppc64le:INIT_CACHED_NET=23616 -alp1600.ppc64le:INIT_NET=6336 -alp1600.ppc64le:KERNEL_BASE=146240 -alp1600.ppc64le:KERNEL_INIT=20224 +alp1600.ppc64:USER_BASE=47552 +alp1600.ppc64:USER_NET=1536 +alp1600.ppc64le:INIT_CACHED=89216 +alp1600.ppc64le:INIT_CACHED_NET=24128 +alp1600.ppc64le:INIT_NET=6528 +alp1600.ppc64le:KERNEL_BASE=136768 +alp1600.ppc64le:KERNEL_INIT=22272 alp1600.ppc64le:PAGESIZE=65536 alp1600.ppc64le:PERCPU=896 alp1600.ppc64le:SIZEOFPAGE=64 -alp1600.ppc64le:USER_BASE=40960 -alp1600.ppc64le:USER_NET=2112 -alp1600.s390x:INIT_CACHED=28560 -alp1600.s390x:INIT_CACHED_NET=12480 -alp1600.s390x:INIT_NET=4512 -alp1600.s390x:KERNEL_BASE=50036 -alp1600.s390x:KERNEL_INIT=14624 +alp1600.ppc64le:USER_BASE=45440 +alp1600.ppc64le:USER_NET=0 +alp1600.riscv64:INIT_CACHED=32504 +alp1600.riscv64:INIT_CACHED_NET=11580 +alp1600.riscv64:INIT_NET=5320 +alp1600.riscv64:KERNEL_BASE=107252 +alp1600.riscv64:KERNEL_INIT=23588 +alp1600.riscv64:PAGESIZE=4096 +alp1600.riscv64:PERCPU=144 +alp1600.riscv64:SIZEOFPAGE=64 +alp1600.riscv64:USER_BASE=12092 +alp1600.riscv64:USER_NET=1928 +alp1600.s390x:INIT_CACHED=31092 +alp1600.s390x:INIT_CACHED_NET=12644 +alp1600.s390x:INIT_NET=4564 +alp1600.s390x:KERNEL_BASE=46164 +alp1600.s390x:KERNEL_INIT=16312 alp1600.s390x:PAGESIZE=4096 -alp1600.s390x:PERCPU=148 +alp1600.s390x:PERCPU=136 alp1600.s390x:SIZEOFPAGE=64 -alp1600.s390x:USER_BASE=10280 -alp1600.s390x:USER_NET=1352 -alp1600.x86_64:INIT_CACHED=37336 -alp1600.x86_64:INIT_CACHED_NET=12928 -alp1600.x86_64:INIT_NET=5040 -alp1600.x86_64:KERNEL_BASE=108796 -alp1600.x86_64:KERNEL_INIT=23568 +alp1600.s390x:USER_BASE=12888 +alp1600.s390x:USER_NET=0 +alp1600.x86_64:INIT_CACHED=38308 +alp1600.x86_64:INIT_CACHED_NET=13152 +alp1600.x86_64:INIT_NET=5124 +alp1600.x86_64:KERNEL_BASE=86928 +alp1600.x86_64:KERNEL_INIT=24132 alp1600.x86_64:PAGESIZE=4096 alp1600.x86_64:PERCPU=292 alp1600.x86_64:SIZEOFPAGE=64 -alp1600.x86_64:USER_BASE=9232 -alp1600.x86_64:USER_NET=14408 +alp1600.x86_64:USER_BASE=15632 +alp1600.x86_64:USER_NET=0 leap150300.aarch64:INIT_CACHED=34920 leap150300.aarch64:INIT_CACHED_NET=9524 leap150300.aarch64:INIT_NET=3340 @@ -288,55 +298,55 @@ sle150500.x86_64:PERCPU=264 sle150500.x86_64:SIZEOFPAGE=64 sle150500.x86_64:USER_BASE=18320 sle150500.x86_64:USER_NET=4216 -sle150600.aarch64:INIT_CACHED=31832 -sle150600.aarch64:INIT_CACHED_NET=10384 -sle150600.aarch64:INIT_NET=3424 -sle150600.aarch64:KERNEL_BASE=82592 -sle150600.aarch64:KERNEL_INIT=17340 +sle150600.aarch64:INIT_CACHED=35400 +sle150600.aarch64:INIT_CACHED_NET=13468 +sle150600.aarch64:INIT_NET=4616 +sle150600.aarch64:KERNEL_BASE=94172 +sle150600.aarch64:KERNEL_INIT=21788 sle150600.aarch64:PAGESIZE=4096 -sle150600.aarch64:PERCPU=144 +sle150600.aarch64:PERCPU=152 sle150600.aarch64:SIZEOFPAGE=64 -sle150600.aarch64:USER_BASE=13620 -sle150600.aarch64:USER_NET=7968 -sle150600.ppc64le:INIT_CACHED=72832 -sle150600.ppc64le:INIT_CACHED_NET=17216 -sle150600.ppc64le:INIT_NET=3968 -sle150600.ppc64le:KERNEL_BASE=119744 -sle150600.ppc64le:KERNEL_INIT=16960 +sle150600.aarch64:USER_BASE=13644 +sle150600.aarch64:USER_NET=604 +sle150600.ppc64le:INIT_CACHED=79616 +sle150600.ppc64le:INIT_CACHED_NET=21248 +sle150600.ppc64le:INIT_NET=5248 +sle150600.ppc64le:KERNEL_BASE=151616 +sle150600.ppc64le:KERNEL_INIT=19968 sle150600.ppc64le:PAGESIZE=65536 sle150600.ppc64le:PERCPU=896 sle150600.ppc64le:SIZEOFPAGE=64 -sle150600.ppc64le:USER_BASE=62848 -sle150600.ppc64le:USER_NET=3136 -sle150600.s390x:INIT_CACHED=28240 -sle150600.s390x:INIT_CACHED_NET=9600 -sle150600.s390x:INIT_NET=3112 -sle150600.s390x:KERNEL_BASE=44856 -sle150600.s390x:KERNEL_INIT=12728 +sle150600.ppc64le:USER_BASE=52032 +sle150600.ppc64le:USER_NET=0 +sle150600.s390x:INIT_CACHED=31244 +sle150600.s390x:INIT_CACHED_NET=11916 +sle150600.s390x:INIT_NET=3928 +sle150600.s390x:KERNEL_BASE=49896 +sle150600.s390x:KERNEL_INIT=14772 sle150600.s390x:PAGESIZE=4096 -sle150600.s390x:PERCPU=140 +sle150600.s390x:PERCPU=144 sle150600.s390x:SIZEOFPAGE=64 -sle150600.s390x:USER_BASE=7568 -sle150600.s390x:USER_NET=12524 -sle150600.x86_64:INIT_CACHED=31096 -sle150600.x86_64:INIT_CACHED_NET=9704 -sle150600.x86_64:INIT_NET=3672 -sle150600.x86_64:KERNEL_BASE=97668 -sle150600.x86_64:KERNEL_INIT=17996 +sle150600.s390x:USER_BASE=14300 +sle150600.s390x:USER_NET=0 +sle150600.x86_64:INIT_CACHED=34220 +sle150600.x86_64:INIT_CACHED_NET=12532 +sle150600.x86_64:INIT_NET=4852 +sle150600.x86_64:KERNEL_BASE=93748 +sle150600.x86_64:KERNEL_INIT=21344 sle150600.x86_64:PAGESIZE=4096 -sle150600.x86_64:PERCPU=264 +sle150600.x86_64:PERCPU=276 sle150600.x86_64:SIZEOFPAGE=64 -sle150600.x86_64:USER_BASE=18624 -sle150600.x86_64:USER_NET=3424 -tumbleweed.aarch64:INIT_CACHED=35996 -tumbleweed.aarch64:INIT_CACHED_NET=13316 -tumbleweed.aarch64:INIT_NET=4608 -tumbleweed.aarch64:KERNEL_BASE=80040 -tumbleweed.aarch64:KERNEL_INIT=23512 +sle150600.x86_64:USER_BASE=15344 +sle150600.x86_64:USER_NET=0 +tumbleweed.aarch64:INIT_CACHED=38920 +tumbleweed.aarch64:INIT_CACHED_NET=13580 +tumbleweed.aarch64:INIT_NET=4656 +tumbleweed.aarch64:KERNEL_BASE=79844 +tumbleweed.aarch64:KERNEL_INIT=25660 tumbleweed.aarch64:PAGESIZE=4096 -tumbleweed.aarch64:PERCPU=152 +tumbleweed.aarch64:PERCPU=144 tumbleweed.aarch64:SIZEOFPAGE=64 -tumbleweed.aarch64:USER_BASE=12900 +tumbleweed.aarch64:USER_BASE=14172 tumbleweed.aarch64:USER_NET=0 tumbleweed.i386:INIT_CACHED=42804 tumbleweed.i386:INIT_CACHED_NET=12916 @@ -358,16 +368,16 @@ tumbleweed.ppc64:PERCPU=896 tumbleweed.ppc64:SIZEOFPAGE=64 tumbleweed.ppc64:USER_BASE=47552 tumbleweed.ppc64:USER_NET=1536 -tumbleweed.ppc64le:INIT_CACHED=84800 -tumbleweed.ppc64le:INIT_CACHED_NET=23872 -tumbleweed.ppc64le:INIT_NET=6464 -tumbleweed.ppc64le:KERNEL_BASE=145600 -tumbleweed.ppc64le:KERNEL_INIT=20736 +tumbleweed.ppc64le:INIT_CACHED=89216 +tumbleweed.ppc64le:INIT_CACHED_NET=24128 +tumbleweed.ppc64le:INIT_NET=6528 +tumbleweed.ppc64le:KERNEL_BASE=136768 +tumbleweed.ppc64le:KERNEL_INIT=22272 tumbleweed.ppc64le:PAGESIZE=65536 tumbleweed.ppc64le:PERCPU=896 tumbleweed.ppc64le:SIZEOFPAGE=64 -tumbleweed.ppc64le:USER_BASE=40832 -tumbleweed.ppc64le:USER_NET=5184 +tumbleweed.ppc64le:USER_BASE=45440 +tumbleweed.ppc64le:USER_NET=0 tumbleweed.riscv64:INIT_CACHED=32504 tumbleweed.riscv64:INIT_CACHED_NET=11580 tumbleweed.riscv64:INIT_NET=5320 @@ -378,23 +388,23 @@ tumbleweed.riscv64:PERCPU=144 tumbleweed.riscv64:SIZEOFPAGE=64 tumbleweed.riscv64:USER_BASE=12092 tumbleweed.riscv64:USER_NET=1928 -tumbleweed.s390x:INIT_CACHED=28560 -tumbleweed.s390x:INIT_CACHED_NET=12480 -tumbleweed.s390x:INIT_NET=4512 -tumbleweed.s390x:KERNEL_BASE=50036 -tumbleweed.s390x:KERNEL_INIT=14624 +tumbleweed.s390x:INIT_CACHED=31092 +tumbleweed.s390x:INIT_CACHED_NET=12644 +tumbleweed.s390x:INIT_NET=4564 +tumbleweed.s390x:KERNEL_BASE=46164 +tumbleweed.s390x:KERNEL_INIT=16312 tumbleweed.s390x:PAGESIZE=4096 -tumbleweed.s390x:PERCPU=148 +tumbleweed.s390x:PERCPU=136 tumbleweed.s390x:SIZEOFPAGE=64 -tumbleweed.s390x:USER_BASE=10280 -tumbleweed.s390x:USER_NET=1352 -tumbleweed.x86_64:INIT_CACHED=37336 -tumbleweed.x86_64:INIT_CACHED_NET=12928 -tumbleweed.x86_64:INIT_NET=5040 -tumbleweed.x86_64:KERNEL_BASE=108796 -tumbleweed.x86_64:KERNEL_INIT=23568 +tumbleweed.s390x:USER_BASE=12888 +tumbleweed.s390x:USER_NET=0 +tumbleweed.x86_64:INIT_CACHED=38308 +tumbleweed.x86_64:INIT_CACHED_NET=13152 +tumbleweed.x86_64:INIT_NET=5124 +tumbleweed.x86_64:KERNEL_BASE=86928 +tumbleweed.x86_64:KERNEL_INIT=24132 tumbleweed.x86_64:PAGESIZE=4096 tumbleweed.x86_64:PERCPU=292 tumbleweed.x86_64:SIZEOFPAGE=64 -tumbleweed.x86_64:USER_BASE=9232 -tumbleweed.x86_64:USER_NET=14408 +tumbleweed.x86_64:USER_BASE=15632 +tumbleweed.x86_64:USER_NET=0 diff --git a/kdump-2.0.1.tar.xz b/kdump-2.0.1.tar.xz deleted file mode 100644 index 251bfbe..0000000 --- a/kdump-2.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9855a60db02d016f668471c598dcdab0462416b8c0860b52b820e06c57c2e34a -size 71856 diff --git a/kdump-2.0.5.tar.xz b/kdump-2.0.5.tar.xz new file mode 100644 index 0000000..e78c4d6 --- /dev/null +++ b/kdump-2.0.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a003fda70336f523e5cfbbc89a56876c00b21e6b509f798dfb1e8c69a8a85ec9 +size 72864 diff --git a/kdump.changes b/kdump.changes index 118707d..ddee9ac 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 17 12:27:09 UTC 2024 - Jiri Bohac + +- upgrade to version 2.0.5 + * spec: differentiate between uninstall and upgrade in postun/preun (bsc#1191410) + * spec: return success from pre, post, preun and postun scriplets (bsc#1222228) + * add a note to README.txt about the flattened format (bsc#1221374) + * use the same persistent device links as dracut (bsc#1222009, bsc#1219471) + * remove dracut parse-root.sh hook (bsc#1221288) + * always use nr_cpus, not maxcpus (bsc#1218180) + * prevent mounting root in fadump (bsc#1219958) + * update calibrate values + ------------------------------------------------------------------- Thu Jan 18 13:42:32 UTC 2024 - Jiri Bohac diff --git a/kdump.spec b/kdump.spec index c3163af..6c02e61 100644 --- a/kdump.spec +++ b/kdump.spec @@ -57,7 +57,7 @@ %define dracutlibdir %{_prefix}/lib/dracut Name: kdump -Version: 2.0.1 +Version: 2.0.5 Release: 0 Summary: Kernel crash dump scripts and utilities License: GPL-2.0-or-later @@ -89,8 +89,6 @@ BuildRequires: python3 BuildRequires: qemu-ipxe BuildRequires: qemu-vgabios %endif -BuildRequires: systemd-sysvinit -BuildRequires: util-linux-systemd %endif Requires: /usr/bin/sed Requires: dracut >= 047 @@ -184,6 +182,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckdump %service_add_pre kdump.service %service_add_pre kdump-early.service %service_add_pre kdump-notify.service +exit 0 %post # change only permission if the file exists before /etc/sysconfig/kdump @@ -212,24 +211,35 @@ fi servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin %endif +exit 0 %preun %ifarch ppc64 ppc64le -servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh +if [ $1 -eq 0 ]; then + # removal, not upgrade + servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh +fi %endif echo "Stopping kdump ..." %service_del_preun kdump.service %service_del_preun kdump-early.service %service_del_preun kdump-notify.service +exit 0 %postun -# force regeneration of kdumprd -touch %{_sysconfdir}/sysconfig/kdump -# delete symbolic link -rm %{_localstatedir}/log/dump >/dev/null 2>&1 || true +if [ $1 -gt 0 ]; then + # upgrade + # force regeneration of kdumprd + touch %{_sysconfdir}/sysconfig/kdump +else + # removal + # delete symbolic link + rm %{_localstatedir}/log/dump >/dev/null 2>&1 || true +fi %service_del_postun kdump.service %service_del_postun kdump-early.service %service_del_postun kdump-notify.service +exit 0 %files %defattr(-,root,root)