diff --git a/package/pkg-download.mk b/package/pkg-download.mk index c0fb810205..4d97ef9a31 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -20,7 +20,7 @@ export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # Version of the format of the archives we generate in the corresponding # download backend: BR_FMT_VERSION_git = -br1 -BR_FMT_VERSION_svn = -br1 +BR_FMT_VERSION_svn = -br2 DL_WRAPPER = support/download/dl-wrapper diff --git a/support/download/svn b/support/download/svn index 839dccaf62..75bf9ab3b2 100755 --- a/support/download/svn +++ b/support/download/svn @@ -43,14 +43,16 @@ _svn() { eval ${SVN} "${@}" } -_svn export ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'" +_svn export --ignore-keywords ${verbose} "${@}" "'${uri}@${rev}'" "'${basename}'" # Get the date of the revision, to generate reproducible archives. # The output format is YYYY-MM-DDTHH:MM:SS.mmmuuuZ (i.e. always in the # UTC timezone), which we can feed as-is to the --mtime option for tar. # In case there is a redirection (e.g. http -> https), just keep the # last line (svn outputs everything on stdout) -date="$( _svn info --show-item last-changed-date "'${uri}@${rev}'" |tail -n 1 )" +date="$( _svn info "'${uri}@${rev}'" \ + |sed -r -e '/^Last Changed Date: /!d; s///' + )" # Generate the archive. # We did a 'svn export' above, so it's not a working copy (there is no .svn