Aditional files to the debian package

.circleci/config.yml

@@ -13,7 +13,7 @@ root_directory: &root_directory
 
 load_artifacts: &load_artifacts
   attach_workspace:
-    at: /tmp/debians
+    at: $PWD/artifacts/
 
 jobs:
   debian_dkms_build:
@@ -26,19 +26,16 @@ jobs:
       - run:
           name: "Package debs (debuild)"
           command: |
-            # build is going to fail but it's needed to generate the debs
-            ls -lah
-            pwd
             echo "$PWD"
-            GITHUB_WORKSPACE="$PWD" greenzie-dkms mkdeb -d
-            cd /tmp/debians/ && tar cvf /tmp/debians/alldebs.tar *.deb
+            ls -lah
+            bash -x "$PWD/build_dmks.sh"    
       - store_artifacts:
-          path: /tmp/debians
-          destination: pciusb381-debian-package
+          path: artifacts/
+          destination: emuccan-debian-package
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory in the execution
           # environment which is taken to be the root directory of the workspace.
-          root: /tmp/debians
+          root: artifacts/
           # Must be relative path from root
           paths:
             - '*'

build_dmks.sh

@@ -0,0 +1,123 @@
+#!/bin/bash
+set -e
+
+PROJECT_DIR=${2:-$PWD}
+DRIVER_CODE_DIR=${1:-"$PROJECT_DIR/driver"}
+
+echo "==> Project directory: $PROJECT_DIR"
+echo "==> Driver code directory: $DRIVER_CODE_DIR"
+
+echo "==> Checking for the module name and version in $DRIVER_CODE_DIR/dkms.conf"
+# Define module name and version based on dkms.conf
+MODULE_NAME=$(grep '^PACKAGE_NAME' "$DRIVER_CODE_DIR/dkms.conf" | awk -F'=' '{print $2}' | tr -d ' ')
+VERSION=$(grep '^PACKAGE_VERSION' "$DRIVER_CODE_DIR/dkms.conf" | awk -F'=' '{print $2}' | tr -d ' ')
+
+if [ -z "$MODULE_NAME" ] || [ -z "$VERSION" ]; then
+    echo "Error: Module name or version not found in dkms.conf"
+    exit 1
+fi
+
+echo "==> Module name: $MODULE_NAME"
+echo "==> Version: $VERSION"
+
+echo "==> Checking for required tools and dependencies..."
+# Check if dkms is installed, install if missing
+if ! command -v dkms &> /dev/null; then
+    echo "dkms command not found. Installing dkms..."
+    sudo apt update && sudo apt install -y dkms
+fi
+
+# Check if debhelper is installed, install if missing
+if ! dpkg-query -W -f='${Status}' debhelper 2>/dev/null | grep -q "install ok installed"; then
+    echo "debhelper not found. Installing debhelper..."
+    sudo apt install -y debhelper
+fi
+
+echo "==> Preparing to use dkms to package the module..."
+# Ensure the module directory exists in /usr/src
+WORKSPACE="/usr/src/${MODULE_NAME}-${VERSION}"
+sudo rm -rf "$WORKSPACE"  # Remove if it exists
+sudo mkdir -p "$WORKSPACE"
+sudo cp -r "$DRIVER_CODE_DIR"/* "$WORKSPACE"
+
+
+# Add the module
+if dkms status -m "$MODULE_NAME" -v "$VERSION" | grep -q "$VERSION"; then
+    echo "Module '$MODULE_NAME' already exists"
+else
+    sudo dkms add -m "$MODULE_NAME" -v "$VERSION"
+fi
+
+# Create Debian package
+sudo dkms mkdeb -m "$MODULE_NAME" -v "$VERSION" --kernelsourcedir="$DKMS_KERNEL_SOURCE_DIR"
+
+
+SRC_DIR="/var/lib/dkms/${MODULE_NAME}/${VERSION}/deb/"
+DST_DIR="$PROJECT_DIR/artifacts"
+if [ -d "$SRC_DIR" ]; then
+    rm -rf "$DST_DIR" || true
+    sudo mkdir -p "$DST_DIR"
+    cp -r "$SRC_DIR"/*.deb "$DST_DIR"
+else
+    echo "==> ERROR: Source directory $SRC_DIR does not exist; skipping artifact creation."
+    exit 1
+fi
+
+echo "==> Ok, now we will modify the .deb package to include additional files."
+echo "==> We are doing this because we have not found a way to include additional files in the dkms package."
+echo "==> This is a workaround to include the systemd service file, udev rules, and other configuration files."
+
+echo "==> First, we will unpack the .deb package"
+# Define paths for the unpack and repack process
+DEB_FILE=$(find "$DST_DIR" -name "*.deb" | head -n 1)
+UNPACK_DIR="unpacked_deb"
+
+rm -rf "$UNPACK_DIR" || true
+
+echo "==> We have found the .deb package at $DEB_FILE"
+# Unpack the .deb package
+if [ -f "$DEB_FILE" ]; then
+    echo "==> Unpacking $DEB_FILE for modification..."
+    mkdir -p "$UNPACK_DIR"
+    dpkg-deb -R "$DEB_FILE" "$UNPACK_DIR"
+else
+    echo "ERROR: .deb file not found in $DST_DIR."
+    exit 1
+fi
+
+echo "==> We have unpacked the .deb package to $UNPACK_DIR"
+echo "==> Before adding files, the unpacked package structure is as follows:"
+ls "$UNPACK_DIR"
+echo "==> Now we will add the necessary files to the unpacked package."
+
+# Create necessary directories in unpacked package
+mkdir -p "$UNPACK_DIR/lib/systemd/system"
+mkdir -p "$UNPACK_DIR/lib/udev/rules.d"
+mkdir -p "$UNPACK_DIR/etc/modules-load.d"
+mkdir -p "$UNPACK_DIR/etc/default"
+
+# Copy files into the unpacked structure
+ls "$PROJECT_DIR"
+cp "$PROJECT_DIR/emuccan.service" "$UNPACK_DIR/lib/systemd/system/emuccan.service"
+cp "$PROJECT_DIR/emuccan.udev" "$UNPACK_DIR/lib/udev/rules.d/60-emuccan.rules"
+cp "$PROJECT_DIR/emuccan.conf" "$UNPACK_DIR/etc/modules-load.d/emuccan.conf"
+cp "$PROJECT_DIR/emuccan.default" "$UNPACK_DIR/etc/default/emuccan"
+
+echo "==> We added the files to the unpacked package."
+rm -rf "$UNPACK_DIR/usr/src/${MODULE_NAME}-${VERSION}/debian"
+echo "==> After adding files, the unpacked package structure is as follows:"
+ls "$UNPACK_DIR"
+
+
+# Rebuild the .deb package with the added files
+echo "==> Now we will rebuild the .deb package with the added files."
+echo "==> Repacking the modified .deb package..."
+dpkg-deb -b "$UNPACK_DIR" "$DST_DIR/modified_${MODULE_NAME}_${VERSION}.deb"
+
+# Clean up
+rm -rf "$UNPACK_DIR"
+echo "==> Repackaging complete. Modified package located at $DST_DIR/modified_${MODULE_NAME}_${VERSION}.deb"
+echo "==> Replacing the original package with the modified package."
+mv "$DST_DIR/modified_${MODULE_NAME}_${VERSION}.deb" "$DEB_FILE"
+echo "==> Done. Final modified package is located at $DEB_FILE"
+

driver/dkms.conf

@@ -1,5 +1,5 @@
-PACKAGE_NAME="emuccan"
-PACKAGE_VERSION="2.6.1"
+PACKAGE_NAME=emuccan
+PACKAGE_VERSION=2.6.1
 CLEAN="make clean KVERSION=$kernelver"
 MAKE[0]="make KVERSION=$kernelver"
 BUILT_MODULE_NAME[0]="emuc2socketcan"

driver/emuccan-dkms-mkdeb/debian/compat

@@ -1 +1 @@
-7
+9

driver/emuccan-dkms-mkdeb/debian/control

@@ -2,11 +2,14 @@ Source: DEBIAN_PACKAGE-dkms
 Section: misc
 Priority: optional
 Maintainer: Greenzie Developers <[email protected]>
-Build-Depends: debhelper (>= 7), dkms
+Build-Depends: debhelper (>= 9), dkms
 Standards-Version: 3.8.1
 
 Package: DEBIAN_PACKAGE-dkms
 Architecture: DEBIAN_BUILD_ARCH
 Provides: DEBIAN_PACKAGE-modules (= MODULE_VERSION)
 Depends: dkms (>= 1.95), ${misc:Depends}
+Replaces: emuccan-b202-5.4.0-96-generic
+Breaks: emuccan-b202-5.4.0-96-generic
+Conflicts: emuccan-b202-5.4.0-96-generic
 Description: DEBIAN_PACKAGE driver in DKMS format.

driver/post_install.sh

@@ -24,4 +24,13 @@ echo "${MODULE_NAME}" | sudo tee /etc/modules-load.d/${MODULE_NAME}.conf
 
 depmod -a
 
+# Reload udev rules (from postinst)
+udevadm control --reload-rules && udevadm trigger
+
+# Reload systemd manager configuration as those has been changed
+systemctl daemon-reload
+
+# enable emuccan.service
+systemctl enable emuccan
+
 modprobe ${MODULE_NAME} || true

postinst

@@ -32,8 +32,7 @@ case "$1" in
       # reload udev rules, may have to reboot, sadly:
       udevadm control --reload-rules && udevadm trigger
 
-      # enable emuccan.service
-      systemctl enable emuccan
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)