Re: [PATCH v4] Split kexec-tools into kexec-tools, kdump-utils and makedumpfile

Hi Coiby, Adding Carl who commented on the MR. I've reviewed the patch and except for one problem it looks good to me now. The problem is that your new kdump-utils.spec is based on an older version of the kexec-tools.spec without my cleanup series. So it's silently reverting 8e0b359 ("spec: Clean up handling of dracut files") and 00c37d8 ("spec: Drop special handling for IA64 machines").

Furthermore, you missed two occurrences of a hard coded /usr/sbin for mkfadumprd in kdump-utils.spec. In addition I noticed that the makedumpfile.spec has two hard coded /usr/share/man and one /usr/share which should be %{_mandir} and %{_datadir} respectively.

I've also ran build tests for each of the new spec files on a freshly installed F38 server with only the rpmdevtools installed. Basically I ran the following steps $ spectool -g $spec $ dnf builddep $spec $ rpmbuild -ba $spec All builds were successful and the resulting rpms had the same content with only a few expected renames. In addition I also ran some install tests, i.e. tried to install (combinations of) the new rpms with and without an old kexec-tools package installed. All those tests worked as expected. With the problem above fixed you can add my Reviewed-and-Tested-by: Philipp Rudo <prudo(a)redhat.com&gt;

Two more comments on what Carl said in your discussion on the MR. 1) Carl asked to move the "small improvements" into separate commits before splitting the spec. In my opinion he's right. However, splitting those changes into separate commits will be quite tedious and we already spent quite some time. So I'm leaning towards the quick and dirty solution with all squashed together into one commit.

2) Carl asked why the new spec files are added to the kexec-tools dist git when they will ultimately be moved to their own repos. In this case I'm supporting Coiby. For me as a reviewer it was a big help to have all the changes together in one commit of one repo. For example if they weren't I couldn't have used things like git range-diff which is a big time saver when comparing different versions of a series. For me keeping the split in one commit followed by one or two commits that remove/move the new spec files and merge the commits together in one MR seems the bast way forward to me.

