diff --git a/LICENSE b/LICENSE.md similarity index 90% rename from LICENSE rename to LICENSE.md index 87bf4f50e..0f196f1a5 100644 --- a/LICENSE +++ b/LICENSE.md @@ -1,4 +1,8 @@ -Copyright(c) 2019-2021 Intel Corporation +# BSD 3-Clause License + +Copyright(c) 2019-2022 Intel Corporation +Copyright(c) 2013-2025 Huawei Technologies +Copyright(c) 2026 Unvertical Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 88dd3f55b..b3ee90ccd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Open CAS Linux [![Build Status](https://github.com/Open-CAS/open-cas-linux/actions/workflows/build-master.yml/badge.svg)](https://github.com/Open-CAS/open-cas-linux/actions/workflows/build-master.yml) -[![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](LICENSE) +[![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](LICENSE.md) [![Maintained by Unvertical](https://img.shields.io/badge/maintained%20by-Unvertical-0b5fff)](https://unvertical.com/) Open CAS accelerates Linux applications by caching active (hot) data to @@ -116,8 +116,7 @@ All the development activities of this project take place on this GitHub reposit ## License -Open CAS is distributed on BSD-3-Clause license (see -https://opensource.org/licenses/BSD-3-Clause for full license text). +Open CAS is distributed on [BSD-3-Clause license](LICENSE.md). Open CAS uses Safe string library (safeclib) that is MIT licensed. diff --git a/ocf b/ocf index 93f8b911b..932ca1228 160000 --- a/ocf +++ b/ocf @@ -1 +1 @@ -Subproject commit 93f8b911bd4c6c37ffbf9ad6f8110fc67c7583ac +Subproject commit 932ca12283cfca131513dbea8c5a05edd1e4847f diff --git a/tools/pckgen.d/deb/debian/CAS_NAME-modules.install b/tools/pckgen.d/deb/debian/CAS_NAME-modules.install index 5c986d75f..c77b8bd3e 100644 --- a/tools/pckgen.d/deb/debian/CAS_NAME-modules.install +++ b/tools/pckgen.d/deb/debian/CAS_NAME-modules.install @@ -7,5 +7,5 @@ ./configure.d/* usr/src/-modules-/configure.d/ ./configure usr/src/-modules-/ ./Makefile usr/src/-modules-/ -./LICENSE usr/src/-modules-/ +./LICENSE.md usr/src/-modules-/ ./version usr/src/-modules-/ diff --git a/tools/pckgen.d/rpm/CAS_NAME.spec b/tools/pckgen.d/rpm/CAS_NAME.spec index 7c59e00e8..f092aad83 100644 --- a/tools/pckgen.d/rpm/CAS_NAME.spec +++ b/tools/pckgen.d/rpm/CAS_NAME.spec @@ -148,7 +148,7 @@ fi %files %defattr(-, root, root, 755) -%license LICENSE +%license LICENSE.md %doc README.md %dir /etc/opencas/ %dir /usr/lib/opencas/ @@ -177,7 +177,7 @@ fi %files modules_%{kver_filename} %defattr(644, root, root, 755) -%license LICENSE +%license LICENSE.md /lib/modules/%{kver} diff --git a/tools/pckgen.sh b/tools/pckgen.sh index 198a77d48..a057de44d 100755 --- a/tools/pckgen.sh +++ b/tools/pckgen.sh @@ -469,7 +469,8 @@ deb_control_files_prepare() { rename_templates "$DEB_SOURCES_DIR/debian/" # Parsing the CAS license file to fit Debian copyright file format - sed '${/^$/d}' "$CAS_LICENSE" > "$TEMP_DIR/LICENSE.deb.tmp" + # (strip the Markdown heading and any blank lines preceding the text) + sed -e '/^# /d' -e '/./,$!d' -e '${/^$/d}' "$CAS_LICENSE" > "$TEMP_DIR/LICENSE.deb.tmp" sed -i 's/^$/./' "$TEMP_DIR/LICENSE.deb.tmp" rm -f "$TEMP_DIR/LICENSE.deb" while read -r line; do @@ -704,7 +705,7 @@ create_temp ### Variables that relates on arguments passed to this script: -CAS_LICENSE="$SOURCES_DIR/LICENSE" +CAS_LICENSE="$SOURCES_DIR/LICENSE.md" # By default all created packages will be put in: : ${OUTPUT_DIR:="$SOURCES_DIR/packages"} # RPM building directories: