Merge pull request #7933 from AkihiroSuda/drop-libbtrfs

btrfs: depend on kernel UAPI instead of libbtrfs
This commit is contained in:
Phil Estes
2023-02-10 16:13:19 -05:00
committed by GitHub
102 changed files with 2574 additions and 170 deletions

View File

@@ -34,12 +34,6 @@ jobs:
os: [ubuntu-20.04, macos-12, windows-2019]
steps:
- name: Install dependencies
if: matrix.os == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y libbtrfs-dev
- uses: actions/setup-go@v3
with:
go-version: ${{ env.GO_VERSION }}
@@ -166,7 +160,7 @@ jobs:
- run: |
set -e -x
packages="libbtrfs-dev"
packages=""
platform="${{matrix.goos}}/${{matrix.goarch}}"
if [ -n "${{matrix.goarm}}" ]; then
platform+="/v${{matrix.goarm}}"
@@ -215,12 +209,6 @@ jobs:
os: [ubuntu-20.04, macos-12, windows-2019, windows-2022]
go-version: ["1.19.5", "1.18.10"]
steps:
- name: Install dependencies
if: matrix.os == 'ubuntu-20.04'
run: |
sudo apt-get update
sudo apt-get install -y libbtrfs-dev
- uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
@@ -427,7 +415,7 @@ jobs:
RUNC_FLAVOR: ${{ matrix.runc }}
run: |
sudo apt-get update
sudo apt-get install -y gperf libbtrfs-dev
sudo apt-get install -y gperf
script/setup/install-seccomp
script/setup/install-runc
script/setup/install-cni $(grep containernetworking/plugins go.mod | awk '{print $2}')

View File

@@ -44,7 +44,7 @@ jobs:
# languages: go, javascript, csharp, python, cpp, java
- run: |
sudo apt-get install -y libseccomp-dev libbtrfs-dev
sudo apt-get install -y libseccomp-dev
make
- name: Perform CodeQL Analysis

View File

@@ -62,12 +62,7 @@ jobs:
libseccomp-dev:arm64 \
libseccomp-dev:s390x \
libseccomp-dev:ppc64el \
libseccomp-dev:riscv64 \
libbtrfs-dev:amd64 \
libbtrfs-dev:arm64 \
libbtrfs-dev:s390x \
libbtrfs-dev:ppc64el \
libbtrfs-dev:riscv64
libseccomp-dev:riscv64
- name: Build amd64
env:

View File

@@ -28,7 +28,6 @@ RUN apt-get update && \
apt-get install -y dpkg-dev git make pkg-config
ARG TARGETPLATFORM
RUN xx-apt-get install -y libseccomp-dev btrfs-progs gcc
RUN if grep -qE 'UBUNTU_CODENAME=(focal|jammy)' /etc/os-release; then xx-apt-get install -y libbtrfs-dev; fi
ENV PATH=/usr/local/go/bin:$PATH
ENV GOPATH=/go
ENV CGO_ENABLED=1