diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index 481f6d4ca189b9b050e5c73f0e9ade65c0f75906..f770e9937cd7240d9fc1ae31e0ce7613b48539df 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -2,6 +2,8 @@ $Id$ 2022-04-30 Christian Franke <franke@computer.org> + Makefile.am: Support 'svnversion' with CR/LF instead of LF output. + dev_jmb39x_raid.cpp: Enhance LBA range from 33-62 to 1-255 (#1594). smartctl.8.in: Update related documentation. diff --git a/smartmontools/Makefile.am b/smartmontools/Makefile.am index 66191c0a4987c87f018f5af6f8851512326e4fcf..01f72f862dad0df47a149eb8fc486bad466a8b1d 100644 --- a/smartmontools/Makefile.am +++ b/smartmontools/Makefile.am @@ -489,7 +489,7 @@ svnversion.h: ChangeLog Makefile $(svn_deps) @echo ' svn info | $$(VERSION_FROM_SVN_INFO) > $@' @echo '/* svnversion.h. Generated by Makefile from svn info. */' > $@ @(cd $(srcdir) \ - && svnversion 2>/dev/null | sed -n 's,^\([0-9].*\),REV "\1",p' \ + && svnversion 2>/dev/null | sed -n 's,^\([0-9][:0-9A-Z]*\).*$$,REV "\1",p' \ && TZ= LC_ALL=C svn info 2>/dev/null \ | sed -n 'h;s,^.* Date: *\([^ ]*\) .*$$,DATE "\1",p;g;s,^.* Date: *[^ ]* *\([^ ]*\) .*$$,TIME "\1",p') \ | sed 's,^,#define SMARTMONTOOLS_SVN_,' >> $@