Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deb13 support #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

deb13 support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d337fd
deb13 support
svlobanov Jul 17, 2023
6820369
deb13 support
svlobanov Jul 17, 2023
47b73d7
deb13
svlobanov Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/build-and-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ jobs:
matrix:
distro:
[
"debian:10",
"debian:11",
"debian:bookworm",
"ubuntu:20.04",
"ubuntu:22.04",
# "debian:10",
# "debian:11",
"debian:12",
"debian:trixie",
# "ubuntu:20.04",
# "ubuntu:22.04",
]
runs-on: ubuntu-latest
container:
Expand All @@ -99,7 +100,8 @@ jobs:
HEADERS_SUFFIX=`uname -m | sed s/aarch64/arm64/ | sed s/x86_64/amd64/`;
DISTRO=`echo ${{ matrix.distro }} | sed 's/://'`;
case "${{ matrix.distro }}" in
debian:bookworm) DISTRO=debian12; CPACK_TYPE=Debian12 ;;
debian:trixie) DISTRO=debian13; CPACK_TYPE=Debian13 ;;
debian:12) DISTRO=debian12; CPACK_TYPE=Debian12 ;;
debian:11) CPACK_TYPE=Debian11 ;;
debian:10) CPACK_TYPE=Debian10 ;;
ubuntu:22.04) CPACK_TYPE=Ubuntu22 ; HEADERS_SUFFIX=generic ;;
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,25 @@ jobs:
untar: false
format: qcow2

- distro: Debian12
image: https://cloud.debian.org/images/cloud/bookworm/daily/latest/debian-12-generic-amd64-daily.tar.xz
- distro: Debian13
image: https://cloud.debian.org/images/cloud/sid/daily/latest/debian-sid-generic-amd64-daily.tar.xz
untar: true
format: raw

- distro: Debian11
image: https://cdimage.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.tar.xz
untar: true
format: raw

- distro: Debian10
image: https://cloud.debian.org/images/cloud/buster/latest/debian-10-generic-amd64.tar.xz
- distro: Debian12
image: https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.tar.xz
untar: true
format: raw
#
# - distro: Debian11
# image: https://cdimage.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.tar.xz
# untar: true
# format: raw
#
# - distro: Debian10
# image: https://cloud.debian.org/images/cloud/buster/latest/debian-10-generic-amd64.tar.xz
# untar: true
# format: raw

steps:
- name: Check out repository code
Expand Down
5 changes: 5 additions & 0 deletions cmake/cpack.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ IF(CPACK_TYPE STREQUAL Debian12)
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian12)

IF(CPACK_TYPE STREQUAL Debian13)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.37), libssl3 (>= 3.0.9), libpcre3 (>= 8.39)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian13)

IF(CPACK_TYPE STREQUAL Ubuntu16)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.39)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
Expand Down
5 changes: 5 additions & 0 deletions drivers/ipoe/ipoe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,14 @@ static struct genl_multicast_group ipoe_nl_mcg;
#endif

#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) || RHEL_MAJOR == 7
#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,3,0)
#define u64_stats_fetch_begin_bh u64_stats_fetch_begin
#define u64_stats_fetch_retry_bh u64_stats_fetch_retry
#else
#define u64_stats_fetch_begin_bh u64_stats_fetch_begin_irq
#define u64_stats_fetch_retry_bh u64_stats_fetch_retry_irq
#endif
#endif

#ifndef NETIF_F_HW_VLAN_FILTER
#define NETIF_F_HW_VLAN_FILTER NETIF_F_HW_VLAN_CTAG_FILTER
Expand Down