Merge branch 'release/v3.0.1'

ad3211df · Federico Vaga · ab08b3a5 · 8ea54188 · ad3211df · ab08b3a5
Commit ad3211df authored Jun 04, 2020 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 24 additions and 11 deletions

CHANGELOG.rst CHANGELOG.rst +23 -0

CHANGELOG.rst software/CHANGELOG.rst +0 -10

Kbuild software/kernel/Kbuild +1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
-# Changelog
-All notable changes to this project will be documented in this file.
+..
+  SPDX-License-Identifier: CC-0.0
+  SPDX-FileCopyrightText: 2019 CERN

-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+=========
+Changelog
+=========

-## [3.0.0] - 2020-06-02
-### Added
+3.0.1 - 2020-06-04
+==================
+
+Changed
+-------
+- sw: version reporting in sysfs include the full output from 'git describe'
+
+3.0.0 - 2020-06-02
+==================
+
+Added
+-----
 - First release of Convention-based Fine Delay HW/GW/SW.
 - Added programmable delay line on the TDC start FPGA input to compensate for different delays on
-  TDC start signal from different production batches of the boards.
\ No newline at end of file
+  TDC start signal from different production batches of the boards.
--- a/software/CHANGELOG.rst
+++ b/software/CHANGELOG.rst
-==========
-Change Log
-==========
-
-[3.0.0] - 2019-10-17
-====================
-
-Functionalists are mainly the same as before, but the architecture has changed
-and some loading mechanism as well, for this reason we decided to increase
-the major version.
--- a/software/kernel/Kbuild
+++ b/software/kernel/Kbuild
@@ -3,7 +3,7 @@ KBUILD_EXTRA_SYMBOLS += $(ZIO_EXTRA_SYMBOLS-y)
 KBUILD_EXTRA_SYMBOLS += $(FMC_EXTRA_SYMBOLS-y)


-ccflags-y += -DVERSION=\"$(VERSION)\"
+ccflags-y += -DVERSION=\"$(GIT_VERSION)\"
 ccflags-y += -I$(src)
 ccflags-y += -I$(ZIO_ABS)/include
 ccflags-y += -I$(FMC_ABS)/include