Rename variable in debian/rules

diff --git a/debian/control b/debian/control
index d1518937869ba9ea7231121e5ca876431a8212b5..ab04343fb152c81e4074207917969912b4cb5529 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: https://git.unipi.technology/UniPi/unipi-kernel.git
 
 Package: neuron-kernel
 Architecture: armhf
-Depends: ${misc:Depends}, unipi-common, raspberrypi-kernel(=${RPI-FIRMWARE-VER})
+Depends: ${misc:Depends}, unipi-common, raspberrypi-kernel(=${PKG-KERNEL-VER})
 Description: UniPi Neuron kernel modules
  Binary kernel modules for UniPi Neuron controller. Compiled with
  raspberrypi-kernel from Raspbian distribution. 
@@ -28,7 +28,7 @@ Description: UniPi Neuron kernel modules - DKMS source
 
 Package: unipi-kernel-modules
 Architecture: arm64
-Depends: ${misc:Depends}, unipi-common, axon-kernel-image(=${AXON-KERNEL-VER})
+Depends: ${misc:Depends}, unipi-common, axon-kernel-image(=${PKG-KERNEL-VER})
 Description: UniPi Axon kernel modules
  Binary kernel modules for UniPi Axon controller. Compiled for axon-kernel-image 
  version. 

diff --git a/debian/rules b/debian/rules
index 9515f8907dddb5174444ed7ed9bb743e70d0911c..5cee1dfdaf1885f1fe42f92529e8018b72036d36 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,8 @@ endif
 endif
 
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),arm64)
-AXON_KERNEL_VER = $(shell dpkg-query -f='$${Version}' -W axon-kernel-headers)
-#AXON_KERNEL_VER = 4.14.111
+PKG_KERNEL_VER = $(shell dpkg-query -f='$${Version}' -W axon-kernel-headers)
+#PKG_KERNEL_VER = 4.14.111
 LINUX_DIR_PATH = $(shell dpkg -L axon-kernel-headers | sed -n '/^\/lib\/modules\/.*\/build$$/p')
 #LINUX_DIR_PATH = '/lib/modules/4.14.111/build'
 KERNEL_VERSION = $(subst /lib/modules/,,$(subst /build,,$(LINUX_DIR_PATH)))
@@ -49,7 +49,7 @@ override_dh_installmodules:
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),armhf)
 override_dh_prep:
        @dh_prep --exclude=neuron-kernel.substvars
-       @echo RPI-FIRMWARE-VER=${RPI_FIRMWARE_VER} >> debian/neuron-kernel.substvars
+       @echo PKG-KERNEL-VER=${RPI_FIRMWARE_VER} >> debian/neuron-kernel.substvars
        ( sed 's/)/.${RPI_FIRMWARE_VER})/;q' debian/changelog; \
          printf "\n  * Compiled for raspberrypi-kernel\n";\
          printf "\n -- auto-generator <info@unipi.technology>  %s\n\n" "`date -R`"; \
@@ -59,19 +59,17 @@ endif
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),arm64)
 override_dh_prep:
        @dh_prep --exclude=unipi-kernel-modules.substvars
-       @echo AXON-KERNEL-VER=${AXON_KERNEL_VER} > debian/unipi-kernel-modules.substvars
-       ( sed 's/)/.${AXON_KERNEL_VER})/;q' debian/changelog; \
+       @echo PKG-KERNEL-VER=${PKG_KERNEL_VER} > debian/unipi-kernel-modules.substvars
+       ( sed 's/)/.${PKG_KERNEL_VER})/;q' debian/changelog; \
          printf "\n  * Compiled for axon-kernel-image\n";\
          printf "\n -- auto-generator <info@unipi.technology>  %s\n\n" "`date -R`"; \
          cat debian/changelog;\
        ) >debian/unipi-kernel-modules.changelog
 endif
 
-#ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),arm64)
 override_dh_dkms:
        dh_dkms -V $(MOD_VERSION)
        make dkms DESTDIR=$(PWD)/debian/unipi-kernel-modules-dkms/usr/src/unipi-$(MOD_VERSION)
-#endif
 
 #override_dh_build: