Change neuron-kernel pkg-name to unipi-kernel-modules. For stretch remains old name

diff --git a/debian/clean b/debian/clean
index c365c7ed6ab4880f04bb753ce37cd306e21abaca..b8513d6e75beafcfdea71976e8c98d8e49493999 100644 (file)
--- a/debian/clean
+++ b/debian/clean
@@ -1,7 +1,12 @@
 debian/unipi-kernel-modules.changelog
 debian/neuron-kernel.install
 debian/unipi-kernel-modules-dkms.install
+debian/unipi-kernel-modules.substvars
+debian/unipi-kernel-modules.postinst.debhelper
+debian/unipi-kernel-modules.prerm.debhelper
+debian/unipi-kernel-modules.postrm.debhelper
 debian/neuron-kernel.substvars
 debian/neuron-kernel.postinst.debhelper 
 debian/neuron-kernel.postrm.debhelper
 debian/neuron-kernel/
+debian/unipi-kernel-modules/
\ No newline at end of file

diff --git a/debian/control b/debian/control
index ab04343fb152c81e4074207917969912b4cb5529..30b99541db28461875d6a1dc7a4dce960346cca1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,29 +7,15 @@ Standards-Version: 3.9.8
 Homepage: https://www.unipi.technology/
 Vcs-Git: https://git.unipi.technology/UniPi/unipi-kernel.git
 
-Package: neuron-kernel
-Architecture: armhf
-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. 
-
 Package: unipi-kernel-modules-dkms
 Architecture: all
 Pre-Depends: raspberrypi-kernel-headers | axon-kernel-headers | linux-headers(>=4.0)
 Depends: ${misc:Depends}, unipi-common, dkms
 Replaces: neuron-kernel, unipi-kernel-modules
 Conflicts: neuron-kernel, unipi-kernel-modules
-Description: UniPi Neuron kernel modules - DKMS source
+Description: UniPi Neuron/Axon kernel modules - DKMS source
  This package contains source code of kernel module for spi protocol 
  used by internal boards in the UniPi Neuron/Axon controllers.
  Can be used with DKMS so that local kernel images are automatically
  built and installed every time relevant kernel packages are upgraded.
 
-Package: unipi-kernel-modules
-Architecture: arm64
-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/control.in b/debian/control.in
new file mode 100644 (file)
index 0000000..30b9954
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,21 @@
+Source: unipi-kernel-modules
+Section: kernel
+Priority: optional
+Maintainer: Miroslav Ondra <info@unipi.technology>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.8
+Homepage: https://www.unipi.technology/
+Vcs-Git: https://git.unipi.technology/UniPi/unipi-kernel.git
+
+Package: unipi-kernel-modules-dkms
+Architecture: all
+Pre-Depends: raspberrypi-kernel-headers | axon-kernel-headers | linux-headers(>=4.0)
+Depends: ${misc:Depends}, unipi-common, dkms
+Replaces: neuron-kernel, unipi-kernel-modules
+Conflicts: neuron-kernel, unipi-kernel-modules
+Description: UniPi Neuron/Axon kernel modules - DKMS source
+ This package contains source code of kernel module for spi protocol 
+ used by internal boards in the UniPi Neuron/Axon controllers.
+ Can be used with DKMS so that local kernel images are automatically
+ built and installed every time relevant kernel packages are upgraded.
+

diff --git a/debian/control.inbuster b/debian/control.inbuster
new file mode 100644 (file)
index 0000000..790db2d
--- /dev/null
+++ b/debian/control.inbuster
@@ -0,0 +1,10 @@
+
+Package: unipi-kernel-modules
+Architecture: arm64 armhf
+Depends: ${misc:Depends}, unipi-common, axon-kernel-image(=${PKG-KERNEL-VER}) | raspberrypi-kernel(=${PKG-KERNEL-VER})
+Replaces: neuron-kernel
+Breaks: neuron-kernel
+Description: UniPi Neuron/Axon kernel modules
+ Binary kernel modules for UniPi Neuron/Axon controller. Compiled for axon-kernel-image 
+ version. 
+

