[kexec-tools] Removing firstboot module

WANG Chao wangchao at fedoraproject.org
Fri Aug 29 05:20:39 UTC 2014


commit fae72772d771244cfa42e63536bce0ff76ce589d
Author: Dave Young <dyoung at redhat.com>
Date:   Fri Aug 29 13:15:05 2014 +0800

    Removing firstboot module
    
    Since we have added kdump anaconda addon, thus removing firstboot module
    User can setup kdump in anaconda install phase, and change the kdump.conf
    details in s-c-kdump
    
    Delete the firstboot po files as well.
    
    Signed-off-by: Dave Young <dyoung at redhat.com>

 firstboot_kdump.py |  497 ----------------------------------------------------
 kexec-tools.spec   |   25 +---
 po/Makefile        |   61 -------
 po/ar.po           |  100 -----------
 po/as.po           |  111 ------------
 po/bg.po           |  116 ------------
 po/bn.po           |   99 -----------
 po/bn_IN.po        |  116 ------------
 po/bs.po           |  100 -----------
 po/ca.po           |  113 ------------
 po/cs.po           |  113 ------------
 po/cy.po           |  100 -----------
 po/da.po           |  115 ------------
 po/de.po           |  117 ------------
 po/el.po           |   99 -----------
 po/en_GB.po        |   99 -----------
 po/es.po           |  119 -------------
 po/et.po           |   99 -----------
 po/fa.po           |   99 -----------
 po/fi.po           |  113 ------------
 po/fr.po           |  117 ------------
 po/gu.po           |  113 ------------
 po/he.po           |   99 -----------
 po/hi.po           |  112 ------------
 po/hr.po           |  120 -------------
 po/hu.po           |  113 ------------
 po/hy.po           |   99 -----------
 po/id.po           |  113 ------------
 po/is.po           |  113 ------------
 po/it.po           |  115 ------------
 po/ja.po           |  110 ------------
 po/ka.po           |   99 -----------
 po/kexec-tools.pot |   99 -----------
 po/kn.po           |  115 ------------
 po/ko.po           |  109 ------------
 po/ku.po           |   99 -----------
 po/lo.po           |   99 -----------
 po/lv.po           |  100 -----------
 po/mk.po           |   99 -----------
 po/ml.po           |  113 ------------
 po/mr.po           |  112 ------------
 po/ms.po           |  114 ------------
 po/my.po           |   99 -----------
 po/nb.po           |  112 ------------
 po/nl.po           |   99 -----------
 po/or.po           |  116 ------------
 po/pa.po           |  109 ------------
 po/pl.po           |  113 ------------
 po/pom.xml         |   19 --
 po/pt.po           |  111 ------------
 po/pt_BR.po        |  119 -------------
 po/ru.po           |  111 ------------
 po/si.po           |  115 ------------
 po/sk.po           |   99 -----------
 po/sl.po           |  115 ------------
 po/sq.po           |   99 -----------
 po/sr.po           |  112 ------------
 po/sr at Latn.po      |  114 ------------
 po/sv.po           |  114 ------------
 po/ta.po           |  110 ------------
 po/ta_IN.po        |  104 -----------
 po/te.po           |  108 ------------
 po/tr.po           |   99 -----------
 po/uk.po           |  114 ------------
 po/ur.po           |   99 -----------
 po/vi.po           |   99 -----------
 po/zanata.xml      |   94 ----------
 po/zh_CN.po        |  107 -----------
 po/zh_TW.po        |  105 -----------
 sources            |    1 -
 70 files changed, 1 insertions(+), 7608 deletions(-)
---
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 1f8c028..2f0fc67 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -14,9 +14,7 @@ Source7: mkdumprd
 Source8: kdump.conf
 Source9: http://downloads.sourceforge.net/project/makedumpfile/makedumpfile/1.5.6/makedumpfile-1.5.6.tar.gz
 Source10: kexec-kdump-howto.txt
-Source11: firstboot_kdump.py
 Source12: mkdumprd.8
-Source13: kexec-tools-po-20131224.tgz
 Source14: 98-kexec.rules
 Source15: kdump.conf.5
 Source16: kdump.service
@@ -129,8 +127,6 @@ tar -z -x -v -f %{SOURCE23}
 %patch606 -p1
 %patch607 -p1
 
-tar -z -x -v -f %{SOURCE13}
-
 %ifarch ppc
 %define archdef ARCH=ppc
 %endif
@@ -154,7 +150,6 @@ make -C eppic/libeppic
 make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on
 make -C makedumpfile-1.5.6 LDFLAGS="-I../eppic/libeppic -L../eppic/libeppic" eppic_makedumpfile.so
 %endif
-make -C kexec-tools-po
 make -C kdump-anaconda-addon/po
 
 %install
@@ -180,7 +175,6 @@ install -m 644 $SYSCONFIG $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
 install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/sbin/mkdumprd
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
 install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/kdump/firstboot_kdump.py
 install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
 install -m 755 %{SOURCE20} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib.sh
 install -m 755 %{SOURCE24} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh
@@ -202,8 +196,6 @@ install -m 644 makedumpfile-1.5.6/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mand
 install -m 644 makedumpfile-1.5.6/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample
 install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so
 %endif
-make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
 make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
 %find_lang kdump-anaconda-addon
 
@@ -273,25 +265,10 @@ fi
 /bin/systemctl try-restart kdump.service >/dev/null 2>&1 || :
 
 
-%triggerin -- firstboot
-# we enable kdump everywhere except for paravirtualized xen domains; check here
-if [ -f /proc/xen/capabilities ]; then
-	if [ -z `grep control_d /proc/xen/capabilities` ]; then
-		exit 0
-	fi
-fi
-if [ ! -e %{_datadir}/firstboot/modules/firstboot_kdump.py ]
-then
-	ln -s %{_datadir}/kdump/firstboot_kdump.py %{_datadir}/firstboot/modules/firstboot_kdump.py
-fi
-
 %triggerin -- kernel-kdump
 touch %{_sysconfdir}/kdump.conf
 
 
-%triggerun -- firstboot
-rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py
-
 %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
@@ -310,7 +287,7 @@ do
 	fi
 done
 
-%files -f %{name}.lang
+%files
 /sbin/*
 /usr/sbin/*
 %{_bindir}/*
diff --git a/sources b/sources
index cda8292..ee68cce 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
 b48eb2726d602c1aa3abfd3739441f54  eppic_030413.tar.gz
-ba3710c36b287b6a61b2867b4c9b6478  kexec-tools-po-20131224.tgz
 874990aedbdd28689a238917169852f8  makedumpfile-1.5.6.tar.gz
 457f49ad1708eea1f6b332484855fe25  kexec-tools-2.0.7.tar.xz
 bfa29b813ed6d266150a684ad34a6c21  kdump-anaconda-addon-003.tar.gz


More information about the scm-commits mailing list