Update version to 2022.1

esa-tu-darmstadt · May 25, 2022 · d7768b3 · d7768b3
1 parent 5439305
commit d7768b3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ test_tapasco_fedora_36:
     - ./gradlew buildRPM
   artifacts:
     paths:
-      - toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm
+      - toolflow/scala/build/distributions/tapasco-2022-01.x86_64.rpm
 
 build_scala_tapasco_centos_7:
   image: centos:7
@@ -113,7 +113,7 @@ build_scala_tapasco_rockylinux_8:
     - ./gradlew buildRPM
   artifacts:
     paths:
-      - toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm
+      - toolflow/scala/build/distributions/tapasco-2022-01.x86_64.rpm
 
 build_scala_tapasco_fedora_36:
   image: fedora:36
@@ -136,7 +136,7 @@ build_scala_tapasco_fedora_36:
     - ./gradlew buildDEB
   artifacts:
     paths:
-      - toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb
+      - toolflow/scala/build/distributions/tapasco_2022-01_amd64.deb
 
 build_scala_tapasco_ubuntu_18_04:
   image: ubuntu:18.04
@@ -377,7 +377,7 @@ tapasco_compose_ubuntu:
     - source $XILINX_VIVADO/settings64.sh
     - apt-get -y update
     - DEBIAN_FRONTEND=noninteractive apt-get -y install libtinfo5 build-essential tzdata
-    - apt -y install ./toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb
+    - apt -y install ./toolflow/scala/build/distributions/tapasco_2022-01_amd64.deb
     - /opt/tapasco/tapasco-init-toolflow.sh
     - source tapasco-setup-toolflow.sh
     - tapasco -v hls arrayinit -p pynq
@@ -406,7 +406,7 @@ tapasco_compose_ubuntu:
     - source $XILINX_VIVADO/settings64.sh
     - which vivado
     - which vivado_hls || which vitis_hls
-    - dnf -y install toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm
+    - dnf -y install toolflow/scala/build/distributions/tapasco-2022-01.x86_64.rpm
     - /opt/tapasco/tapasco-init-toolflow.sh
     - source tapasco-setup-toolflow.sh
     - tapasco hls arrayinit -p $PLATFORM --skipEvaluation

diff --git a/README.md b/README.md
@@ -205,9 +205,9 @@ We provided pre-compiled packages for many popular Linux distributions. All pack
 
 | Distribution | Kernel Driver | Kernel Driver (Debug) | Runtime | Runtime (Debug) | Toolflow |
 |:-------------|:-------------:|:---------------------:|:-------:|:---------------:|:--------:|
-| Ubuntu 18.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_18_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_18_04) |
-| Ubuntu 20.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_20_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_20_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_20_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_20_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_20_04) |
-| Ubuntu 22.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_22_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_22_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_22_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.deb?job=build_tapasco_ubuntu_22_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2021-01_amd64.deb?job=build_scala_tapasco_ubuntu_22_04) |
-| Rocky Linux 8 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_rockylinux_8) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_rockylinux_8_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.rpm?job=build_tapasco_rockylinux_8) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021-01.x86_64.rpm?job=build_tapasco_rockylinux_8_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm?job=build_scala_tapasco_rockylinux_8) |
-| Fedora 36 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_36) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_36_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.rpm?job=build_tapasco_fedora_36) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2021.1.0-Linux.rpm?job=build_tapasco_fedora_36_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2021-01.x86_64.rpm?job=build_scala_tapasco_fedora_36) |
+| Ubuntu 18.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.deb?job=build_tapasco_ubuntu_18_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.deb?job=build_tapasco_ubuntu_18_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2022-01_amd64.deb?job=build_scala_tapasco_ubuntu_18_04) |
+| Ubuntu 20.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_20_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_20_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.deb?job=build_tapasco_ubuntu_20_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.deb?job=build_tapasco_ubuntu_20_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2022-01_amd64.deb?job=build_scala_tapasco_ubuntu_20_04) |
+| Ubuntu 22.04 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_22_04) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_22_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.deb?job=build_tapasco_ubuntu_22_04) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.deb?job=build_tapasco_ubuntu_22_04_debug) | [DEB](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2022-01_amd64.deb?job=build_scala_tapasco_ubuntu_22_04) |
+| Rocky Linux 8 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_rockylinux_8) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_rockylinux_8_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.rpm?job=build_tapasco_rockylinux_8) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022-01.x86_64.rpm?job=build_tapasco_rockylinux_8_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2022-01.x86_64.rpm?job=build_scala_tapasco_rockylinux_8) |
+| Fedora 36 | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_36) | [Download](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_36_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.rpm?job=build_tapasco_fedora_36) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2022.1.0-Linux.rpm?job=build_tapasco_fedora_36_debug) | [RPM](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2022-01.x86_64.rpm?job=build_scala_tapasco_fedora_36) |
 
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
@@ -23,7 +23,7 @@ project(TapascoInstall)
 set(CPACK_GENERATOR "RPM" "DEB" "TGZ" "ZIP" "STGZ" "TBZ2")
 set(CPACK_PACKAGE_CONTACT "tapasco@esa.tu-darmstadt.de")
 
-set(CPACK_PACKAGE_VERSION_MAJOR 2021)
+set(CPACK_PACKAGE_VERSION_MAJOR 2022)
 set(CPACK_PACKAGE_VERSION_MINOR 1)
 set(CPACK_PACKAGE_VERSION_PATCH 0)
 set(CPACK_PACKAGE_NAME tapasco)

diff --git a/toolflow/scala/build.gradle b/toolflow/scala/build.gradle
@@ -71,7 +71,7 @@ application {
 
 ospackage {
     packageName = "tapasco"
-    version = "2021"
+    version = "2022"
     release = "01"
     license = "GNU Lesser General Public License v3.0"
     vendor = "Embedded Systems and Applications Group, TU Darmstadt"

diff --git a/toolflow/vivado/common/common.tcl b/toolflow/vivado/common/common.tcl
@@ -106,7 +106,7 @@ namespace eval tapasco {
 
   # Returns the Tapasco version.
   proc get_tapasco_version {} {
-    return "2021.1"
+    return "2022.1"
   }
 
   # Returns the interface pin groups for all AXI MM interfaces on cell.