Added compatibility with backported kernels.

Fix GLIBC_2.38 requirement for CI
GCC 12 is allready installed.
This commit is contained in:
Carlos Garcés
2023-10-22 14:40:19 +00:00
parent fb0d92a308
commit e7954c912f
2 changed files with 28 additions and 28 deletions

View File

@@ -8,11 +8,11 @@ jobs:
outputs: outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }} matrix: ${{ steps.set-matrix.outputs.matrix }}
steps: steps:
- id: set-matrix - id: set-matrix
run: | run: |
JSON=$(curl https://www.kernel.org/releases.json) JSON=$(curl https://www.kernel.org/releases.json)
VERSIONSARRAY=$(echo $JSON | jq -c '[.releases[] | {version: .version, moniker: .moniker} | select(.moniker != "linux-next") | .version]') VERSIONSARRAY=$(echo $JSON | jq -c '[.releases[] | {version: .version, moniker: .moniker} | select(.moniker != "linux-next") | .version]')
echo ::set-output name=matrix::${VERSIONSARRAY} echo ::set-output name=matrix::${VERSIONSARRAY}
build: build:
needs: fetchKernelData needs: fetchKernelData
@@ -23,24 +23,23 @@ jobs:
version: ${{fromJson(needs.fetchKernelData.outputs.matrix)}} version: ${{fromJson(needs.fetchKernelData.outputs.matrix)}}
#version: [4.9.248, 4.4.248] #version: [4.9.248, 4.4.248]
steps: steps:
- name: download-Kernel - name: download-Kernel
env: env:
VERSION: ${{matrix.version }} VERSION: ${{matrix.version }}
run: | run: |
KERNEL_URL=https://kernel.ubuntu.com/~kernel-ppa/mainline/ KERNEL_URL=https://kernel.ubuntu.com/~kernel-ppa/mainline/
KERNEL_URL_DETAILS=$(wget --quiet -O - ${KERNEL_URL}v${VERSION}/ | grep -A8 "Build for amd64\|Test amd64") KERNEL_URL_DETAILS=$(wget --quiet -O - ${KERNEL_URL}v${VERSION}/ | grep -A8 "Build for amd64\|Test amd64")
ALL_DEB=$(echo "$KERNEL_URL_DETAILS" | grep -m1 'all.deb' | cut -d '"' -f 2) ALL_DEB=$(echo "$KERNEL_URL_DETAILS" | grep -m1 'all.deb' | cut -d '"' -f 2)
AMD64_DEB=$(echo "$KERNEL_URL_DETAILS" | grep -m1 "amd64.deb" | cut -d '"' -f 2) AMD64_DEB=$(echo "$KERNEL_URL_DETAILS" | grep -m1 "amd64.deb" | cut -d '"' -f 2)
[ -z "$ALL_DEB" ] && exit 1 [ -z "$ALL_DEB" ] && exit 1
[ -z "$AMD64_DEB" ] && exit 2 [ -z "$AMD64_DEB" ] && exit 2
wget -nv ${KERNEL_URL}v${VERSION}/$AMD64_DEB wget -nv ${KERNEL_URL}v${VERSION}/$AMD64_DEB
wget -nv ${KERNEL_URL}v${VERSION}/$ALL_DEB wget -nv ${KERNEL_URL}v${VERSION}/$ALL_DEB
sudo dpkg --force-all -i *.deb wget -nv http://mirrors.kernel.org/ubuntu/pool/main/g/glibc/libc6_2.38-1ubuntu6_amd64.deb
echo "KVER=$(echo $ALL_DEB | cut -d '_' -f 2 | rev | cut -c14- | rev)-generic" >> $GITHUB_ENV sudo dpkg --force-all -i *.deb
- name: Set up GCC sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
uses: egor-tensin/setup-gcc@v1 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12
with: echo "KVER=$(echo $ALL_DEB | cut -d '_' -f 2 | rev | cut -c14- | rev)-generic" >> $GITHUB_ENV
version: 12 - uses: actions/checkout@v2
- uses: actions/checkout@v2 - name: build
- name: build run: make KVER=$KVER CONFIG_PLATFORM_I386_PC=y CC=cc
run: make KVER=$KVER CONFIG_PLATFORM_I386_PC=y CC=cc

View File

@@ -226,10 +226,11 @@ typedef void *timer_hdl_context;
3f6cffb8604b537e3d7ea040d7f4368689638eaf 3f6cffb8604b537e3d7ea040d7f4368689638eaf
adeef3e32146a8d2a73c399dc6f5d76a449131b1 adeef3e32146a8d2a73c399dc6f5d76a449131b1
*/ */
static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) static inline void rtw_eth_hw_addr_set(struct net_device *dev, const u8 *addr)
{ {
memcpy(dev->dev_addr, addr, ETH_ALEN); memcpy(dev->dev_addr, addr, ETH_ALEN);
} }
#define eth_hw_addr_set rtw_eth_hw_addr_set
#endif #endif
typedef unsigned long systime; typedef unsigned long systime;