]> granicus.if.org Git - spl/commitdiff
Set LANG to a reasonable default (C)
authorTurbo Fredriksson <turbo@bayour.com>
Mon, 9 Jun 2014 21:35:42 +0000 (23:35 +0200)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 10 Jun 2014 21:50:11 +0000 (14:50 -0700)
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 #306

config/rpm.am
scripts/kmodtool

index 8b33bb5b690361d392b42fe69a164235290fb6ba..311c754d429d4dbc00eb35e5fc312dc42abf7db4 100644 (file)
@@ -63,7 +63,7 @@ srpm-common: dist
                rpmbuild="$$rpmbuild" \
                rpmspec="$$rpmspec" \
                rpm-local || exit 1; \
-       $(RPMBUILD) \
+       LANG=C $(RPMBUILD) \
                --define "_tmppath $$rpmbuild/TMP" \
                --define "_topdir $$rpmbuild" \
                $(def) -bs $$rpmbuild/SPECS/$$rpmspec || exit 1; \
@@ -79,7 +79,7 @@ rpm-common:
                rpmbuild="$$rpmbuild" \
                rpmspec="$$rpmspec" \
                rpm-local || exit 1; \
-       ${RPMBUILD} \
+       LANG=C ${RPMBUILD} \
                --define "_tmppath $$rpmbuild/TMP" \
                --define "_topdir $$rpmbuild" \
                $(def) --rebuild $$rpmpkg || exit 1; \
index 852ade021d3c8a509deb929e6ca8872875e128f9..ce3f042947a5f14acc4ced6c3cfbda7881cb0155 100644 (file)
@@ -64,7 +64,7 @@ print_akmodtemplate ()
        cat <<EOF
 
 %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/" \\\
 -bs --nodeps %{_specdir}/%{name}.spec ; \\\
 ln -s \$(ls \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/) \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/${kmodname}-kmod.latest