diff --git a/debian/control.instretch b/debian/control.instretch
new file mode 100644 (file)
index 0000000..1a7c156
--- /dev/null
+++ b/debian/control.instretch
@@ -0,0 +1,14 @@
+Package: neuron-kernel
+Architecture: armhf
+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. 
+
+Package: unipi-kernel-modules
+Architecture: arm64
+Depends: ${misc:Depends}, unipi-common, axon-kernel-image(=${PKG-KERNEL-VER}) | raspberrypi-kernel(=${PKG-KERNEL-VER})
+Description: UniPi Neuron/Axon kernel modules
+ Binary kernel modules for UniPi Neuron/Axon controller. Compiled for axon-kernel-image 
+ version. 
+

diff --git a/debian/neuron-kernel-docs.docs b/debian/neuron-kernel-docs.docs
deleted file mode 100644 (file)
index e845566..0000000
--- a/debian/neuron-kernel-docs.docs
+++ /dev/null
@@ -1 +0,0 @@
-README

diff --git a/debian/rules b/debian/rules
index 5cee1dfdaf1885f1fe42f92529e8018b72036d36..82d8134239b766165b9551640901c41f1c492c12 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,16 @@ export DEB_LDFLAGS_SET = -zrelro
 
 MOD_VERSION=$(shell dpkg-parsechangelog |grep ^Version:|cut -d ' ' -f 2)
 
+DEBIAN_VERSION=$(shell . /ci-scripts/include.sh ; echo $${DEBIAN_VERSION})
+
+ifeq ($(DEBIAN_VERSION),stretch)
+    BINARY_PKG_NAME=neuron-kernel
+    CONTROL_INC=stretch
+else
+    BINARY_PKG_NAME=unipi-kernel-modules
+    CONTROL_INC=buster
+endif 
+
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),armhf)
 ifeq ($(shell dpkg-architecture -q DEB_BUILD_ARCH),armhf)
 RPI_FIRMWARE_VER = $(shell dpkg-query -f='$${Version}' -W raspberrypi-kernel-headers)
@@ -38,6 +48,9 @@ LINUX_DIR_PATH = $(shell dpkg -L axon-kernel-headers | sed -n '/^\/lib\/modules\
 KERNEL_VERSION = $(subst /lib/modules/,,$(subst /build,,$(LINUX_DIR_PATH)))
 endif
 
+clean:
+       cat debian/control.in debian/control.in$(CONTROL_INC) >debian/control
+       dh clean --with dkms
 
 %:
        dh $@ --with dkms
@@ -48,13 +61,13 @@ override_dh_installmodules:
 
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),armhf)
 override_dh_prep:
-       @dh_prep --exclude=neuron-kernel.substvars
-       @echo PKG-KERNEL-VER=${RPI_FIRMWARE_VER} >> debian/neuron-kernel.substvars
+       @dh_prep --exclude=$(BINARY_PKG_NAME).substvars
+       @echo PKG-KERNEL-VER=${RPI_FIRMWARE_VER} >> debian/$(BINARY_PKG_NAME).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`"; \
          cat debian/changelog;\
-       ) >debian/neuron-kernel.changelog
+       ) >debian/$(BINARY_PKG_NAME).changelog
 endif 
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),arm64)
 override_dh_prep:
@@ -97,7 +110,7 @@ override_dh_auto_install:
 endif
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),armhf)
 override_dh_auto_install:
-       dh_auto_install --destdir=debian/neuron-kernel -- CCPREFIX=${DEB_TARGET_GNU_TYPE}- \
+       dh_auto_install --destdir=debian/$(BINARY_PKG_NAME) -- CCPREFIX=${DEB_TARGET_GNU_TYPE}- \
                LINUX_DIR_PATH=$(LINUX_DIR_PATH) ARCH=${DEB_TARGET_ARCH_CPU}
 endif
 ifeq ($(shell dpkg-architecture -q DEB_HOST_ARCH),amd64)

diff --git a/debian/unipi-kernel-modules-docs.docs b/debian/unipi-kernel-modules-docs.docs
new file mode 100644 (file)
index 0000000..e845566
--- /dev/null
+++ b/debian/unipi-kernel-modules-docs.docs
@@ -0,0 +1 @@
+README