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

[fix]: base image elfutils version issue #1859

Merged
merged 4 commits into from
Nov 22, 2024
Merged

[fix]: base image elfutils version issue #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8734ce0
[fix]: base image elfutils version issue
SamYuan1990 Nov 22, 2024
c03a5d1
[fix]: missing base image check in CI
SamYuan1990 Nov 22, 2024
d0cc8c0
[fix]: libbpf version upgrade in base image
SamYuan1990 Nov 22, 2024
bbde61e
[fix]: update libbpf version
SamYuan1990 Nov 22, 2024
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: 12 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,23 @@ jobs:
changes_baseimage:
runs-on: ubuntu-latest
outputs:
src: ${{ steps.changes.outputs.src }}
src: ${{ steps.changes_baseimage.outputs.src }}
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
id: changes
id: changes_baseimage
with:
filters: |
src:
- './.github/workflows/image_base.yml'
- './build/Dockerfile.builder'

base_image:
needs: changes_baseimage
if: ${{ needs.changes_baseimage.outputs.src == 'true' }}
uses: ./.github/workflows/image_base.yml
with:
pushImage: false
secrets:
username: ${{ secrets.BOT_NAME }}
password: ${{ secrets.BOT_TOKEN }}
13 changes: 6 additions & 7 deletions build/Dockerfile.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,20 @@ RUN yum-config-manager --enable ubi-9-baseos-source
WORKDIR /elfutils-source
RUN yumdownloader --source elfutils
RUN yum -y install cpio
RUN rpm2cpio elfutils-0.190-2.el9.src.rpm | cpio -iv
RUN tar xjvf elfutils-0.190.tar.bz2
WORKDIR /elfutils-source/elfutils-0.190
RUN rpm2cpio elfutils-0.191-4.el9.src.rpm | cpio -iv
RUN tar xjvf elfutils-0.191.tar.bz2
WORKDIR /elfutils-source/elfutils-0.191
RUN ./configure --disable-debuginfod
RUN make install


WORKDIR /libbpf-source
RUN yumdownloader --source libbpf
RUN rpm2cpio libbpf-1.3.0-2.el9.src.rpm | cpio -iv
RUN rpm2cpio libbpf-1.4.0-1.el9.src.rpm | cpio -iv
RUN tar xf ./linux-*el9.tar.xz
WORKDIR /libbpf-source/linux-5.14.0-424.el9/tools/lib/bpf
WORKDIR /libbpf-source/linux-5.14.0-473.el9/tools/lib/bpf
RUN make install_headers
RUN prefix=/usr BUILD_STATIC_ONLY=y make install
WORKDIR /libbpf-source/linux-5.14.0-424.el9/tools/bpf
WORKDIR /libbpf-source/linux-5.14.0-473.el9/tools/bpf
RUN make bpftool

# rpmautospec requires epel-release
Expand Down
Loading