Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Set LANG to a reasonable default (C) 

Set LANG=C before calling 'rpmbuild' to avoid rpmbuild failing on
the translated date string in the changelog.

Signed-off-by: Turbo Fredriksson <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes: zfsonlinux/spl#306
This commit is contained in:
Turbo Fredriksson 2014-06-09 23:27:09 +02:00 committed by Brian Behlendorf
parent 21b446a79e
commit 0f629346bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/rpm.am
View File

@ -63,7 +63,7 @@ srpm-common: dist
rpmbuild="$$rpmbuild" \ rpmbuild="$$rpmbuild" \
rpmspec="$$rpmspec" \ rpmspec="$$rpmspec" \
rpm-local || exit 1; \ rpm-local || exit 1; \
$(RPMBUILD) \ LANG=C $(RPMBUILD) \
--define "_tmppath $$rpmbuild/TMP" \ --define "_tmppath $$rpmbuild/TMP" \
--define "_topdir $$rpmbuild" \ --define "_topdir $$rpmbuild" \
$(def) -bs $$rpmbuild/SPECS/$$rpmspec || exit 1; \ $(def) -bs $$rpmbuild/SPECS/$$rpmspec || exit 1; \
@ -79,7 +79,7 @@ rpm-common:
rpmbuild="$$rpmbuild" \ rpmbuild="$$rpmbuild" \
rpmspec="$$rpmspec" \ rpmspec="$$rpmspec" \
rpm-local || exit 1; \ rpm-local || exit 1; \
${RPMBUILD} \ LANG=C ${RPMBUILD} \
--define "_tmppath $$rpmbuild/TMP" \ --define "_tmppath $$rpmbuild/TMP" \
--define "_topdir $$rpmbuild" \ --define "_topdir $$rpmbuild" \
$(def) --rebuild $$rpmpkg || exit 1; \ $(def) --rebuild $$rpmpkg || exit 1; \

2
scripts/kmodtool
View File

@ -64,7 +64,7 @@ print_akmodtemplate ()
cat <<EOF cat <<EOF
%global akmod_install mkdir -p \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/; \\\ %global akmod_install mkdir -p \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/; \\\
rpmbuild --define "_sourcedir %{_sourcedir}" \\\ LANG=C rpmbuild --define "_sourcedir %{_sourcedir}" \\\
--define "_srcrpmdir \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/" \\\ --define "_srcrpmdir \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/" \\\
-bs --nodeps %{_specdir}/%{name}.spec ; \\\ -bs --nodeps %{_specdir}/%{name}.spec ; \\\
ln -s \$(ls \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/) \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/${kmodname}-kmod.latest ln -s \$(ls \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/) \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/${kmodname}-kmod.latest