From 34155624d86be9a49a39bac6e775526c510f4487 Mon Sep 17 00:00:00 2001 From: Denys Fedoryshchenko Date: Sun, 18 Aug 2024 15:36:13 +0300 Subject: Revert "build: add dkms support for ipoe and vlan_mon drivers, ci optimizations" --- .github/workflows/build-and-run.yml | 112 +++++++++++++-------- .github/workflows/run-tests.yml | 86 +++------------- cmake/cpack.cmake | 1 - drivers/dkms/ipoe/README.md | 10 -- drivers/dkms/ipoe/debian/accel-ppp-ipoe-dkms.dkms | 5 - drivers/dkms/ipoe/debian/changelog | 5 - drivers/dkms/ipoe/debian/compat | 1 - drivers/dkms/ipoe/debian/control | 11 -- drivers/dkms/ipoe/debian/rules | 18 ---- drivers/dkms/ipoe/src | 1 - drivers/dkms/vlan_mon/README.md | 10 -- .../vlan_mon/debian/accel-ppp-vlan-mon-dkms.dkms | 5 - drivers/dkms/vlan_mon/debian/changelog | 5 - drivers/dkms/vlan_mon/debian/compat | 1 - drivers/dkms/vlan_mon/debian/control | 11 -- drivers/dkms/vlan_mon/debian/rules | 18 ---- drivers/dkms/vlan_mon/src | 1 - drivers/ipoe/ipoe.c | 1 - drivers/vlan_mon/vlan_mon.c | 1 - 19 files changed, 85 insertions(+), 218 deletions(-) delete mode 100644 drivers/dkms/ipoe/README.md delete mode 100644 drivers/dkms/ipoe/debian/accel-ppp-ipoe-dkms.dkms delete mode 100644 drivers/dkms/ipoe/debian/changelog delete mode 100644 drivers/dkms/ipoe/debian/compat delete mode 100644 drivers/dkms/ipoe/debian/control delete mode 100755 drivers/dkms/ipoe/debian/rules delete mode 120000 drivers/dkms/ipoe/src delete mode 100644 drivers/dkms/vlan_mon/README.md delete mode 100644 drivers/dkms/vlan_mon/debian/accel-ppp-vlan-mon-dkms.dkms delete mode 100644 drivers/dkms/vlan_mon/debian/changelog delete mode 100644 drivers/dkms/vlan_mon/debian/compat delete mode 100644 drivers/dkms/vlan_mon/debian/control delete mode 100755 drivers/dkms/vlan_mon/debian/rules delete mode 120000 drivers/dkms/vlan_mon/src diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml index 6edc531d..fb6dd798 100644 --- a/.github/workflows/build-and-run.yml +++ b/.github/workflows/build-and-run.yml @@ -28,17 +28,15 @@ jobs: - name: Set common vars run: | echo UNAME_R=`uname -r` >> $GITHUB_ENV - echo UNAME_M=`uname -m` >> $GITHUB_ENV - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV + echo UNAME_M=`uname -m` >> $GITHUB_ENV; - name: Install build tools run: > - sudo apt update && sudo -E apt -y install + sudo apt update && + 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 - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: mkdir build @@ -63,7 +61,7 @@ jobs: accel-ppp_`git describe --tags --long | sed 's/^v//' | sed 's/-/+/' | sed 's/-/~/'`-1+${{ matrix.pkg-distro }}_`uname -m`.deb - name: Install debian package working-directory: ./build - run: sudo -E apt -y install ./accel-ppp*.deb + run: NEEDRESTART_SUSPEND=1 sudo -E apt -y install ./accel-ppp*.deb - name: Copy default config run: sudo cp /etc/accel-ppp.conf.dist /etc/accel-ppp.conf - name: Start accel-ppp @@ -72,6 +70,12 @@ jobs: run: sudo systemctl status accel-ppp - name: Check accel-ppp stat run: accel-cmd show stat + - name: Upload .deb package as artifact + uses: actions/upload-artifact@v4 + with: + name: deb-package-${{ matrix.distro }}-${{ env.UNAME_M }}-${{ env.UNAME_R }} + path: build/accel-ppp_*.deb + if-no-files-found: error # Debian based distros Build-in-Container-Debian: @@ -86,9 +90,9 @@ jobs: "debian:trixie", "ubuntu:20.04", "ubuntu:22.04", - "ubuntu:24.04", + "ubuntu:24.04" ] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 container: image: ${{ matrix.distro }} steps: @@ -108,25 +112,20 @@ jobs: echo DISTRO=$DISTRO >> $GITHUB_ENV; echo CPACK_TYPE=$CPACK_TYPE >> $GITHUB_ENV; echo UNAME_M=`uname -m` >> $GITHUB_ENV; - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV; - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV; - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV; cat $GITHUB_ENV - name: Install build tools run: > apt update && apt -y upgrade && apt -y dist-upgrade && - apt -y install git build-essential cmake gcc + NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt -y install git build-essential cmake gcc linux-headers-${{ env.HEADERS_SUFFIX }} - libpcre3-dev libssl-dev liblua5.1-0-dev kmod dkms debhelper devscripts - - name: Install additional build tools (using apt) (for some OS) - run: apt -y install dh-dkms || exit 0 + libpcre3-dev libssl-dev liblua5.1-0-dev kmod - name: Get kernel name from headers run: > echo KERNEL_NAME=`ls -1 /usr/src/ | grep 'linux-headers.*${{ env.HEADERS_SUFFIX }}' | sed 's/linux-headers-//'` >> $GITHUB_ENV; cat $GITHUB_ENV - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: mkdir build @@ -136,7 +135,7 @@ jobs: - name: cmake working-directory: ./build run: > - cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DKDIR=/usr/src/linux-headers-${{ env.KERNEL_NAME }} -DMODULES_KDIR=${{ env.KERNEL_NAME }} -DLUA=TRUE -DSHAPER=FALSE -DRADIUS=TRUE @@ -144,7 +143,7 @@ jobs: - name: make working-directory: ./build run: make - - name: Generate debian package (without drivers) + - name: Generate debian package working-directory: ./build run: cpack -G DEB - name: Rename accel-ppp deb package @@ -152,22 +151,6 @@ jobs: run: > mv -v accel-ppp.deb accel-ppp_`git describe --tags --long | sed 's/^v//' | sed 's/-/+/' | sed 's/-/~/'`-1+${{ env.DISTRO }}_${{ env.UNAME_M }}.deb - - name: build dkms package for ipoe - working-directory: ./drivers/dkms/ipoe - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - name: build dkms package for vlan_mon - working-directory: ./drivers/dkms/vlan_mon - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - name: install ipoe and vlan_mon via dkms - working-directory: ./drivers/dkms - run: apt -y install ./*.deb - - name: install ipoe and vlan_mon via dkms - working-directory: ./drivers/dkms - run: apt -y install ./*.deb - name: Install debian package working-directory: ./build run: apt -y install ./accel-ppp*.deb @@ -177,18 +160,60 @@ jobs: run: sleep 1 - name: Check accel-ppp stat run: accel-cmd show stat - - name: Upload accel-ppp .deb package as artifact + - name: Upload .deb package as artifact uses: actions/upload-artifact@v4 with: - name: deb-accel-ppp-${{ env.DISTRO }}-${{ env.UNAME_M }} + name: deb-package-${{ env.DISTRO }}-${{ env.UNAME_M }}-${{ env.KERNEL_NAME }} path: build/accel-ppp_*.deb if-no-files-found: error - - name: Upload driver .deb packages as artifact - uses: actions/upload-artifact@v4 + + Build-in-Container-Mainline: + if: ${{ false }} # disable for now + runs-on: ubuntu-latest + container: + image: ubuntu:devel + steps: + - name: Install build tools + run: > + apt update && apt -y upgrade && apt -y dist-upgrade && + DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt -y install git build-essential cmake gcc + linux-headers-generic libpcre3-dev libssl-dev liblua5.1-0-dev kmod software-properties-common + pkexec dbus linux-base && + add-apt-repository -y ppa:cappelikan/ppa && apt update && + service dbus start && + apt -y install mainline && + mainline --include-rc install-latest && + apt -y purge linux-headers-generic && apt -y autoremove + - name: Get kernel name from headers + run: > + echo KERNEL_NAME=`ls -1 /usr/src/ | grep 'linux-headers.*generic' | + sed 's/linux-headers-//'` >> $GITHUB_ENV; + cat $GITHUB_ENV + - name: Check out repository code + uses: actions/checkout@v3 with: - name: deb-accel-ppp-drivers-dkms-${{ env.DISTRO }} - path: drivers/dkms/accel-ppp*.deb - if-no-files-found: error + fetch-depth: 0 + - name: mkdir build + run: mkdir build + - name: Disable git security warnings + run: git config --global --add safe.directory '*' + - name: cmake + working-directory: ./build + run: > + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_SYSCONFDIR=/etc + -DKDIR=/usr/src/linux-headers-${{ env.KERNEL_NAME }} + -DMODULES_KDIR=${{ env.KERNEL_NAME }} + -DLUA=TRUE -DSHAPER=FALSE -DRADIUS=TRUE .. + - name: make and install + working-directory: ./build + run: make && make install + - name: Start accel-ppp with default config + run: accel-pppd -d -c /etc/accel-ppp.conf.dist + - name: Sleep for 1 sec + run: sleep 1 + - name: Check accel-ppp stat + run: accel-cmd show stat Build-in-Container-Alpine: runs-on: ubuntu-24.04 @@ -199,7 +224,7 @@ jobs: run: > apk update && apk add --no-cache git cmake make g++ pcre-dev libressl-dev linux-headers libucontext-dev lua5.1-dev - name: Check out repository code - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: mkdir build @@ -223,3 +248,4 @@ jobs: run: sleep 1 - name: Check accel-ppp stat run: accel-cmd show stat + \ No newline at end of file diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2e5e9cf7..3f8016a8 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,7 +10,7 @@ on: jobs: Test-in-Qemu: #if: ${{ false }} # disable for now - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 name: Test in Qemu (${{ matrix.distro }}) strategy: fail-fast: false @@ -52,15 +52,10 @@ jobs: with: fetch-depth: 0 path: "accel-ppp" - - name: Set common vars - run: | - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV - name: Install qemu and required tools run: > sudo apt update && - sudo -E apt -y install qemu-system-x86 qemu-utils cloud-image-utils cpu-checker cloud-image-utils wget openssh-client screen + NEEDRESTART_SUSPEND=1 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true sudo -E apt -y install qemu-system-x86 qemu-utils cloud-image-utils cpu-checker cloud-image-utils wget openssh-client screen - name: Check kvm support (fail is ok) run: sudo kvm-ok || exit 0 - name: Prepare cloud-init image disk @@ -96,9 +91,9 @@ jobs: wget -nv ${{ matrix.image }} -O img/image qemu-img resize -f ${{ matrix.format }} img/`ls -1 img` +2G - name: Run target OS first time (for cloud-init actions) - run: sudo qemu-system-x86_64 -m 3072 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` -drive format=raw,file=init.img + run: sudo qemu-system-x86_64 -m 4096 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` -drive format=raw,file=init.img - name: Run target OS - run: sudo screen -dmS qemu qemu-system-x86_64 -net nic -net user,hostfwd=tcp::2222-:22 -m 3072 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` + run: sudo screen -dmS qemu qemu-system-x86_64 -net nic -net user,hostfwd=tcp::2222-:22 -m 4096 -nographic -drive format=${{ matrix.format }},file=img/`ls -1 img` - name: Check that target OS is running run: | sleep 1 @@ -124,11 +119,8 @@ jobs: git build-essential cmake gcc linux-headers-\`uname -r\` libpcre3-dev libssl-dev liblua5.1-0-dev kmod python3-pip libxml2-dev libxslt1-dev zlib1g-dev - dkms kmod debhelper devscripts iproute2 ppp pppoe isc-dhcp-client timelimit && (sudo pip3 install pytest pytest-dependency || sudo pip3 install --break-system-packages pytest pytest-dependency)" - - name: Install additional build tools (using apt) (for some OS) - run: ssh -i ssh-key -p2222 user@localhost "sudo -E apt -y install dh-dkms || exit 0" - name: Copy source code to target OS run: | tar -Jcf accel-ppp.tar.xz accel-ppp @@ -138,28 +130,11 @@ jobs: run: > ssh -i ssh-key -p2222 user@localhost "cd accel-ppp && mkdir build && cd build && - cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DKDIR=/usr/src/linux-headers-\`uname -r\` -DLUA=TRUE -DSHAPER=TRUE -DRADIUS=TRUE .. && make && sudo make install" - - name: build dkms package for ipoe - run: > - ssh -i ssh-key -p2222 user@localhost "cd accel-ppp/drivers/dkms/ipoe && - cp -f ../../../build/version.h src/ && - debuild -us -uc -tc -b" - - - name: build dkms package for vlan_mon - run: > - ssh -i ssh-key -p2222 user@localhost "cd accel-ppp/drivers/dkms/vlan_mon && - cp -f ../../../build/version.h src/ && - debuild -us -uc -tc -b" - - - name: install ipoe and vlan_mon via dkms - run: > - ssh -i ssh-key -p2222 user@localhost "cd accel-ppp/drivers/dkms && - sudo -E apt -y install ./*.deb" - - name: Run tests (not related to ipoe and vlan_mon drivers) timeout-minutes: 5 run: > @@ -174,7 +149,7 @@ jobs: - name: Insert ipoe kernel module run: > ssh -i ssh-key -p2222 user@localhost "cd accel-ppp && - sudo modprobe ipoe && + sudo insmod build/drivers/ipoe/driver/ipoe.ko && lsmod | grep ipoe " - name: Run tests (not related to vlan_mon drivers) @@ -192,7 +167,7 @@ jobs: - name: Insert vlan_mon kernel module run: > ssh -i ssh-key -p2222 user@localhost "cd accel-ppp && - sudo modprobe vlan_mon && + sudo insmod build/drivers/vlan_mon/driver/vlan_mon.ko && lsmod | grep vlan_mon" - name: Run tests (all) @@ -215,21 +190,13 @@ jobs: runs-on: ${{ matrix.distro }} steps: - - name: Set common vars - run: | - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV - name: Install build tools (using apt) run: > sudo apt update && - sudo -E apt -y install + 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 devscripts - - - name: Install additional build tools (using apt) (for some OS) - run: sudo -E apt -y install dh-dkms || exit 0 + iproute2 ppp pppoe isc-dhcp-client - name: Install testing tools (using pip) run: > @@ -243,38 +210,22 @@ jobs: - name: mkdir build run: mkdir build - - name: cmake (without drivers) + - name: cmake working-directory: ./build run: > - cmake -DBUILD_IPOE_DRIVER=FALSE -DBUILD_VLAN_MON_DRIVER=FALSE -DCMAKE_INSTALL_PREFIX=/usr + cmake -DBUILD_IPOE_DRIVER=TRUE -DBUILD_VLAN_MON_DRIVER=TRUE -DCMAKE_INSTALL_PREFIX=/usr -DKDIR=/usr/src/linux-headers-`uname -r` -DLUA=TRUE -DSHAPER=TRUE -DRADIUS=TRUE .. - - name: make && make install (without drivers) + - name: make && make install working-directory: ./build run: make && sudo make install - - name: build dkms package for ipoe - working-directory: ./drivers/dkms/ipoe - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - - name: build dkms package for vlan_mon - working-directory: ./drivers/dkms/vlan_mon - run: | - cp -f ../../../build/version.h src/ - debuild -us -uc -tc -b - - - name: install ipoe and vlan_mon via dkms - working-directory: ./drivers/dkms - run: sudo -E apt -y install ./*.deb - - name: Insert and check kernel modules (ipoe and vlan-mon) # if: ${{ false }} run: | - sudo modprobe vlan_mon - sudo modprobe ipoe + sudo insmod build/drivers/vlan_mon/driver/vlan_mon.ko + sudo insmod build/drivers/ipoe/driver/ipoe.ko lsmod | grep ipoe lsmod | grep vlan_mon @@ -288,19 +239,14 @@ jobs: strategy: fail-fast: false matrix: - distro: ["ubuntu-24.04"] + distro: ["ubuntu-24.04", "ubuntu-22.04", "ubuntu-20.04"] runs-on: ${{ matrix.distro }} steps: - - name: Set common vars - run: | - echo NEEDRESTART_SUSPEND=1 >> $GITHUB_ENV - echo DEBIAN_FRONTEND=noninteractive >> $GITHUB_ENV - echo DEBCONF_NONINTERACTIVE_SEEN=true >> $GITHUB_ENV - name: Install build tools (using apt) run: > sudo apt update && - sudo -E apt -y install + 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 diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 0cc6b886..3dfc2750 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -11,7 +11,6 @@ endif() list(GET VERSION_LIST 0 CPACK_PACKAGE_VERSION_MAJOR) list(GET VERSION_LIST 1 CPACK_PACKAGE_VERSION_MINOR) list(GET VERSION_LIST 2 CPACK_PACKAGE_VERSION_PATCH) -SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}~${CPACK_TYPE}") SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov ") diff --git a/drivers/dkms/ipoe/README.md b/drivers/dkms/ipoe/README.md deleted file mode 100644 index 6b582e2a..00000000 --- a/drivers/dkms/ipoe/README.md +++ /dev/null @@ -1,10 +0,0 @@ -## Building Debian DKMS pacakge - -Install deb packages: dkms, debhelper and devscripts. For Debian >= 12 and Ubuntu >=24.04 it is also required to install dh-dkms package. - -Build accel-ppp without drivers, then from this level directory, execute: - -``` -cp ../../../build/version.h src/ -debuild -us -uc -tc -b -``` diff --git a/drivers/dkms/ipoe/debian/accel-ppp-ipoe-dkms.dkms b/drivers/dkms/ipoe/debian/accel-ppp-ipoe-dkms.dkms deleted file mode 100644 index 47543fe5..00000000 --- a/drivers/dkms/ipoe/debian/accel-ppp-ipoe-dkms.dkms +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGE_NAME="accel-ppp-ipoe" -PACKAGE_VERSION="#MODULE_VERSION" -AUTOINSTALL=yes -BUILT_MODULE_NAME="ipoe" -DEST_MODULE_LOCATION="/updates/dkms" diff --git a/drivers/dkms/ipoe/debian/changelog b/drivers/dkms/ipoe/debian/changelog deleted file mode 100644 index 6c003b46..00000000 --- a/drivers/dkms/ipoe/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -accel-ppp-ipoe-dkms (1.13.0) unstable; urgency=low - - * First ipoe dkms package - - -- Sergey V. Lobanov Wed, 29 May 2024 11:30:13 +0200 diff --git a/drivers/dkms/ipoe/debian/compat b/drivers/dkms/ipoe/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/drivers/dkms/ipoe/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/drivers/dkms/ipoe/debian/control b/drivers/dkms/ipoe/debian/control deleted file mode 100644 index def5d0ab..00000000 --- a/drivers/dkms/ipoe/debian/control +++ /dev/null @@ -1,11 +0,0 @@ -Source: accel-ppp-ipoe-dkms -Maintainer: Dmitry Kozlov -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 diff --git a/drivers/dkms/ipoe/debian/rules b/drivers/dkms/ipoe/debian/rules deleted file mode 100755 index 704a41a8..00000000 --- a/drivers/dkms/ipoe/debian/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/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: diff --git a/drivers/dkms/ipoe/src b/drivers/dkms/ipoe/src deleted file mode 120000 index 7df6b81b..00000000 --- a/drivers/dkms/ipoe/src +++ /dev/null @@ -1 +0,0 @@ -../../ipoe \ No newline at end of file diff --git a/drivers/dkms/vlan_mon/README.md b/drivers/dkms/vlan_mon/README.md deleted file mode 100644 index 6b582e2a..00000000 --- a/drivers/dkms/vlan_mon/README.md +++ /dev/null @@ -1,10 +0,0 @@ -## Building Debian DKMS pacakge - -Install deb packages: dkms, debhelper and devscripts. For Debian >= 12 and Ubuntu >=24.04 it is also required to install dh-dkms package. - -Build accel-ppp without drivers, then from this level directory, execute: - -``` -cp ../../../build/version.h src/ -debuild -us -uc -tc -b -``` diff --git a/drivers/dkms/vlan_mon/debian/accel-ppp-vlan-mon-dkms.dkms b/drivers/dkms/vlan_mon/debian/accel-ppp-vlan-mon-dkms.dkms deleted file mode 100644 index c3ce430b..00000000 --- a/drivers/dkms/vlan_mon/debian/accel-ppp-vlan-mon-dkms.dkms +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGE_NAME="accel-ppp-vlan-mon" -PACKAGE_VERSION="#MODULE_VERSION#" -AUTOINSTALL=yes -BUILT_MODULE_NAME="vlan_mon" -DEST_MODULE_LOCATION="/updates/dkms" diff --git a/drivers/dkms/vlan_mon/debian/changelog b/drivers/dkms/vlan_mon/debian/changelog deleted file mode 100644 index ee4f7505..00000000 --- a/drivers/dkms/vlan_mon/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -accel-ppp-vlan-mon-dkms (1.13.0) unstable; urgency=low - - * First vlan_mon dkms package - - -- Sergey V. Lobanov Wed, 29 May 2024 11:30:13 +0200 diff --git a/drivers/dkms/vlan_mon/debian/compat b/drivers/dkms/vlan_mon/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/drivers/dkms/vlan_mon/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/drivers/dkms/vlan_mon/debian/control b/drivers/dkms/vlan_mon/debian/control deleted file mode 100644 index 32795370..00000000 --- a/drivers/dkms/vlan_mon/debian/control +++ /dev/null @@ -1,11 +0,0 @@ -Source: accel-ppp-vlan-mon-dkms -Maintainer: Dmitry Kozlov -Build-Depends: debhelper (>= 10), dkms -Homepage: https://www.accel-ppp.io/ - -Package: accel-ppp-vlan-mon-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-vlan-mon driver diff --git a/drivers/dkms/vlan_mon/debian/rules b/drivers/dkms/vlan_mon/debian/rules deleted file mode 100755 index e02f6770..00000000 --- a/drivers/dkms/vlan_mon/debian/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/dpkg/pkg-info.mk - -%: - dh $@ --with dkms - -override_dh_install: - dh_install src/* usr/src/accel-ppp-vlan-mon-$(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: diff --git a/drivers/dkms/vlan_mon/src b/drivers/dkms/vlan_mon/src deleted file mode 120000 index 727f1d5c..00000000 --- a/drivers/dkms/vlan_mon/src +++ /dev/null @@ -1 +0,0 @@ -../../vlan_mon \ No newline at end of file diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index 252792cc..fa7dec3f 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -2016,4 +2016,3 @@ static void __exit ipoe_fini(void) module_init(ipoe_init); module_exit(ipoe_fini); MODULE_LICENSE("GPL"); -MODULE_VERSION(ACCEL_PPP_VERSION); diff --git a/drivers/vlan_mon/vlan_mon.c b/drivers/vlan_mon/vlan_mon.c index 6e8c5ea5..d5f42c91 100644 --- a/drivers/vlan_mon/vlan_mon.c +++ b/drivers/vlan_mon/vlan_mon.c @@ -822,7 +822,6 @@ static void __exit vlan_mon_fini(void) module_init(vlan_mon_init); module_exit(vlan_mon_fini); MODULE_LICENSE("GPL"); -MODULE_VERSION(ACCEL_PPP_VERSION); module_param(autoclean, int, 0); //MODULE_PARAM_DESC(autoclean, "automaticaly remove created vlan interfaces on restart"); -- cgit v1.2.3