Thanks Philipp On Mon, 25 Sep 2023 16:35:50 +0800 Coiby Xu <coxu(a)redhat.com&gt; wrote: > Related: https://bugzilla.redhat.com/show_bug.cgi?id=2121912 > > This patch splits current kexec-tools into three packages kexec-tools, > kdump-utils and makedumpfile. > - the new kexec-tools is the same to the upstream kexec-tools which > provides the kexec and vmcore-dmesg binaries > - kdump-utils is responsible for building the kdump initrd and loading > it via the kexec binary > - makedumpfile is responsible for making a small dumpfile of vmcore > > It's desirable to make this package modular because 1) now there is a > growing user base to use the kexec reboot 2) packaging makedumpfile and > kexec-tools alone will reduce the maintenance work. > > When an old version of kexec-tools gets replaced by kdump-utils, > "%systemd_post" will be executed in the post scriptlet which has the > purpose to "systemctl preset kdump" for freshly installed kexec-tools. > But in the case of kdump-utils replacing kexec-tools, it is not needed > so skip this case. > > "dnf repoquery --whatrequires kexec-tools" shows the following packages > requires kexec-tools, > - abrt-addon-vmcore > - anaconda-install-env-deps > - cockpit-kdump > - dracut-kiwi-oem-dump > - realtime-setup > - retrace-server > > For those packages that need kdump, the dependency needs to point to > the new kdump-utils package instead. > > Note some small improvements are also made in this change, > - stop mkdir'ing kcp as kcp.c has been gone long time ago > - use autosetup to automatically apply patches > - add the GPL2 LICENSE https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt > for kdump-utils (the source code of makedumpfile and kexec-tools already > contain the license) > - remove unneeded Obsoletes > - use consistent build flags %make and %make_install (the benefits > include enabling parallel building automatically and avoiding installing > package file one by one) > > Cc: fedora-devel(a)lists.fedorahosted.org > Cc: Dusty Mabe <dustymabe(a)redhat.com&gt; > Cc: crash-catcher-owner(a)lists.fedorahosted.org > CC: anaconda-devel(a)lists.fedoraproject.org > Cc: Martin Pitt <mpitt(a)redhat.com&gt; > Cc: kiwi-images(a)googlegroups.com > Cc: Clark Williams <williams(a)redhat.com&gt; > Cc: Matěj Grabovský <mgrabovs(a)redhat.com&gt; > Suggested-by: Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl&gt; > Suggested-by: Philipp Rudo <prudo(a)redhat.com&gt; > Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt; > --- > v4 > - Carl George > - drop the message that reminds users to install kdump-utils manually in kexec-tools.spec > - use Recommends in kexec-tools.spec so kdump-utils can be installed automatically > - Use "Conflicts: kexec-tools < 2.0.27-2" in makemdupmfile.spec to prevent file conflicts > > v3 > - Philipp > - fix typos > - fix "[]]" issue > - use %{_sbindir} instead of /usr/sbin > - use "install -t -D" to simplify kdump-utils.spec > - drop an invalid comment > - drop /usr/share/kdump > - drop the kexec-tools-no-preset solution in F40 > - improve makedumpfile description > > - use "%triggerun -- kexec-tools " instead of "%triggerin -- kexec-tools < 2.0.27-2"? > - sync the changelog of kexec-tools with rawhide > - remove kexec_test by force (which is only built for x86) > > > v2 > - Philipp > - remove unneeded triggerpostun scriptlet that deletes the kdump initrd when a kernel package is removed > - remove triggerin scriptlet for inexistent kernel-kdump > - fix makedumpfile url error > - explain why %{_localstatedir}/lib/rpm-state/kexec-tools.no-pereset is needed > - remove the makedumpfile patches generated by packit > - kdump-utils uses its own version number > - fix the solution for not "systemctl preset kdump" when kdump-utils replacing the kexec-tools > - Add a message in kexec-tools.spec to let users know that kexec-tools has been splitted into three packages. > - use %make_build instead of make (https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro) > - use updated license from https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt (the previous one from upstream kexec-tools is outdated) > - drop "Provides kexec-tools" and "Obsoltes kexec-tools" in kdump-utils.spec to avoid the bug that kdump-utils gets installed without kexec-tools > - drop uneeded archdef definition > - add "BuildRequires: gcc" for kexec-tools which is required https://docs.fedoraproject.org/en-US/packaging-guidelines/C_and_C++/ > > v1 > - Zbigniew > - Use Provides correctly > - use one-per-line for BuildRequires, Requires and etc. > - don't change kdump.service state unexpectedly > - further split out makedumpfile [Philipp] > - s/kdump-tools/kdump-utils to have a unique name [Dave] > --- > COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++ > kdump-utils.spec | 271 +++++++++++++++++++++++++++++++++++ > kexec-tools.spec | 352 +++------------------------------------------- > makedumpfile.spec | 64 +++++++++ > 4 files changed, 696 insertions(+), 330 deletions(-) > create mode 100644 COPYING > create mode 100644 kdump-utils.spec > create mode 100644 makedumpfile.spec > > diff --git a/COPYING b/COPYING > new file mode 100644 > index 00000000..d159169d > --- /dev/null > +++ b/COPYING > @@ -0,0 +1,339 @@ > + GNU GENERAL PUBLIC LICENSE > + Version 2, June 1991 > + > + Copyright (C) 1989, 1991 Free Software Foundation, Inc., > + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > + Everyone is permitted to copy and distribute verbatim copies > + of this license document, but changing it is not allowed. > + > + Preamble > + > + The licenses for most software are designed to take away your > +freedom to share and change it. By contrast, the GNU General Public > +License is intended to guarantee your freedom to share and change free > +software--to make sure the software is free for all its users. This > +General Public License applies to most of the Free Software > +Foundation's software and to any other program whose authors commit to > +using it. (Some other Free Software Foundation software is covered by > +the GNU Lesser General Public License instead.) You can apply it to > +your programs, too. > + > + When we speak of free software, we are referring to freedom, not > +price. Our General Public Licenses are designed to make sure that you > +have the freedom to distribute copies of free software (and charge for > +this service if you wish), that you receive source code or can get it > +if you want it, that you can change the software or use pieces of it > +in new free programs; and that you know you can do these things. > + > + To protect your rights, we need to make restrictions that forbid > +anyone to deny you these rights or to ask you to surrender the rights. > +These restrictions translate to certain responsibilities for you if you > +distribute copies of the software, or if you modify it. > + > + For example, if you distribute copies of such a program, whether > +gratis or for a fee, you must give the recipients all the rights that > +you have. You must make sure that they, too, receive or can get the > +source code. And you must show them these terms so they know their > +rights. > + > + We protect your rights with two steps: (1) copyright the software, and > +(2) offer you this license which gives you legal permission to copy, > +distribute and/or modify the software. > + > + Also, for each author's protection and ours, we want to make certain > +that everyone understands that there is no warranty for this free > +software. If the software is modified by someone else and passed on, we > +want its recipients to know that what they have is not the original, so > +that any problems introduced by others will not reflect on the original > +authors' reputations. > + > + Finally, any free program is threatened constantly by software > +patents. We wish to avoid the danger that redistributors of a free > +program will individually obtain patent licenses, in effect making the > +program proprietary. To prevent this, we have made it clear that any > +patent must be licensed for everyone's free use or not licensed at all. > + > + The precise terms and conditions for copying, distribution and > +modification follow. > + > + GNU GENERAL PUBLIC LICENSE > + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION > + > + 0. This License applies to any program or other work which contains > +a notice placed by the copyright holder saying it may be distributed > +under the terms of this General Public License. The "Program", below, > +refers to any such program or work, and a "work based on the Program" > +means either the Program or any derivative work under copyright law: > +that is to say, a work containing the Program or a portion of it, > +either verbatim or with modifications and/or translated into another > +language. (Hereinafter, translation is included without limitation in > +the term "modification".) Each licensee is addressed as "you". > + > +Activities other than copying, distribution and modification are not > +covered by this License; they are outside its scope. The act of > +running the Program is not restricted, and the output from the Program > +is covered only if its contents constitute a work based on the > +Program (independent of having been made by running the Program). > +Whether that is true depends on what the Program does. > + > + 1. You may copy and distribute verbatim copies of the Program's > +source code as you receive it, in any medium, provided that you > +conspicuously and appropriately publish on each copy an appropriate > +copyright notice and disclaimer of warranty; keep intact all the > +notices that refer to this License and to the absence of any warranty; > +and give any other recipients of the Program a copy of this License > +along with the Program. > + > +You may charge a fee for the physical act of transferring a copy, and > +you may at your option offer warranty protection in exchange for a fee. > + > + 2. You may modify your copy or copies of the Program or any portion > +of it, thus forming a work based on the Program, and copy and > +distribute such modifications or work under the terms of Section 1 > +above, provided that you also meet all of these conditions: > + > + a) You must cause the modified files to carry prominent notices > + stating that you changed the files and the date of any change. > + > + b) You must cause any work that you distribute or publish, that in > + whole or in part contains or is derived from the Program or any > + part thereof, to be licensed as a whole at no charge to all third > + parties under the terms of this License. > + > + c) If the modified program normally reads commands interactively > + when run, you must cause it, when started running for such > + interactive use in the most ordinary way, to print or display an > + announcement including an appropriate copyright notice and a > + notice that there is no warranty (or else, saying that you provide > + a warranty) and that users may redistribute the program under > + these conditions, and telling the user how to view a copy of this > + License. (Exception: if the Program itself is interactive but > + does not normally print such an announcement, your work based on > + the Program is not required to print an announcement.) > + > +These requirements apply to the modified work as a whole. If > +identifiable sections of that work are not derived from the Program, > +and can be reasonably considered independent and separate works in > +themselves, then this License, and its terms, do not apply to those > +sections when you distribute them as separate works. But when you > +distribute the same sections as part of a whole which is a work based > +on the Program, the distribution of the whole must be on the terms of > +this License, whose permissions for other licensees extend to the > +entire whole, and thus to each and every part regardless of who wrote it. > + > +Thus, it is not the intent of this section to claim rights or contest > +your rights to work written entirely by you; rather, the intent is to > +exercise the right to control the distribution of derivative or > +collective works based on the Program. > + > +In addition, mere aggregation of another work not based on the Program > +with the Program (or with a work based on the Program) on a volume of > +a storage or distribution medium does not bring the other work under > +the scope of this License. > + > + 3. You may copy and distribute the Program (or a work based on it, > +under Section 2) in object code or executable form under the terms of > +Sections 1 and 2 above provided that you also do one of the following: > + > + a) Accompany it with the complete corresponding machine-readable > + source code, which must be distributed under the terms of Sections > + 1 and 2 above on a medium customarily used for software interchange; or, > + > + b) Accompany it with a written offer, valid for at least three > + years, to give any third party, for a charge no more than your > + cost of physically performing source distribution, a complete > + machine-readable copy of the corresponding source code, to be > + distributed under the terms of Sections 1 and 2 above on a medium > + customarily used for software interchange; or, > + > + c) Accompany it with the information you received as to the offer > + to distribute corresponding source code. (This alternative is > + allowed only for noncommercial distribution and only if you > + received the program in object code or executable form with such > + an offer, in accord with Subsection b above.) > + > +The source code for a work means the preferred form of the work for > +making modifications to it. For an executable work, complete source > +code means all the source code for all modules it contains, plus any > +associated interface definition files, plus the scripts used to > +control compilation and installation of the executable. However, as a > +special exception, the source code distributed need not include > +anything that is normally distributed (in either source or binary > +form) with the major components (compiler, kernel, and so on) of the > +operating system on which the executable runs, unless that component > +itself accompanies the executable. > + > +If distribution of executable or object code is made by offering > +access to copy from a designated place, then offering equivalent > +access to copy the source code from the same place counts as > +distribution of the source code, even though third parties are not > +compelled to copy the source along with the object code. > + > + 4. You may not copy, modify, sublicense, or distribute the Program > +except as expressly provided under this License. Any attempt > +otherwise to copy, modify, sublicense or distribute the Program is > +void, and will automatically terminate your rights under this License. > +However, parties who have received copies, or rights, from you under > +this License will not have their licenses terminated so long as such > +parties remain in full compliance. > + > + 5. You are not required to accept this License, since you have not > +signed it. However, nothing else grants you permission to modify or > +distribute the Program or its derivative works. These actions are > +prohibited by law if you do not accept this License. Therefore, by > +modifying or distributing the Program (or any work based on the > +Program), you indicate your acceptance of this License to do so, and > +all its terms and conditions for copying, distributing or modifying > +the Program or works based on it. > + > + 6. Each time you redistribute the Program (or any work based on the > +Program), the recipient automatically receives a license from the > +original licensor to copy, distribute or modify the Program subject to > +these terms and conditions. You may not impose any further > +restrictions on the recipients' exercise of the rights granted herein. > +You are not responsible for enforcing compliance by third parties to > +this License. > + > + 7. If, as a consequence of a court judgment or allegation of patent > +infringement or for any other reason (not limited to patent issues), > +conditions are imposed on you (whether by court order, agreement or > +otherwise) that contradict the conditions of this License, they do not > +excuse you from the conditions of this License. If you cannot > +distribute so as to satisfy simultaneously your obligations under this > +License and any other pertinent obligations, then as a consequence you > +may not distribute the Program at all. For example, if a patent > +license would not permit royalty-free redistribution of the Program by > +all those who receive copies directly or indirectly through you, then > +the only way you could satisfy both it and this License would be to > +refrain entirely from distribution of the Program. > + > +If any portion of this section is held invalid or unenforceable under > +any particular circumstance, the balance of the section is intended to > +apply and the section as a whole is intended to apply in other > +circumstances. > + > +It is not the purpose of this section to induce you to infringe any > +patents or other property right claims or to contest validity of any > +such claims; this section has the sole purpose of protecting the > +integrity of the free software distribution system, which is > +implemented by public license practices. Many people have made > +generous contributions to the wide range of software distributed > +through that system in reliance on consistent application of that > +system; it is up to the author/donor to decide if he or she is willing > +to distribute software through any other system and a licensee cannot > +impose that choice. > + > +This section is intended to make thoroughly clear what is believed to > +be a consequence of the rest of this License. > + > + 8. If the distribution and/or use of the Program is restricted in > +certain countries either by patents or by copyrighted interfaces, the > +original copyright holder who places the Program under this License > +may add an explicit geographical distribution limitation excluding > +those countries, so that distribution is permitted only in or among > +countries not thus excluded. In such case, this License incorporates > +the limitation as if written in the body of this License. > + > + 9. The Free Software Foundation may publish revised and/or new versions > +of the General Public License from time to time. Such new versions will > +be similar in spirit to the present version, but may differ in detail to > +address new problems or concerns. > + > +Each version is given a distinguishing version number. If the Program > +specifies a version number of this License which applies to it and "any > +later version", you have the option of following the terms and conditions > +either of that version or of any later version published by the Free > +Software Foundation. If the Program does not specify a version number of > +this License, you may choose any version ever published by the Free Software > +Foundation. > + > + 10. If you wish to incorporate parts of the Program into other free > +programs whose distribution conditions are different, write to the author > +to ask for permission. For software which is copyrighted by the Free > +Software Foundation, write to the Free Software Foundation; we sometimes > +make exceptions for this. Our decision will be guided by the two goals > +of preserving the free status of all derivatives of our free software and > +of promoting the sharing and reuse of software generally. > + > + NO WARRANTY > + > + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY > +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN > +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES > +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED > +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF > +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS > +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE > +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, > +REPAIR OR CORRECTION. > + > + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING > +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR > +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, > +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING > +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED > +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY > +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER > +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE > +POSSIBILITY OF SUCH DAMAGES. > + > + END OF TERMS AND CONDITIONS > + > + How to Apply These Terms to Your New Programs > + > + If you develop a new program, and you want it to be of the greatest > +possible use to the public, the best way to achieve this is to make it > +free software which everyone can redistribute and change under these terms. > + > + To do so, attach the following notices to the program. It is safest > +to attach them to the start of each source file to most effectively > +convey the exclusion of warranty; and each file should have at least > +the "copyright" line and a pointer to where the full notice is found. > + > + <one line to give the program's name and a brief idea of what it does.> > + Copyright (C) <year> <name of author> > + > + This program is free software; you can redistribute it and/or modify > + it under the terms of the GNU General Public License as published by > + the Free Software Foundation; either version 2 of the License, or > + (at your option) any later version. > + > + This program is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + GNU General Public License for more details. > + > + You should have received a copy of the GNU General Public License along > + with this program; if not, write to the Free Software Foundation, Inc., > + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + > +Also add information on how to contact you by electronic and paper mail. > + > +If the program is interactive, make it output a short notice like this > +when it starts in an interactive mode: > + > + Gnomovision version 69, Copyright (C) year name of author > + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. > + This is free software, and you are welcome to redistribute it > + under certain conditions; type `show c' for details. > + > +The hypothetical commands `show w' and `show c' should show the appropriate > +parts of the General Public License. Of course, the commands you use may > +be called something other than `show w' and `show c'; they could even be > +mouse-clicks or menu items--whatever suits your program. > + > +You should also get your employer (if you work as a programmer) or your > +school, if any, to sign a "copyright disclaimer" for the program, if > +necessary. Here is a sample; alter the names: > + > + Yoyodyne, Inc., hereby disclaims all copyright interest in the program > + `Gnomovision' (which makes passes at compilers) written by James Hacker. > + > + <signature of Ty Coon>, 1 April 1989 > + Ty Coon, President of Vice > + > +This General Public License does not permit incorporating your program into > +proprietary programs. If your program is a subroutine library, you may > +consider it more useful to permit linking proprietary applications with the > +library. If this is what you want to do, use the GNU Lesser General > +Public License instead of this License. > diff --git a/kdump-utils.spec b/kdump-utils.spec > new file mode 100644 > index 00000000..2fe359c3 > --- /dev/null > +++ b/kdump-utils.spec > @@ -0,0 +1,271 @@ > +Name: kdump-utils > +Version: 1.0.42 > +Release: 1%{?dist} > +Summary: Kernel crash dump collection utilities > + > +License: GPL-2.0-only > +%ifarch ppc64 ppc64le > +Requires(post): servicelog > +Recommends: keyutils > +%endif > +Requires(pre): coreutils > +Requires(pre): sed > +Requires: kexec-tools >= 2.0.27-2 > +Requires: makedumpfile > +Requires: dracut >= 058 > +Requires: dracut-network >= 058 > +Requires: dracut-squash >= 058 > +Requires: ethtool > +Requires: util-linux > +Requires: binutils > +Recommends: grubby > +Recommends: hostname > +BuildRequires: systemd-rpm-macros > + > +%ifnarch s390x > +Requires: systemd-udev%{?_isa} > +%endif > + > +Source1: kdumpctl > +Source2: COPYING > +Source3: gen-kdump-sysconfig.sh > +Source4: gen-kdump-conf.sh > +Source7: mkdumprd > +Source10: kexec-kdump-howto.txt > +Source11: fadump-howto.txt > +Source12: mkdumprd.8 > +Source13: 98-kexec.rules > +Source14: 98-kexec.rules.ppc64 > +Source15: kdump.conf.5 > +Source16: kdump.service > +Source20: kdump-lib.sh > +Source21: kdump-in-cluster-environment.txt > +Source22: kdump-dep-generator.sh > +Source23: kdump-lib-initramfs.sh > +Source25: kdumpctl.8 > +Source26: live-image-kdump-howto.txt > +Source27: early-kdump-howto.txt > +Source28: kdump-udev-throttler > +Source30: 60-kdump.install > +Source31: kdump-logger.sh > +Source32: mkfadumprd > +Source33: 92-crashkernel.install > +Source34: crashkernel-howto.txt > +Source35: kdump-migrate-action.sh > +Source36: kdump-restart.sh > +Source37: 60-fadump.install > + > +Source100: dracut-kdump.sh > +Source101: dracut-module-setup.sh > +Source102: dracut-monitor_dd_progress > +Source104: dracut-kdump-emergency.service > +Source106: dracut-kdump-capture.service > +Source107: dracut-kdump-emergency.target > +Source108: dracut-early-kdump.sh > +Source109: dracut-early-kdump-module-setup.sh > + > +Source200: dracut-fadump-init-fadump.sh > +Source201: dracut-fadump-module-setup.sh > + > +%description > +kdump-utils is reponsible for collecting the crash kernel dump. It builds and > +loads the kdump initramfs so when a kernel crashes, the system will boot the > +kdump kernel and initramfs to save the colletecd crash kernel dump to specified > +target. > + > +%build > +# setup the license and docs > +# don't copy the files if they exist otherwise building the packages locally > +# using tools like fedpkg will fail > +if [ ! -e COPYING ]; then > + cp %{SOURCE2} . > + cp %{SOURCE10} . > + cp %{SOURCE11} . > + cp %{SOURCE21} . > + cp %{SOURCE26} . > + cp %{SOURCE27} . > + cp %{SOURCE34} . > +fi > + > +# Generate sysconfig file > +%{SOURCE3} %{_target_cpu} > kdump.sysconfig > +%{SOURCE4} %{_target_cpu} > kdump.conf > + > +%install > +mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump/pre.d > +mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump/post.d > +mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash > +mkdir -p -m755 $RPM_BUILD_ROOT%{_udevrulesdir} > +mkdir -p -m755 $RPM_BUILD_ROOT%{_sharedstatedir}/kdump > + > +install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/kdumpctl > +install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_sbindir}/mkdumprd > +install -D -m 644 kdump.conf $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf > +install -D -m 644 kdump.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump > +install -D -m 644 %{SOURCE12} %{SOURCE25} -t $RPM_BUILD_ROOT%{_mandir}/man8 > +install -D -m 755 %{SOURCE20} %{SOURCE23} %{SOURCE31} -t $RPM_BUILD_ROOT%{_prefix}/lib/kdump > +%ifarch ppc64 ppc64le > +install -m 755 %{SOURCE32} $RPM_BUILD_ROOT/usr/sbin/mkfadumprd > +install -m 755 %{SOURCE35} %{SOURCE36} -t $RPM_BUILD_ROOT%{_prefix}/lib/kdump > +%endif > +%ifnarch s390x > +install -m 755 %{SOURCE28} $RPM_BUILD_ROOT%{_udevrulesdir}/../kdump-udev-throttler > +%endif > +%ifnarch s390x ppc64 ppc64le > +# For s390x the ELF header is created in the kdump kernel and therefore kexec > +# udev rules are not required > +install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules > +%endif > +%ifarch ppc64 ppc64le > +install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules > +install -m 755 -D %{SOURCE37} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-fadump.install > +%endif > +install -D -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5 > +install -D -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service > +install -m 755 -D %{SOURCE22} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh > +install -m 755 -D %{SOURCE30} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-kdump.install > +install -m 755 -D %{SOURCE33} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/92-crashkernel.install > + > +%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') > +%define remove_dracut_early_kdump_prefix() %(echo -n %1|sed 's/.*dracut-early-kdump-//g') > +%define remove_dracut_fadump_prefix() %(echo -n %1|sed 's/.*dracut-fadump-//g') > + > +# deal with dracut modules > +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase > +cp %{SOURCE100} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}} > +cp %{SOURCE101} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}} > +cp %{SOURCE102} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE102}} > +cp %{SOURCE104} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE104}} > +cp %{SOURCE106} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE106}} > +cp %{SOURCE107} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE107}} > +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE100}} > +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/%{remove_dracut_prefix %{SOURCE101}} > +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump > +cp %{SOURCE108} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} > +cp %{SOURCE109} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}} > +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_prefix %{SOURCE108}} > +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99earlykdump/%{remove_dracut_early_kdump_prefix %{SOURCE109}} > +%ifarch ppc64 ppc64le > +mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit > +cp %{SOURCE200} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit/%{remove_dracut_fadump_prefix %{SOURCE200}} > +cp %{SOURCE201} $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit/%{remove_dracut_fadump_prefix %{SOURCE201}} > +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit/%{remove_dracut_fadump_prefix %{SOURCE200}} > +chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99zz-fadumpinit/%{remove_dracut_fadump_prefix %{SOURCE201}} > +%endif > + > + > +%define dracutlibdir %{_prefix}/lib/dracut > +#and move the custom dracut modules to the dracut directory > +mkdir -p $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/ > +mv $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/* $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/ > + > +# don't try to systemctl preset the kdump service for old kexec-tools > +# > +# when the old kexec-tools gets removed, this trigger will be excuted to > +# create a file. So later the posttrans scriptlet will know there is no need to > +# systemctl preset the kdump service. > +# This solution can be dropped in F40 when we assume no users will use old > +# version of kexec-tools. > +%define kexec_tools_no_preset %{_localstatedir}/lib/rpm-state/kexec-tools.no-preset > +%triggerun -- kexec-tools > +touch %{kexec_tools_no_preset} > + > +%post > +touch /etc/kdump.conf > + > +%ifarch ppc64 ppc64le > +servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh 2>/dev/null > +servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin >/dev/null > +%endif > + > +# This portion of the script is temporary. Its only here > +# to fix up broken boxes that require special settings > +# in /etc/sysconfig/kdump. It will be removed when > +# These systems are fixed. > + > +if [ -d /proc/bus/mckinley ] > +then > + # This is for HP zx1 machines > + # They require machvec=dig on the kernel command line > + sed -e's/\(^KDUMP_COMMANDLINE_APPEND.*\)\("$\)/\1 machvec=dig"/' \ > + /etc/sysconfig/kdump > /etc/sysconfig/kdump.new > + mv /etc/sysconfig/kdump.new /etc/sysconfig/kdump > +elif [ -d /proc/sgi_sn ] > +then > + # This is for SGI SN boxes > + # They require the --noio option to kexec > + # since they don't support legacy io > + sed -e's/\(^KEXEC_ARGS.*\)\("$\)/\1 --noio"/' \ > + /etc/sysconfig/kdump > /etc/sysconfig/kdump.new > + mv /etc/sysconfig/kdump.new /etc/sysconfig/kdump > +fi > + > + > +%postun > +%systemd_postun_with_restart kdump.service > + > +%preun > +%ifarch ppc64 ppc64le > +servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh >/dev/null > +%endif > +%systemd_preun kdump.service > + > +%posttrans > +# don't try to systemctl preset the kdump service for old kexec-tools > +if [[ -f %{kexec_tools_no_preset} ]]; then > + # this if branch can be removed in F40 when we assume no users will use the old kexec-tools > + rm %{kexec_tools_no_preset} > +else > + # Initial installation > + %systemd_post kdump.service > +fi > +# Try to reset kernel crashkernel value to new default value or set up > +# crasherkernel value for new install > +# > +# Note > +# 1. Skip ostree systems as they are not supported. > +# 2. For Fedora 36 and RHEL9, "[ $1 == 1 ]" in posttrans scriptlet means both install and upgrade; > +# For Fedora > 36, "[ $1 == 1 ]" only means install and "[ $1 == 2 ]" means upgrade > +if [ ! -f /run/ostree-booted ] && [ $1 == 1 -o $1 == 2 ]; then > + kdumpctl _reset-crashkernel-after-update > + : > +fi > + > +%files > +%ifarch ppc64 ppc64le > +/usr/sbin/mkfadumprd > +%{_prefix}/lib/kernel/install.d/60-fadump.install > +%endif > +%{_sbindir}/mkdumprd > +%{_bindir}/* > +%{_prefix}/lib/kdump > +%config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump > +%config(noreplace,missingok) %verify(not mtime) %{_sysconfdir}/kdump.conf > +%ifnarch s390x > +%config %{_udevrulesdir} > +%{_udevrulesdir}/../kdump-udev-throttler > +%endif > +%{dracutlibdir}/modules.d/* > +%dir %{_localstatedir}/crash > +%dir %{_sysconfdir}/kdump > +%dir %{_sysconfdir}/kdump/pre.d > +%dir %{_sysconfdir}/kdump/post.d > +%dir %{_sharedstatedir}/kdump > +%{_mandir}/man8/kdumpctl.8.gz > +%{_mandir}/man8/mkdumprd.8.gz > +%{_mandir}/man5/* > +%{_unitdir}/kdump.service > +%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh > +%{_prefix}/lib/kernel/install.d/60-kdump.install > +%{_prefix}/lib/kernel/install.d/92-crashkernel.install > +%license COPYING > +%doc kexec-kdump-howto.txt > +%doc early-kdump-howto.txt > +%doc fadump-howto.txt > +%doc kdump-in-cluster-environment.txt > +%doc live-image-kdump-howto.txt > +%doc crashkernel-howto.txt > + > +%changelog > +* Thu Aug 24 2023 Coiby <coxu(a)redhat.com&gt; - 2.0.26-9 > +- split from kexec-tools > diff --git a/kexec-tools.spec b/kexec-tools.spec > index e51d496c..af9c8016 100644 > --- a/kexec-tools.spec > +++ b/kexec-tools.spec > @@ -1,131 +1,25 @@ > -%global eppic_ver e8844d3793471163ae4a56d8f95897be9e5bd554 > -%global eppic_shortver %(c=%{eppic_ver}; echo ${c:0:7}) > -%global mkdf_ver 1.7.2 > -%global mkdf_shortver %(c=%{mkdf_ver}; echo ${c:0:7}) > - > Name: kexec-tools > Version: 2.0.27 > -Release: 1%{?dist} > -License: GPL-2.0-only > -Summary: The kexec/kdump userspace component > +Release: 2%{?dist} > +Summary: The kexec userspace component > > +License: GPL-2.0-only > Source0: http://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz > -Source1: kdumpctl > -Source3: gen-kdump-sysconfig.sh > -Source4: gen-kdump-conf.sh > -Source7: mkdumprd > -Source9: https://github.com/makedumpfile/makedumpfile/archive/%{mkdf_ver}/makedump... > -Source10: kexec-kdump-howto.txt > -Source11: fadump-howto.txt > -Source12: mkdumprd.8 > -Source13: 98-kexec.rules > -Source14: 98-kexec.rules.ppc64 > -Source15: kdump.conf.5 > -Source16: kdump.service > -Source19: https://github.com/lucchouina/eppic/archive/%{eppic_ver}/eppic-%{eppic_sh... > -Source20: kdump-lib.sh > -Source21: kdump-in-cluster-environment.txt > -Source22: kdump-dep-generator.sh > -Source23: kdump-lib-initramfs.sh > -Source25: kdumpctl.8 > -Source26: live-image-kdump-howto.txt > -Source27: early-kdump-howto.txt > -Source28: kdump-udev-throttler > -Source30: 60-kdump.install > -Source31: kdump-logger.sh > -Source32: mkfadumprd > -Source33: 92-crashkernel.install > -Source34: crashkernel-howto.txt > -Source35: kdump-migrate-action.sh > -Source36: kdump-restart.sh > -Source37: 60-fadump.install > - > -####################################### > -# These are sources for mkdumpramfs > -# Which is currently in development > -####################################### > -Source100: dracut-kdump.sh > -Source101: dracut-module-setup.sh > -Source102: dracut-monitor_dd_progress > -Source104: dracut-kdump-emergency.service > -Source106: dracut-kdump-capture.service > -Source107: dracut-kdump-emergency.target > -Source108: dracut-early-kdump.sh > -Source109: dracut-early-kdump-module-setup.sh > - > -Source200: dracut-fadump-init-fadump.sh > -Source201: dracut-fadump-module-setup.sh > - > -%ifarch ppc64 ppc64le > -Requires(post): servicelog > -Recommends: keyutils > -%endif > -Requires(pre): coreutils sed zlib > -Requires: dracut >= 058 > -Requires: dracut-network >= 058 > -Requires: dracut-squash >= 058 > -Requires: ethtool > -Requires: util-linux > -# Needed for UKI support > -Recommends: binutils > -Recommends: grubby > -Recommends: hostname > -BuildRequires: make > -BuildRequires: zlib-devel elfutils-devel glib2-devel bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel libzstd-devel > -BuildRequires: pkgconfig intltool gettext > -BuildRequires: systemd-rpm-macros > -BuildRequires: automake autoconf libtool > - > -%ifnarch s390x > -Requires: systemd-udev%{?_isa} > -%endif > - > -#START INSERT > - > -# > -# Patches 0 through 100 are meant for x86 kexec-tools enablement > -# > - > -# > -# Patches 101 through 200 are meant for x86_64 kexec-tools enablement > -# > - > -# > -# Patches 301 through 400 are meant for ppc64 kexec-tools enablement > -# > - > -# > -# Patches 401 through 500 are meant for s390 kexec-tools enablement > -# > > -# > -# Patches 501 through 600 are meant for ARM kexec-tools enablement > -# > - > -# > -# Patches 601 onward are generic patches > -# > -Patch601: kexec-tools-2.0.26-makedumpfile-Fix-wrong-exclusion-of-slab-pages-on-Linux-6.2.patch > +Recommends: kdump-utils > +BuildRequires: automake > +BuildRequires: autoconf > +BuildRequires: libtool > +BuildRequires: gcc > > %description > -kexec-tools provides /sbin/kexec binary that facilitates a new > -kernel to boot using the kernel's kexec feature either on a > -normal or a panic reboot. This package contains the /sbin/kexec > -binary and ancillary utilities that together form the userspace > -component of the kernel's kexec feature. > +kexec-tools provides /sbin/kexec binary that facilitates a new kernel to boot > +using the kernel's kexec feature either on a normal or a panic reboot. This > +package contains the kexec and vmcore-dmesg binaries as the userspace component > +of the kernel's kexec feature. > > %prep > -%setup -q > - > -mkdir -p -m755 kcp > -tar -z -x -v -f %{SOURCE9} > -tar -z -x -v -f %{SOURCE19} > - > -%patch601 -p1 > - > -%ifarch ppc > -%define archdef ARCH=ppc > -%endif > +%autosetup > > %build > autoreconf > @@ -138,228 +32,26 @@ autoreconf > --host=powerpc64le-redhat-linux-gnu \ > --build=powerpc64le-redhat-linux-gnu \ > %endif > - --sbindir=/usr/sbin > -rm -f kexec-tools.spec.in > -# setup the docs > -cp %{SOURCE10} . > -cp %{SOURCE11} . > -cp %{SOURCE21} . > -cp %{SOURCE26} . > -cp %{SOURCE27} . > -cp %{SOURCE34} . > - > -# Generate sysconfig file > -%{SOURCE3} %{_target_cpu} > kdump.sysconfig > -%{SOURCE4} %{_target_cpu} > kdump.conf > - > -make > -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 > -make -C eppic-%{eppic_ver}/libeppic > -make -C makedumpfile-%{mkdf_ver} LINKTYPE=dynamic USELZO=on USESNAPPY=on USEZSTD=on > -make -C makedumpfile-%{mkdf_ver} LDFLAGS="$LDFLAGS -I../eppic-%{eppic_ver}/libeppic -L../eppic-%{eppic_ver}/libeppic" eppic_makedumpfile.so > -%endif > + --sbindir=%{_sbindir} > +%make_build > > %install > -mkdir -p -m755 $RPM_BUILD_ROOT/usr/sbin > -mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig > -mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump > -mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump/pre.d > -mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/kdump/post.d > -mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash > -mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man8/ > -mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man5/ > -mkdir -p -m755 $RPM_BUILD_ROOT%{_docdir} > -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/kdump > -mkdir -p -m755 $RPM_BUILD_ROOT%{_udevrulesdir} > -mkdir -p $RPM_BUILD_ROOT%{_unitdir} > -mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir} > -mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir} > -mkdir -p -m755 $RPM_BUILD_ROOT%{_prefix}/lib/kdump > -mkdir -p -m755 $RPM_BUILD_ROOT%{_sharedstatedir}/kdump > -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/kdumpctl > - > -install -m 755 build/sbin/kexec $RPM_BUILD_ROOT/usr/sbin/kexec > -install -m 755 build/sbin/vmcore-dmesg $RPM_BUILD_ROOT/usr/sbin/vmcore-dmesg > -install -m 644 build/man/man8/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/ > -install -m 644 build/man/man8/vmcore-dmesg.8 $RPM_BUILD_ROOT%{_mandir}/man8/ > - > -install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/mkdumprd > -install -m 644 kdump.conf $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf > -install -m 644 kdump.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump > -install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8 > -install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8 > -install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_mandir}/man8/kdumpctl.8 > -install -m 755 %{SOURCE20} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib.sh > -install -m 755 %{SOURCE23} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh > -install -m 755 %{SOURCE31} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-logger.sh > -%ifarch ppc64 ppc64le > -install -m 755 %{SOURCE32} $RPM_BUILD_ROOT/usr/sbin/mkfadumprd > -install -m 755 %{SOURCE35} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-migrate-action.sh > -install -m 755 %{SOURCE36} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-restart.sh > -%endif > -%ifnarch s390x > -install -m 755 %{SOURCE28} $RPM_BUILD_ROOT%{_udevrulesdir}/../kdump-udev-throttler > -%endif > -%ifnarch s390x ppc64 ppc64le > -# For s390x the ELF header is created in the kdump kernel and therefore kexec > -# udev rules are not required > -install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules > -%endif > -%ifarch ppc64 ppc64le > -install -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules > -install -m 755 -D %{SOURCE37} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-fadump.install > -%endif > -install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5 > -install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service > -install -m 755 -D %{SOURCE22} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh > -install -m 755 -D %{SOURCE30} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-kdump.install > -install -m 755 -D %{SOURCE33} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/92-crashkernel.install > - > -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 > -install -m 755 makedumpfile-%{mkdf_ver}/makedumpfile $RPM_BUILD_ROOT/usr/sbin/makedumpfile > -install -m 644 makedumpfile-%{mkdf_ver}/makedumpfile.8 $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8 > -install -m 644 makedumpfile-%{mkdf_ver}/makedumpfile.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5 > -install -m 644 makedumpfile-%{mkdf_ver}/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample > -install -m 755 makedumpfile-%{mkdf_ver}/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so > -mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/ > -install -m 644 makedumpfile-%{mkdf_ver}/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/ > -%endif > - > -%define dracutdir %{_prefix}/lib/dracut/modules.d > -%define remove_prefix() %(echo -n %2|sed 's/.*%1-//g') > - > -# deal with dracut modules > -mkdir -p -m755 $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase > -install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE100}} > -install -m 755 %{SOURCE101} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE101}} > -install -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE102}} > -install -m 644 %{SOURCE104} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE104}} > -install -m 644 %{SOURCE106} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE106}} > -install -m 644 %{SOURCE107} $RPM_BUILD_ROOT/%{dracutdir}/99kdumpbase/%{remove_prefix dracut %{SOURCE107}} > - > -mkdir -p -m755 $RPM_BUILD_ROOT/%{dracutdir}/99earlykdump > -install -m 755 %{SOURCE108} $RPM_BUILD_ROOT/%{dracutdir}/99earlykdump/%{remove_prefix dracut %{SOURCE108}} > -install -m 755 %{SOURCE109} $RPM_BUILD_ROOT/%{dracutdir}/99earlykdump/%{remove_prefix dracut-early-kdump %{SOURCE109}} > - > -%ifarch ppc64 ppc64le > -mkdir -p -m755 $RPM_BUILD_ROOT/%{dracutdir}/99zz-fadumpinit > -install -m 755 %{SOURCE200} $RPM_BUILD_ROOT/%{dracutdir}/99zz-fadumpinit/%{remove_prefix dracut-fadump %{SOURCE200}} > -install -m 755 %{SOURCE201} $RPM_BUILD_ROOT/%{dracutdir}/99zz-fadumpinit/%{remove_prefix dracut-fadump %{SOURCE201}} > -%endif > - > -%post > -# Initial installation > -%systemd_post kdump.service > - > -touch /etc/kdump.conf > - > -%ifarch ppc64 ppc64le > -servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh 2>/dev/null > -servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match='refcode="#MIGRATE" and serviceable=0' --type=EVENT --method=pairs_stdin >/dev/null > -%endif > - > - > -%postun > -%systemd_postun_with_restart kdump.service > - > -%preun > -%ifarch ppc64 ppc64le > -servicelog_notify --remove --command=/usr/lib/kdump/kdump-migrate-action.sh >/dev/null > -%endif > -%systemd_preun kdump.service > - > -%triggerin -- kernel-kdump > -touch %{_sysconfdir}/kdump.conf > - > - > -%triggerpostun -- kernel kernel-xen kernel-debug kernel-PAE kernel-kdump > -# List out the initrds here, strip out version nubmers > -# and search for corresponding kernel installs, if a kernel > -# is not found, remove the corresponding kdump initrd > - > - > -IMGDIR=/boot > -for i in `ls $IMGDIR/initramfs*kdump.img 2>/dev/null` > -do > - KDVER=`echo $i | sed -e's/^.*initramfs-//' -e's/kdump.*$//'` > - if [ ! -e $IMGDIR/vmlinuz-$KDVER ] > - then > - # We have found an initrd with no corresponding kernel > - # so we should be able to remove it > - rm -f $i > - fi > -done > - > -%posttrans > -# Try to reset kernel crashkernel value to new default value or set up > -# crasherkernel value for new install > -# > -# Note > -# 1. Skip ostree systems as they are not supported. > -# 2. For Fedora 36 and RHEL9, "[ $1 == 1 ]" in posttrans scriptlet means both install and upgrade; > -# For Fedora > 36, "[ $1 == 1 ]" only means install and "[ $1 == 2 ]" means upgrade > -if [ ! -f /run/ostree-booted ] && [ $1 == 1 -o $1 == 2 ]; then > - kdumpctl _reset-crashkernel-after-update > - : > -fi > - > +%make_install > +rm -f %{buildroot}/%{_libdir}/kexec-tools/kexec_test > > %files > -/usr/sbin/kexec > -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 > -/usr/sbin/makedumpfile > -%endif > -%ifarch ppc64 ppc64le > -/usr/sbin/mkfadumprd > -%{_prefix}/lib/kernel/install.d/60-fadump.install > -%endif > -/usr/sbin/mkdumprd > -/usr/sbin/vmcore-dmesg > -%{_bindir}/* > -%{_datadir}/kdump > -%{_prefix}/lib/kdump > -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 > -%{_sysconfdir}/makedumpfile.conf.sample > -%endif > -%config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump > -%config(noreplace,missingok) %verify(not mtime) %{_sysconfdir}/kdump.conf > -%ifnarch s390x > -%config %{_udevrulesdir} > -%{_udevrulesdir}/../kdump-udev-throttler > -%endif > -%{dracutdir}/* > -%dir %{_localstatedir}/crash > -%dir %{_sysconfdir}/kdump > -%dir %{_sysconfdir}/kdump/pre.d > -%dir %{_sysconfdir}/kdump/post.d > -%dir %{_sharedstatedir}/kdump > -%{_mandir}/man8/kdumpctl.8.gz > +%{_sbindir}/kexec > %{_mandir}/man8/kexec.8.gz > -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 > -%{_mandir}/man8/makedumpfile.8.gz > -%endif > -%{_mandir}/man8/mkdumprd.8.gz > +%{_sbindir}/vmcore-dmesg > %{_mandir}/man8/vmcore-dmesg.8.gz > -%{_mandir}/man5/* > -%{_unitdir}/kdump.service > -%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh > -%{_prefix}/lib/kernel/install.d/60-kdump.install > -%{_prefix}/lib/kernel/install.d/92-crashkernel.install > %doc News > %license COPYING > %doc TODO > -%doc kexec-kdump-howto.txt > -%doc early-kdump-howto.txt > -%doc fadump-howto.txt > -%doc kdump-in-cluster-environment.txt > -%doc live-image-kdump-howto.txt > -%doc crashkernel-howto.txt > -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 > -%{_libdir}/eppic_makedumpfile.so > -/usr/share/makedumpfile/ > -%endif > > %changelog > +* Sat Sep 23 2023 Coiby <coxu(a)redhat.com&gt; - 2.0.27-2 > +- split kexec-tools into kexec-tools, kdump-utils and makedumpfile > + > * Thu Aug 31 2023 Coiby Xu <coxu(a)redhat.com&gt; - 2.0.27-1 > - kexec-tools 2.0.27 (Simon Horman) > > diff --git a/makedumpfile.spec b/makedumpfile.spec > new file mode 100644 > index 00000000..073d50c8 > --- /dev/null > +++ b/makedumpfile.spec > @@ -0,0 +1,64 @@ > +%global eppic_ver e8844d3793471163ae4a56d8f95897be9e5bd554 > +%global eppic_shortver %(c=%{eppic_ver}; echo ${c:0:7}) > +Name: makedumpfile > +Version: 1.7.3 > +Summary: make a small dumpfile of kdump > +Release: 1%{?dist} > + > +License: GPL-2.0-only > +URL: https://github.com/makedumpfile/makedumpfile > +Source0: https://github.com/makedumpfile/makedumpfile/archive/%{version}/%{name}-%... > +Source1: https://github.com/lucchouina/eppic/archive/%{eppic_ver}/eppic-%{eppic_sh... > + > +Conflicts: kexec-tools < 2.0.27-2 > +Requires(pre): zlib > +BuildRequires: make > +BuildRequires: gcc > +BuildRequires: zlib-devel > +BuildRequires: elfutils-devel > +BuildRequires: glib2-devel > +BuildRequires: bzip2-devel > +BuildRequires: ncurses-devel > +BuildRequires: bison > +BuildRequires: flex > +BuildRequires: lzo-devel > +BuildRequires: snappy-devel > +BuildRequires: libzstd-devel > +BuildRequires: pkgconfig > +BuildRequires: intltool > +BuildRequires: gettext > + > +%description > +makedumpfile is a tool to compress and filter out unneeded data from kernel > +dumps to reduce its file size. It is typically used with the kdump mechanism. > + > +%prep > +%autosetup > +tar -z -x -v -f %{SOURCE1} > + > +%build > +%make_build LINKTYPE=dynamic USELZO=on USESNAPPY=on USEZSTD=on > +%make_build -C eppic-%{eppic_ver}/libeppic > +%make_build LDFLAGS="$LDFLAGS -Ieppic-%{eppic_ver}/libeppic -Leppic-%{eppic_ver}/libeppic" eppic_makedumpfile.so > + > +%install > +%make_install > +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} > +install -m 644 makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample > +rm $RPM_BUILD_ROOT/%{_sbindir}/makedumpfile-R.pl > + > +mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir} > +install -m 755 eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so > + > +%files > +%{_sbindir}/makedumpfile > +/usr/share/man/man5/makedumpfile.conf.5.gz > +/usr/share/man/man8/makedumpfile.8.gz > +%{_sysconfdir}/makedumpfile.conf.sample > +%{_libdir}/eppic_makedumpfile.so > +/usr/share/makedumpfile/ > +%license COPYING > + > +%changelog > +* Thu Aug 24 2023 Coiby <coxu(a)redhat.com&gt; - 1.7.3-1 > +- split from kexec-tools