Merge pull request #1203 from rafalste/copyright_header_check_improvements

Copyright header check improvements

.github/verify_header.sh

@@ -5,20 +5,32 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+# COPYRIGHT_REGEX is lowercase, because the whole line is
+# converted to lowercase before test against this regex.
+COPYRIGHT_REGEX="(copyright|\(c\))\s*([0-9]{4}(\s*-\s*([0-9]{4}))?)"
+LICENSE_REGEX="SPDX-License-Identifier: BSD-3-Clause$"
 YEAR=$(date +"%Y")
-REGEX="Copyright\(c\) [0-9]{4}-([0-9]{4}) |Copyright\(c\) ([0-9]{4}) "
 
-while read -r line; do
+unset copyright_header license_header
-    if [[ "$line" =~ $REGEX ]]; then
+
-        echo ${BASH_REMATCH[0]}
+# Read lines until proper copyright and license headers are found.
-        if [[ $YEAR == ${BASH_REMATCH[1]} || $YEAR == ${BASH_REMATCH[2]} ]]; then
+while read -r line && [[ ! "$copyright_header" || ! "$license_header" ]]; do
-            echo $1 have appropriate license header
+	if [[ "${line,,}" =~ $COPYRIGHT_REGEX ]]; then
-            exit 0
+		# If the fourth regex group (from year range) doesn't exist,
+		# use the second regex group instead (from a single year).
+		copyright_year=${BASH_REMATCH[4]:-${BASH_REMATCH[2]}}
+
+		if [[ $copyright_year == $YEAR ]]; then
+			copyright_header="correct_copyright_header_found"
 		fi
-        echo $1 have wrong license header year
+	elif [[ "$line" =~ $LICENSE_REGEX ]]; then
-	exit 1
+		license_header="correct_license_header_found"
 	fi
 done < "$1"
 
-echo $1 does not contain appropriate license header
+# Proper copyright and license info were found - all good.
+[[ "$copyright_header" && "$license_header" ]] && exit 0
+
+[[ ! "$copyright_header" ]] && echo >&2 "error: file '$1' does not contain any appropriate copyright info"
+[[ ! "$license_header" ]] && echo >&2 "error: file '$1' does not contain appropriate license identifier"
 exit 1

.github/workflows/pullrequest.yml

@@ -5,7 +5,8 @@ on:
       - master
 
 env:
-  EXTENSIONS: "c h cpp py go sh"
+  EXTENSIONS: "c h cpp py go sh mk spec service"
+  FILES: "configure configure.d/* *Makefile utils/casctl tools/pckgen.d/deb/debian/rules"
 jobs:
   verify-date:
     runs-on: ubuntu-latest
@@ -23,15 +24,16 @@ jobs:
           files_to_check=(${{ steps.changed-files.outputs.added_files }})
           files_to_check+=(${{ steps.changed-files.outputs.modified_files }})
 
