c1

Signed-off-by: Sergey V. Lobanov <[email protected]>

.github/workflows/run-tests.yml

@@ -203,7 +203,7 @@ jobs:
           NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install
           git build-essential cmake gcc linux-headers-`uname -r`
           libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip 
-          iproute2 ppp pppoe isc-dhcp-client dkms debhelper
+          iproute2 ppp pppoe isc-dhcp-client dkms debhelper devscripts
 
       - name: Install testing tools (using pip)
         run: >
@@ -229,15 +229,13 @@ jobs:
         run: make && sudo make install
 
       - name: build dkms package for ipoe
-        working-directory: ./drivers/ipoe
-        run: dkms mkdeb --source-only
-
-      - name: build dkms package for vlan_mon
-        working-directory: ./drivers/vlan_mon
-        run: dkms mkdeb --source-only
+        working-directory: ./drivers/dkms/ipoe
+        run: >
+          ln -sf ../../../../build/version.h src/
+          debuild -us -uc -tc -b
 
       - name: install ipoe and vlan_mon via dkms
-        working-directory: ./drivers
+        working-directory: ./drivers/dkms
         run: sudo apt -y install *.deb
 
       - name: Insert and check kernel modules (ipoe and vlan-mon)

drivers/dkms/accel-ppp-ipoe-dkms_1.2.0-1_arm64.build

