Skip to content

Commit 8e815c3

Browse files
committed
fix arm multiarch apt: add -updates/-security ports suites for libc6 match
1 parent 8a552ea commit 8e815c3

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/package.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,16 @@ jobs:
108108
run: |
109109
sudo dpkg --add-architecture ${{ matrix.arch }}
110110
if [ "${{ matrix.arch }}" != "i386" ]; then
111-
# arm libs live on ports.ubuntu.com; keep the default archive amd64-only
111+
# arm libs live on ports.ubuntu.com; keep the default archive amd64-only.
112+
# include -updates/-security so libc6:<arch> matches the host's amd64 version
112113
codename=$(. /etc/os-release && echo "$VERSION_CODENAME")
114+
ports=http://ports.ubuntu.com/ubuntu-ports
113115
sudo sed -i 's/^Components:/Architectures: amd64\nComponents:/' /etc/apt/sources.list.d/ubuntu.sources
114-
echo "deb [arch=${{ matrix.arch }}] http://ports.ubuntu.com/ubuntu-ports $codename main" \
115-
| sudo tee /etc/apt/sources.list.d/ubuntu-ports.list > /dev/null
116+
{
117+
echo "deb [arch=${{ matrix.arch }}] $ports $codename main universe"
118+
echo "deb [arch=${{ matrix.arch }}] $ports $codename-updates main universe"
119+
echo "deb [arch=${{ matrix.arch }}] $ports $codename-security main universe"
120+
} | sudo tee /etc/apt/sources.list.d/ubuntu-ports.list > /dev/null
116121
fi
117122
sudo apt-get update
118123
sudo apt-get install -y libpcap-dev:${{ matrix.arch }} libasound2-dev:${{ matrix.arch }}

0 commit comments

Comments
 (0)