summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTurbo Fredriksson <[email protected]>2014-06-09 23:35:42 +0200
committerBrian Behlendorf <[email protected]>2014-06-10 14:50:11 -0700
commit1e929b97ac3fd0aa752feba9f08caeb5356e9a43 (patch)
tree34c1f28bf86a8631c7de910fcb3c9062cfea3334
parent4cdcdbff636763fbdae72e2f7e1f9e7971649cca (diff)
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 <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #306
-rw-r--r--config/rpm.am4
-rw-r--r--scripts/kmodtool2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/rpm.am b/config/rpm.am
index 8b33bb5b6..311c754d4 100644
--- a/config/rpm.am
+++ b/config/rpm.am
@@ -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; \
diff --git a/scripts/kmodtool b/scripts/kmodtool
index 852ade021..ce3f04294 100644
--- a/scripts/kmodtool
+++ b/scripts/kmodtool
@@ -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