@@ -0,0 +1,55 @@
+ dpkg-buildpackage -us -uc -ui -tc -b
+dpkg-buildpackage: info: source package accel-ppp-ipoe-dkms
+dpkg-buildpackage: info: source version 1.2.0-1
+dpkg-buildpackage: info: source distribution unstable
+dpkg-buildpackage: info: source changed by Sergey V. Lobanov <[email protected]>
+ dpkg-source --before-build .
+dpkg-buildpackage: info: host architecture arm64
+ debian/rules clean
+dh clean --with dkms
+   dh_clean
+ debian/rules build
+dh build --with dkms
+   dh_update_autotools_config
+   dh_autoreconf
+   create-stamp debian/debhelper-build-stamp
+ debian/rules binary
+dh binary --with dkms
+   dh_testroot
+   dh_prep
+   debian/rules override_dh_install
+make[1]: Entering directory '/home/sergey/accel-ppp/drivers/dkms/ipoe'
+dh_install src/* usr/src/accel-ppp-ipoe-1.2.0/
+make[1]: Leaving directory '/home/sergey/accel-ppp/drivers/dkms/ipoe'
+   dh_installdocs
+   dh_installchangelogs
+   debian/rules override_dh_dkms
+make[1]: Entering directory '/home/sergey/accel-ppp/drivers/dkms/ipoe'
+dh_dkms -V 1.2.0
+make[1]: Leaving directory '/home/sergey/accel-ppp/drivers/dkms/ipoe'
+   dh_perl
+   dh_link
+   dh_strip_nondeterminism
+   dh_compress
+   dh_fixperms
+   dh_missing
+   dh_installdeb
+   dh_gencontrol
+   dh_md5sums
+   dh_builddeb
+dpkg-deb: building package 'accel-ppp-ipoe-dkms' in '../accel-ppp-ipoe-dkms_1.2.0-1_all.deb'.
+ dpkg-genbuildinfo --build=binary -O../accel-ppp-ipoe-dkms_1.2.0-1_arm64.buildinfo
+ dpkg-genchanges --build=binary -O../accel-ppp-ipoe-dkms_1.2.0-1_arm64.changes
+dpkg-genchanges: info: binary-only upload (no source code included)
+ debian/rules clean
+dh clean --with dkms
+   dh_clean
+ dpkg-source --after-build .
+dpkg-buildpackage: info: binary-only upload (no source included)
+Now running lintian accel-ppp-ipoe-dkms_1.2.0-1_arm64.changes ...
+running with root privileges is not recommended!
+E: accel-ppp-ipoe-dkms changes: bad-distribution-in-changes-file unstable
+E: accel-ppp-ipoe-dkms: extended-description-is-empty
+E: accel-ppp-ipoe-dkms: no-copyright-file
+W: accel-ppp-ipoe-dkms: initial-upload-closes-no-bugs
+Finished running lintian.

drivers/dkms/accel-ppp-ipoe-dkms_1.2.0-1_arm64.buildinfo

@@ -0,0 +1,229 @@
+Format: 1.0
+Source: accel-ppp-ipoe-dkms
+Binary: accel-ppp-ipoe-dkms
+Architecture: all
+Version: 1.2.0-1
+Checksums-Md5:
+ 23f597446eb89a2adb217d3a0b912df2 11796 accel-ppp-ipoe-dkms_1.2.0-1_all.deb
+Checksums-Sha1:
+ e6a99afcbf5f5b1ef6b5a3830ae1a86ebadcb378 11796 accel-ppp-ipoe-dkms_1.2.0-1_all.deb
+Checksums-Sha256:
+ 5ef33a0a5b331dd42d6c0851b7dee0bb0a98137d596a3872c444509823173741 11796 accel-ppp-ipoe-dkms_1.2.0-1_all.deb
+Build-Origin: Ubuntu
+Build-Architecture: arm64
+Build-Date: Wed, 29 May 2024 01:00:37 +0200
+Build-Tainted-By:
+ merged-usr-via-aliased-dirs
+ usr-local-has-configs
+ usr-local-has-includes
+ usr-local-has-libraries
+ usr-local-has-programs
+Installed-Build-Depends:
+ autoconf (= 2.71-2),
+ automake (= 1:1.16.5-1.3),
+ autopoint (= 0.21-4ubuntu4),
+ autotools-dev (= 20220109.1),
+ base-files (= 12ubuntu4.4),
+ base-passwd (= 3.5.52build1),
+ bash (= 5.1-6ubuntu1.1),
+ binutils (= 2.38-4ubuntu2.6),
+ binutils-aarch64-linux-gnu (= 2.38-4ubuntu2.6),
+ binutils-common (= 2.38-4ubuntu2.6),
+ bsdextrautils (= 2.37.2-4ubuntu3.4),
+ bsdutils (= 1:2.37.2-4ubuntu3.4),
+ build-essential (= 12.9ubuntu3),
+ bzip2 (= 1.0.8-5build1),
+ clang-14 (= 1:14.0.0-1ubuntu1.1),
+ coreutils (= 8.32-4.1ubuntu1),
+ cpp (= 4:11.2.0-1ubuntu1),
+ cpp-11 (= 11.4.0-1ubuntu1~22.04),
+ cpp-12 (= 12.3.0-1ubuntu1~22.04),
+ dash (= 0.5.11+git20210903+057cd650a4ed-3build1),
+ dctrl-tools (= 2.24-3build2),
+ debconf (= 1.5.79ubuntu1),
+ debhelper (= 13.6ubuntu1),
+ debianutils (= 5.5-1ubuntu2),
+ debugedit (= 1:5.0-4build1),
+ dh-autoreconf (= 20),
+ dh-strip-nondeterminism (= 1.13.0-1),
+ diffutils (= 1:3.8-0ubuntu2),
+ distro-info-data (= 0.52ubuntu0.4),
+ dkms (= 2.8.7-2ubuntu2.2),
+ dpkg (= 1.21.1ubuntu2.2),
+ dpkg-dev (= 1.21.1ubuntu2.2),
+ dwz (= 0.14-1build2),
+ file (= 1:5.41-3ubuntu0.1),
+ findutils (= 4.8.0-1ubuntu3),
+ g++ (= 4:11.2.0-1ubuntu1),
+ g++-11 (= 11.4.0-1ubuntu1~22.04),
+ gcc (= 4:11.2.0-1ubuntu1),
+ gcc-11 (= 11.4.0-1ubuntu1~22.04),
+ gcc-11-base (= 11.4.0-1ubuntu1~22.04),
+ gcc-12 (= 12.3.0-1ubuntu1~22.04),
+ gcc-12-base (= 12.3.0-1ubuntu1~22.04),
+ gettext (= 0.21-4ubuntu4),
+ gettext-base (= 0.21-4ubuntu4),
+ grep (= 3.7-1build1),
+ groff-base (= 1.22.4-8build1),
+ gzip (= 1.10-4ubuntu4.1),
+ hostname (= 3.23ubuntu2),
+ init-system-helpers (= 1.62),
+ install-info (= 6.8-4build1),
+ intltool-debian (= 0.35.0+20060710.5),
+ kmod (= 29-1ubuntu1),
+ libacl1 (= 2.3.1-1),
+ libarchive-zip-perl (= 1.68-1),
+ libasan6 (= 11.4.0-1ubuntu1~22.04),
+ libasan8 (= 12.3.0-1ubuntu1~22.04),
+ libatomic1 (= 12.3.0-1ubuntu1~22.04),
+ libattr1 (= 1:2.5.1-1build1),
+ libaudit-common (= 1:3.0.7-1build1),
+ libaudit1 (= 1:3.0.7-1build1),
+ libbinutils (= 2.38-4ubuntu2.6),
+ libblkid1 (= 2.37.2-4ubuntu3.4),
+ libbsd0 (= 0.11.5-1),
+ libbz2-1.0 (= 1.0.8-5build1),
+ libc-bin (= 2.35-0ubuntu3.6),
+ libc-dev-bin (= 2.35-0ubuntu3.6),
+ libc6 (= 2.35-0ubuntu3.6),
+ libc6-dev (= 2.35-0ubuntu3.6),
+ libcap-ng0 (= 0.7.9-2.2build3),
+ libcap2 (= 1:2.44-1ubuntu0.22.04.1),
+ libcc1-0 (= 12.3.0-1ubuntu1~22.04),
+ libclang-common-14-dev (= 1:14.0.0-1ubuntu1.1),
+ libclang-cpp14 (= 1:14.0.0-1ubuntu1.1),
+ libclang1-14 (= 1:14.0.0-1ubuntu1.1),
+ libcom-err2 (= 1.46.5-2ubuntu1.1),
+ libcrypt-dev (= 1:4.4.27-1),
+ libcrypt1 (= 1:4.4.27-1),
+ libctf-nobfd0 (= 2.38-4ubuntu2.6),
+ libctf0 (= 2.38-4ubuntu2.6),
+ libdb5.3 (= 5.3.28+dfsg1-0.8ubuntu3),
+ libdebconfclient0 (= 0.261ubuntu1),
+ libdebhelper-perl (= 13.6ubuntu1),
+ libdpkg-perl (= 1.21.1ubuntu2.2),
+ libdw1 (= 0.186-1build1),
+ libedit2 (= 3.1-20210910-1build1),
+ libelf1 (= 0.186-1build1),
+ libexpat1 (= 2.4.7-1ubuntu0.3),
+ libffi8 (= 3.4.2-4),
+ libfile-stripnondeterminism-perl (= 1.13.0-1),
+ libgc1 (= 1:8.0.6-1.1build1),
+ libgcc-11-dev (= 11.4.0-1ubuntu1~22.04),
+ libgcc-12-dev (= 12.3.0-1ubuntu1~22.04),
+ libgcc-s1 (= 12.3.0-1ubuntu1~22.04),
+ libgcrypt20 (= 1.9.4-3ubuntu3),
+ libgdbm-compat4 (= 1.23-1),
+ libgdbm6 (= 1.23-1),
+ libgmp10 (= 2:6.2.1+dfsg-3ubuntu1),
+ libgomp1 (= 12.3.0-1ubuntu1~22.04),
+ libgpg-error0 (= 1.43-3),
+ libgssapi-krb5-2 (= 1.19.2-2ubuntu0.3),
+ libhwasan0 (= 12.3.0-1ubuntu1~22.04),
+ libicu70 (= 70.1-2ubuntu1),
+ libisl23 (= 0.24-2build1),
+ libitm1 (= 12.3.0-1ubuntu1~22.04),
+ libk5crypto3 (= 1.19.2-2ubuntu0.3),
+ libkeyutils1 (= 1.6.1-2ubuntu3),
+ libkmod2 (= 29-1ubuntu1),
+ libkrb5-3 (= 1.19.2-2ubuntu0.3),
+ libkrb5support0 (= 1.19.2-2ubuntu0.3),
+ libllvm14 (= 1:14.0.0-1ubuntu1.1),
+ liblsan0 (= 12.3.0-1ubuntu1~22.04),
+ liblz4-1 (= 1.9.3-2build2),
+ liblzma5 (= 5.2.5-2ubuntu1),
+ libmagic-mgc (= 1:5.41-3ubuntu0.1),
+ libmagic1 (= 1:5.41-3ubuntu0.1),
+ libmd0 (= 1.0.4-1build1),
+ libmount1 (= 2.37.2-4ubuntu3.4),
+ libmpc3 (= 1.2.1-2build1),
+ libmpdec3 (= 2.5.1-2build2),
+ libmpfr6 (= 4.1.0-3build3),
+ libncursesw6 (= 6.3-2ubuntu0.1),
+ libnsl-dev (= 1.3.0-2build2),
+ libnsl2 (= 1.3.0-2build2),
+ libobjc-11-dev (= 11.4.0-1ubuntu1~22.04),
+ libobjc4 (= 12.3.0-1ubuntu1~22.04),
+ libpam-modules (= 1.4.0-11ubuntu2.4),
+ libpam-modules-bin (= 1.4.0-11ubuntu2.4),
+ libpam-runtime (= 1.4.0-11ubuntu2.4),
+ libpam0g (= 1.4.0-11ubuntu2.4),
+ libpcre2-8-0 (= 10.39-3ubuntu0.1),
+ libpcre3 (= 2:8.39-13ubuntu0.22.04.1),
+ libperl5.34 (= 5.34.0-3ubuntu1.3),
+ libpipeline1 (= 1.5.5-1),
+ libpython3-stdlib (= 3.10.6-1~22.04),
+ libpython3.10-minimal (= 3.10.12-1~22.04.3),
+ libpython3.10-stdlib (= 3.10.12-1~22.04.3),
+ libreadline8 (= 8.1.2-1),
+ libseccomp2 (= 2.5.3-2ubuntu2),
+ libselinux1 (= 3.3-1build2),
+ libsigsegv2 (= 2.13-1ubuntu3),
+ libsmartcols1 (= 2.37.2-4ubuntu3.4),
+ libsqlite3-0 (= 3.37.2-2ubuntu0.3),
+ libssl3 (= 3.0.2-0ubuntu1.15),
+ libstdc++-11-dev (= 11.4.0-1ubuntu1~22.04),
+ libstdc++6 (= 12.3.0-1ubuntu1~22.04),
+ libsub-override-perl (= 0.09-2),
+ libsystemd0 (= 249.11-0ubuntu3.11),
+ libtinfo6 (= 6.3-2ubuntu0.1),
+ libtirpc-common (= 1.3.2-2ubuntu0.1),
+ libtirpc-dev (= 1.3.2-2ubuntu0.1),
+ libtirpc3 (= 1.3.2-2ubuntu0.1),
+ libtool (= 2.4.6-15build2),
+ libtsan0 (= 11.4.0-1ubuntu1~22.04),
+ libtsan2 (= 12.3.0-1ubuntu1~22.04),
+ libubsan1 (= 12.3.0-1ubuntu1~22.04),
+ libuchardet0 (= 0.0.7-1build2),
+ libudev1 (= 249.11-0ubuntu3.11),
+ libunistring2 (= 1.0-1),
+ libuuid1 (= 2.37.2-4ubuntu3.4),
+ libxml2 (= 2.9.13+dfsg-1ubuntu0.4),
+ libzstd1 (= 1.4.8+dfsg-3build1),
+ linux-libc-dev (= 5.15.0-102.112),
+ llvm-14-linker-tools (= 1:14.0.0-1ubuntu1.1),
+ login (= 1:4.8.1-2ubuntu2.2),
+ lsb-base (= 11.1.0ubuntu4),
+ lsb-release (= 11.1.0ubuntu4),
+ lto-disabled-list (= 24),
+ m4 (= 1.4.18-5ubuntu2),
+ mailcap (= 3.70+nmu1ubuntu1),
+ make (= 4.3-4.1build1),
+ man-db (= 2.10.2-1),
+ mawk (= 1.3.4.20200120-3),
+ media-types (= 7.0.0),
+ mime-support (= 3.66),
+ ncurses-base (= 6.3-2ubuntu0.1),
+ ncurses-bin (= 6.3-2ubuntu0.1),
+ patch (= 2.7.6-7build2),
+ perl (= 5.34.0-3ubuntu1.3),
+ perl-base (= 5.34.0-3ubuntu1.3),
+ perl-modules-5.34 (= 5.34.0-3ubuntu1.3),
+ po-debconf (= 1.0.21+nmu1),
+ python3 (= 3.10.6-1~22.04),
+ python3-minimal (= 3.10.6-1~22.04),
+ python3.10 (= 3.10.12-1~22.04.3),
+ python3.10-minimal (= 3.10.12-1~22.04.3),
+ readline-common (= 8.1.2-1),
+ rpcsvc-proto (= 1.4.2-0ubuntu6),
+ sed (= 4.8-1ubuntu2),
+ sensible-utils (= 0.0.17),
+ sysvinit-utils (= 3.01-1ubuntu1),
+ tar (= 1.34+dfsg-1ubuntu0.1.22.04.2),
+ util-linux (= 2.37.2-4ubuntu3.4),
+ xz-utils (= 5.2.5-2ubuntu1),
+ zlib1g (= 1:1.2.11.dfsg-2ubuntu9.2)
+Environment:
+ DEB_BUILD_OPTIONS="parallel=2"
+ DEB_BUILD_PROFILES="noudeb"
+ LANG="en_US.UTF-8"
+ LC_ADDRESS="ru_RU.UTF-8"
+ LC_IDENTIFICATION="ru_RU.UTF-8"
+ LC_MEASUREMENT="ru_RU.UTF-8"
+ LC_MONETARY="ru_RU.UTF-8"
+ LC_NAME="ru_RU.UTF-8"
+ LC_NUMERIC="ru_RU.UTF-8"
+ LC_PAPER="ru_RU.UTF-8"
+ LC_TELEPHONE="ru_RU.UTF-8"
+ LC_TIME="ru_RU.UTF-8"
+ SOURCE_DATE_EPOCH="1716975013"

drivers/dkms/accel-ppp-ipoe-dkms_1.2.0-1_arm64.changes

@@ -0,0 +1,26 @@
+Format: 1.8
+Date: Wed, 29 May 2024 11:30:13 +0200
+Source: accel-ppp-ipoe-dkms
+Binary: accel-ppp-ipoe-dkms
+Built-For-Profiles: noudeb
+Architecture: all
+Version: 1.2.0-1
+Distribution: unstable
+Urgency: low
+Maintainer: Dmitry Kozlov <[email protected]>
+Changed-By: Sergey V. Lobanov <[email protected]>
+Description:
+ accel-ppp-ipoe-dkms - DKMS source for the accel-ppp-ipoe driver
+Changes:
+ accel-ppp-ipoe-dkms (1.2.0-1) unstable; urgency=low
+ .
+   * First dkms package
+Checksums-Sha1:
+ e6a99afcbf5f5b1ef6b5a3830ae1a86ebadcb378 11796 accel-ppp-ipoe-dkms_1.2.0-1_all.deb
+ d079a50846d680e9c0e619cace9bf89f9fa6e946 7480 accel-ppp-ipoe-dkms_1.2.0-1_arm64.buildinfo
+Checksums-Sha256:
+ 5ef33a0a5b331dd42d6c0851b7dee0bb0a98137d596a3872c444509823173741 11796 accel-ppp-ipoe-dkms_1.2.0-1_all.deb
+ 28ca64466154098cc2f40f7e1ad93942916a89269327151a3395b3ef773f3e41 7480 accel-ppp-ipoe-dkms_1.2.0-1_arm64.buildinfo
+Files:
+ 23f597446eb89a2adb217d3a0b912df2 11796 kernel optional accel-ppp-ipoe-dkms_1.2.0-1_all.deb
+ d30f2269cd97bd736ef58e4ecea0e9b8 7480 - - accel-ppp-ipoe-dkms_1.2.0-1_arm64.buildinfo

drivers/dkms/ipoe/README.md

@@ -0,0 +1,7 @@
+## Building Debian DKMS pacakge
+
+From the top level directory, execute:
+
+```
+debuild -us -uc -tc -b
+```

drivers/ipoe/dkms.conf → drivers/dkms/ipoe/debian/accel-ppp-ipoe-dkms.dkms

@@ -1,4 +1,4 @@
-PACKAGE_NAME="accel-ppp-ipoe-dkms"
+PACKAGE_NAME="accel-ppp-ipoe"
 PACKAGE_VERSION=1.2.0
 REMAKE_INITRD=no
 AUTOINSTALL=yes

drivers/dkms/ipoe/debian/changelog

@@ -0,0 +1,5 @@
+accel-ppp-ipoe-dkms (1.2.0-1) unstable; urgency=low
+
+  * First dkms package
+
+ -- Sergey V. Lobanov <[email protected]>  Wed, 29 May 2024 11:30:13 +0200

drivers/dkms/ipoe/debian/compat

@@ -0,0 +1 @@
+10

drivers/dkms/ipoe/debian/control

@@ -0,0 +1,11 @@
+Source: accel-ppp-ipoe-dkms
+Maintainer: Dmitry Kozlov <[email protected]>
+Build-Depends: debhelper (>= 10), dkms
+Homepage: https://www.accel-ppp.io/
+
+Package: accel-ppp-ipoe-dkms
+Architecture: all
+Priority: optional
+Section: kernel
+Depends: dkms (>= 1.95), linux-headers-686-pae | linux-headers-amd64 | linux-headers-generic | linux-headers, ${misc:Depends}
+Description: DKMS source for the accel-ppp-ipoe driver

drivers/dkms/ipoe/debian/rules

@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpkg/pkg-info.mk
+
+%:
+	dh $@ --with dkms
+
+override_dh_install:
+	dh_install src/* usr/src/accel-ppp-ipoe-$(DEB_VERSION_UPSTREAM)/
+
+override_dh_dkms:
+	dh_dkms -V $(DEB_VERSION_UPSTREAM)
+
+override_dh_auto_configure:
+override_dh_auto_build:
+override_dh_auto_test:
+override_dh_auto_install:
+override_dh_auto_clean: