Rename the subpackage kdump-anaconda-addon

Rename the subpackage kdump-anaconda-addon to kexec-tools-anaconda-addon
to keep consistency and make fedpkg build happy

Because every time fedpkg builds a new release the package version number
should increase. But kdump-annaconda-addon just keep same version, so let's
rename it to kexec-tools-annaconda-addon here kexec-tools- is a default prefix.
For version let's use default top level version.

At the same time, rename the kdump-anaconda-addon directory name to anaconda-addon
to make it more standard. Using the current data instead of version number as a
surfix of kdump-anaconda-addon tarball just like kexec-tools-po did.

Signed-off-by: Arthur Zou <zzou@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
This commit is contained in:
Arthur Zou 2014-05-22 17:15:53 +08:00 committed by WANG Chao
parent 4742c0fb6b
commit 2553056c74
84 changed files with 14 additions and 18 deletions

View File

@ -1,7 +1,5 @@
NAME = kdump-anaconda-addon NAME = kdump-anaconda-addon
VERSION = 0.1
ADDON = com_redhat_kdump ADDON = com_redhat_kdump
TESTS = test TESTS = test
@ -20,7 +18,7 @@ all:
@echo " make install" @echo " make install"
@echo " make uninstall" @echo " make uninstall"
DISTNAME = $(NAME)-$(VERSION) DISTNAME = $(NAME)-$(shell date +%Y%m%d)
ADDONDIR = /usr/share/anaconda/addons/ ADDONDIR = /usr/share/anaconda/addons/
DISTBALL = $(DISTNAME).tar.gz DISTBALL = $(DISTNAME).tar.gz
NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) NUM_PROCS = $$(getconf _NPROCESSORS_ONLN)
@ -34,28 +32,28 @@ uninstall:
rm -rfv $(DESTDIR)$(ADDONDIR) rm -rfv $(DESTDIR)$(ADDONDIR)
dist: dist:
rm -rf $(DISTNAME) rm -rf $(NAME)
mkdir -p $(DISTNAME) mkdir -p $(NAME)
@if test -d ".git"; \ @if test -d ".git"; \
then \ then \
echo Creating ChangeLog && \ echo Creating ChangeLog && \
( cd "$(top_srcdir)" && \ ( cd "$(top_srcdir)" && \
echo '# Generate automatically. Do not edit.'; echo; \ echo '# Generate automatically. Do not edit.'; echo; \
git log --stat --date=short ) > ChangeLog.tmp \ git log --stat --date=short ) > ChangeLog.tmp \
&& mv -f ChangeLog.tmp $(DISTNAME)/ChangeLog \ && mv -f ChangeLog.tmp $(NAME)/ChangeLog \
|| ( rm -f ChangeLog.tmp ; \ || ( rm -f ChangeLog.tmp ; \
echo Failed to generate ChangeLog >&2 ); \ echo Failed to generate ChangeLog >&2 ); \
else \ else \
echo A git clone is required to generate a ChangeLog >&2; \ echo A git clone is required to generate a ChangeLog >&2; \
fi fi
for file in $(FILES); do \ for file in $(FILES); do \
cp -rpv $$file $(DISTNAME)/$$file; \ cp -rpv $$file $(NAME)/$$file; \
done done
for excl in $(EXCLUDES); do \ for excl in $(EXCLUDES); do \
find $(DISTNAME) -name "$$excl" -delete; \ find $(NAME) -name "$$excl" -delete; \
done done
tar -czvf ../$(DISTBALL) $(DISTNAME) tar -czvf ../$(DISTBALL) $(NAME)
rm -rf $(DISTNAME) rm -rf $(NAME)
potfile: potfile:
$(MAKE) DESTDIR=$(DESTDIR) -C po potfile $(MAKE) DESTDIR=$(DESTDIR) -C po potfile

View File

@ -26,7 +26,7 @@ Source19: eppic_030413.tar.gz
Source20: kdump-lib.sh Source20: kdump-lib.sh
Source21: kdump-in-cluster-environment.txt Source21: kdump-in-cluster-environment.txt
Source22: kdump-dep-generator.sh Source22: kdump-dep-generator.sh
Source23: kdump-anaconda-addon-0.1.tar.gz Source23: kdump-anaconda-addon-20140522.tar.gz
####################################### #######################################
# These are sources for mkdumpramfs # These are sources for mkdumpramfs
@ -97,12 +97,10 @@ The eppic_makedumpfile.so shared object is loaded by the
or confidential kernel data from a dumpfile. or confidential kernel data from a dumpfile.
%endif %endif
%package -n kdump-anaconda-addon %package anaconda-addon
Version: 0.1
Release: 1%{?dist}
Summary: Kdump configration anaconda addon Summary: Kdump configration anaconda addon
Requires: anaconda >= 21.33 Requires: anaconda >= 21.33
%description -n kdump-anaconda-addon %description anaconda-addon
Kdump anaconda addon Kdump anaconda addon
%prep %prep
@ -143,7 +141,7 @@ make -C eppic/libeppic
make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on make -C makedumpfile-1.5.6 LINKTYPE=dynamic USELZO=on USESNAPPY=on
%endif %endif
make -C kexec-tools-po make -C kexec-tools-po
make -C kdump-anaconda-addon-0.1/po make -C kdump-anaconda-addon/po
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
@ -191,7 +189,7 @@ install -m 755 makedumpfile-1.5.6/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi
%endif %endif
make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name} %find_lang %{name}
make -C kdump-anaconda-addon-0.1 install DESTDIR=$RPM_BUILD_ROOT make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
%find_lang kdump-anaconda-addon %find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g') %define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
@ -325,7 +323,7 @@ done
%{_libdir}/eppic_makedumpfile.so %{_libdir}/eppic_makedumpfile.so
%endif %endif
%files -n kdump-anaconda-addon -f kdump-anaconda-addon.lang %files anaconda-addon -f kdump-anaconda-addon.lang
%{_datadir}/anaconda/addons/com_redhat_kdump %{_datadir}/anaconda/addons/com_redhat_kdump
%doc %doc