rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

remove dracut-files.tbz2 [v2]

Browse Source 
Resolves: bz816864

currently kexec-tools maintains kdump dracut modules as below dir hierarchy:
 [dave@localhost fedpkg]$ tree kexec-tools/kdump_dracut_modules
 kexec-tools/kdump_dracut_modules
 `-- 99kdumpbase
     |-- kdump.sh
     `-- module-setup.sh

But in kexec-tools.spec, sources line is below:
Source100: dracut-files.tbz2

So we need to manually generate the dracut-files.tbz2, upload it, modify
the sources file which contains the md5sum of these binaies, and then do
the building. The more headache problem is this make local tests of
changes to kdump module hard.

To ease future work, move the files to TOPDIR, cp the sources instead.

Thanks for help from dzickus
[v1->v2]: Also remove dracut-files.tbz2 from sources file
          ChaoWang: add prefix to dracut files
This commit is contained in:
Dave Young 2012-04-28 18:01:30 +08:00
parent 33eb910322
commit bbd2e7d30a
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
kdump_dracut_modules/99kdumpbase/kdump.sh → dracut-kdump.sh
View File

0
kdump_dracut_modules/99kdumpbase/module-setup.sh → dracut-module-setup.sh
View File

0
kdump_dracut_modules/99kdumpbase/monitor_dd_progress → dracut-monitor_dd_progress
View File

18
kexec-tools.spec
View File

@ -26,7 +26,9 @@ Source16: kdump.service
# These are sources for mkdumpramfs
# Which is currently in development
#######################################
Source100: dracut-files.tbz2
Source100: dracut-kdump.sh
Source101: dracut-module-setup.sh
Source102: dracut-monitor_dd_progress
Requires(post): systemd-units
Requires(preun): systemd-units
@ -155,12 +157,16 @@ install -m 644 makedumpfile-1.4.2/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/m
make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
# untar the dracut package
mkdir -p -m755 $RPM_BUILD_ROOT/etc/kdump-adv-conf
tar -C $RPM_BUILD_ROOT/etc/kdump-adv-conf -jxvf %{SOURCE100}
chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/module-setup.sh
chmod 755 $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/99kdumpbase/kdump.sh
# 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}}
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}}
%define dracutlibdir %{_prefix}/lib/dracut

1
sources
View File

@ -1,4 +1,3 @@
3e802d638dce0080b910f15908c04a24 kexec-tools-po.tar.gz
b3ced2097ce3981abba38ceedc84f939 kexec-tools-2.0.3.tar.bz2
a98917a8dab5e590549bff9fe7b3a5c2 makedumpfile-1.4.2.tar.gz
14d710b19f1fa254dae77ec184b6a7c1 dracut-files.tbz2