-          for FILE in ${files_to_check[@]}; do
+          for file in ${files_to_check[@]}; do
-            REGEX=".*\.(.*)"
+            for file_in_list in $FILES; do
-            if [[  "$FILE" =~ $REGEX ]]
+              if [[ "$file" == $file_in_list ]]; then
-            then
+                .github/verify_header.sh "$file"
-                EXTENSION=${BASH_REMATCH[1]}
+                continue 2
-                EXTENSIONS_LIST=($EXTENSIONS)
+              fi
-                if [[ " ${EXTENSIONS_LIST[*]} " =~ " ${EXTENSION} " ]]
+            done
-                then
+
-                    .github/verify_header.sh $FILE
+            extension=${file##*.}
-                fi
+            if [[ "$EXTENSIONS" =~ $extension ]]; then
+              .github/verify_header.sh "$file"
             fi
           done

Makefile

@@ -27,16 +27,16 @@ endif
 endif
 
 archives:
-	@tools/pckgen $(PWD) tar zip
+	@tools/pckgen.sh $(PWD) tar zip
 
 rpm:
-	@tools/pckgen $(PWD) rpm --debug
+	@tools/pckgen.sh $(PWD) rpm --debug
 
 srpm:
-	@tools/pckgen $(PWD) srpm
+	@tools/pckgen.sh $(PWD) srpm
 
 deb:
-	@tools/pckgen $(PWD) deb --debug
+	@tools/pckgen.sh $(PWD) deb --debug
 
 dsc:
-	@tools/pckgen $(PWD) dsc
+	@tools/pckgen.sh $(PWD) dsc

configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -79,7 +79,7 @@ fi
 
 # Run version generator with 'build' flag to
 # indicate that we are in the build process
-(cd tools && ./cas_version_gen build)
+(cd tools && ./cas_version_gen.sh build)
 if [ $? -ne 0 ]; then
 	echo "Error: failed to obtain CAS version" >&2
 	exit 1

configure.d/1_alloc_disk.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 
 check() {

configure.d/1_append_bio.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 
 check() {

configure.d/1_bd_first_part.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bd_part_count.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bdev_lookup.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bdev_nr_sectors.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 
 check() {

configure.d/1_bdev_whole.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 
 check() {

configure.d/1_bio_clone.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bio_dev.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_bio_discard.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bio_err.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bio_flags.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bio_gendisk.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bio_iter.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_bio_max_vecs.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_bio_split.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_biovec.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_blk_end_req.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_blk_mq.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_blk_queue_exit_workaround_for_rhel.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 # RHEL8.5 kernel 4.18 subversion targeted for the workaround is 348.7.1.
 # The workaround is needed starting this version and up.

configure.d/1_blk_status.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_deamonize.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_dentry.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_discard_zeros.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_err_no_to_blk_sts.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_flush_flag.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_global_page_state.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_hlist.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_inode.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_kallsyms_on_each_symbol.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_make_request.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_module_mutex.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 
 check() {

configure.d/1_mq_flags.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_munmap.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_queue_bounce.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_queue_chunk_sectors.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_queue_flag_set.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_queue_limits.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 # RHEL 7.3
 check() {

configure.d/1_queue_lock.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_reread_partitions.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_set_submit_bio.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_submit_bio.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 # submit_bio() can be defined in "bio.h" or in "fs.h"
 # If it is defind in fs.h, three possibilities are available:

configure.d/1_timekeeping.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_vfs_ioctl.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_vmalloc.conf

@@ -1,10 +1,10 @@
 #!/bin/bash
 #
-# Copyright(c) 2012-2021 Intel Corporation
+# Copyright(c) 2012-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
     cur_name=$(basename $2)

configure.d/1_write_flag.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/1_wtlh.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/2_bio_barrier.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/2_bio_cmpl.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/2_generic_acct.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

configure.d/2_queue_write.conf

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-. $(dirname $3)/conf_framework
+. $(dirname $3)/conf_framework.sh
 
 check() {
 	cur_name=$(basename $2)

test/functional/tests/misc/test_files_permissions.py

@@ -14,12 +14,7 @@ from api.cas.installer import (
     rsync_opencas_sources,
 )
 from core.test_run import TestRun
-from test_tools.fs_utils import (
+from test_tools.fs_utils import FilesPermissions, find_all_items
-    FilesPermissions,
-    find_all_files,
-    find_all_dirs,
-    find_all_items,
-)
 
 
 repo_files_perms_exceptions = {
@@ -61,8 +56,8 @@ repo_files_perms_exceptions = {
     "test/smoke_test/run_tests": 755,
     "test/smoke_test/write_back/01": 755,
     "test/smoke_test/write_back/02": 755,
-    "tools/cas_version_gen": 755,
+    "tools/cas_version_gen.sh": 755,
-    "tools/pckgen": 755,
+    "tools/pckgen.sh": 755,
     "tools/pckgen.d/deb/debian/rules": 755,
     "tools/version2sha": 755,
     "utils/casctl": 755,

tools/pckgen.d/deb/debian/CAS_NAME-modules.install

@@ -2,7 +2,7 @@
 ./modules/* usr/src/<CAS_NAME>-modules-<CAS_VERSION>/modules/
 ./ocf/* usr/src/<CAS_NAME>-modules-<CAS_VERSION>/ocf/
 ./utils/* usr/src/<CAS_NAME>-modules-<CAS_VERSION>/utils/
-./tools/cas_version_gen usr/src/<CAS_NAME>-modules-<CAS_VERSION>/tools/
+./tools/cas_version_gen.sh usr/src/<CAS_NAME>-modules-<CAS_VERSION>/tools/
 ./tools/helpers.mk usr/src/<CAS_NAME>-modules-<CAS_VERSION>/tools/
 ./configure.d/* usr/src/<CAS_NAME>-modules-<CAS_VERSION>/configure.d/
 ./configure usr/src/<CAS_NAME>-modules-<CAS_VERSION>/

tools/pckgen.d/deb/debian/changelog

@@ -1,6 +1,6 @@
 <CAS_NAME> (<CAS_VERSION>-1) trusty; urgency=medium
 
-  * pckgen: automated package generation
+  * pckgen.sh: automated package generation
 
  -- <PACKAGE_MAINTAINER>  <PACKAGE_DATE>
 

tools/pckgen.d/deb/debian/copyright

@@ -3,5 +3,5 @@ Upstream-Name: Intel Corporation
 Source: <CAS_GIT>
 
 Files: *
-Copyright: 2019-2021 Intel Corporation
+Copyright: 2019-<YEAR> Intel Corporation
 License: <CAS_LICENSE_NAME>

tools/pckgen.d/deb/debian/rules

@@ -13,7 +13,7 @@
 override_dh_auto_configure:
 
 override_dh_auto_build:
-	(cd tools/; ./cas_version_gen build)
+	(cd tools/; ./cas_version_gen.sh build)
 	<MAKE_BUILD>
 
 override_dh_auto_install:
@@ -21,7 +21,7 @@ override_dh_auto_install:
 	(cd utils; make install_files DESTDIR="$(shell pwd)/debian/tmp")
 	# clean and generate version again before installing sources for DKMS
 	make distclean
-	(cd tools/; ./cas_version_gen)
+	(cd tools/; ./cas_version_gen.sh)
 
 override_dh_dkms:
 	dh_dkms -V $(DEB_VERSION_UPSTREAM)

tools/pckgen.d/rpm/CAS_NAME.spec

@@ -137,7 +137,7 @@ fi
 /etc/dracut.conf.d/opencas.conf
 /var/lib/opencas/cas_version
 /lib/opencas/casctl
-/lib/opencas/open-cas-loader
+/lib/opencas/open-cas-loader.py
 /lib/opencas/opencas.py
 /lib/udev/rules.d/60-persistent-storage-cas-load.rules
 /lib/udev/rules.d/60-persistent-storage-cas.rules

tools/pckgen.sh

@@ -354,6 +354,7 @@ deb_control_files_prepare() {
         sed -i "s/<CAS_GIT>/${CAS_GIT//\//\\/}/g" "$file"
         sed -i "s/<PACKAGE_MAINTAINER>/$PACKAGE_MAINTAINER/g" "$file"
         sed -i "s/<PACKAGE_DATE>/$PACKAGE_DATE/g" "$file"
+        sed -i "s/<YEAR>/$(date +%Y)/g" "$file"
     done
 
     if [ "$DEBUG" ]; then
@@ -545,7 +546,7 @@ DEB_BUILD_DIR="$TEMP_DIR/debuild"
 # Version file location:
 VERSION_FILE="$SOURCES_DIR/.metadata/cas_version"
 # CAS version generator location:
-CAS_VERSION_GEN="$SOURCES_DIR/tools/cas_version_gen"
+CAS_VERSION_GEN="$SOURCES_DIR/tools/cas_version_gen.sh"
 
 check_version
 

utils/60-persistent-storage-cas-load.rules

@@ -1,6 +1,6 @@
 ACTION=="remove", GOTO="cas_loader_end"
 SUBSYSTEM!="block", GOTO="cas_loader_end"
 
-RUN+="/lib/opencas/open-cas-loader /dev/$name"
+RUN+="/lib/opencas/open-cas-loader.py /dev/$name"
 
 LABEL="cas_loader_end"

utils/Makefile

@@ -41,7 +41,7 @@ install_files:
 
 	@install -m 644 -D opencas.py $(DESTDIR)$(CASCTL_DIR)/opencas.py
 	@install -m 755 -D casctl $(DESTDIR)$(CASCTL_DIR)/casctl
-	@install -m 755 -D open-cas-loader $(DESTDIR)$(CASCTL_DIR)/open-cas-loader
+	@install -m 755 -D open-cas-loader.py $(DESTDIR)$(CASCTL_DIR)/open-cas-loader.py
 
 	@install -m 644 -D etc/dracut.conf.d/opencas.conf $(DESTDIR)/etc/dracut.conf.d/opencas.conf
 
@@ -70,7 +70,7 @@ uninstall:
 
 	$(call remove-file,$(DESTDIR)$(CASCTL_DIR)/opencas.py)
 	$(call remove-file,$(DESTDIR)$(CASCTL_DIR)/casctl)
-	$(call remove-file,$(DESTDIR)$(CASCTL_DIR)/open-cas-loader)
+	$(call remove-file,$(DESTDIR)$(CASCTL_DIR)/open-cas-loader.py)
 	$(call remove-directory,$(DESTDIR)$(CASCTL_DIR))
 
 	$(call remove-file,$(DESTDIR)/etc/dracut.conf.d/opencas.conf)