Skip to content

build: add OCI image build, add dmidecode, update pciutils #6

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

Merged
tycho merged 1 commit into from
Apr 16, 2026
Merged

build: add OCI image build, add dmidecode, update pciutils #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 41 additions & 0 deletions .github/workflows/build-oci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: build-oci-image
on:
workflow_dispatch:
permissions:
contents: read
packages: write
id-token: write
jobs:
build:
runs-on: edera-large
strategy:
fail-fast: false
matrix:
component:
- edera-debug-report-oci
name: build ${{ matrix.component }} container image
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: recursive
- uses: sigstore/cosign-installer@3454372f43399081ed03b604cb2d021dabca52bb # v3.8.2
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
id: push-step
with:
platforms: linux/amd64
target: ${{ matrix.component }}
tags: ghcr.io/edera-dev/${{ matrix.component }}:latest
push: true
- name: Sign the image
env:
DIGEST: ${{ steps.push-step.outputs.digest }}
TAGS: ghcr.io/edera-dev/${{ matrix.component }}:latest
COSIGN_EXPERIMENTAL: "true"
run: cosign sign --yes "${TAGS}@${DIGEST}"
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "extern/pciutils"]
path = extern/pciutils
url = https://github.com/pciutils/pciutils.git
[submodule "extern/dmidecode"]
path = extern/dmidecode
url = https://git.savannah.nongnu.org/git/dmidecode.git
25 changes: 25 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Using Rocky Linux 9 as a proxy for RHEL9, which is the likely oldest
# supported Linux distro in use by enterprises out there.
FROM rockylinux:9 AS builder

RUN cat <<'EOF' >> /etc/dnf/dnf.conf
install_weak_deps=False
fastestmirror=True
max_parallel_downloads=8
EOF

RUN dnf update -y
RUN dnf install --enablerepo=crb -y gcc gcc-c++ make glibc-devel zlib-devel git glibc-static zlib-static

COPY . /workspace
WORKDIR /workspace

RUN /workspace/package.sh

#
# Create OCI image for Edera Protect Installer
#
FROM scratch AS edera-debug-report-oci
COPY --from=builder /workspace/build /var/lib/edera/protect/support

# vim: set ts=4 sts=4 sw=4 et:
1 change: 1 addition & 0 deletions extern/dmidecode
Open in desktop
Submodule dmidecode added at 566922
2 changes: 1 addition & 1 deletion extern/pciutils
Open in desktop
Submodule pciutils updated 33 files
+28 −0 ChangeLog
+11 −13 Makefile
+2 −3 README
+33 −0 README.DJGPP
+20 −11 lib/access.c
+1 −1 lib/caps.c
+1 −0 lib/configure
+32 −22 lib/dump.c
+5 −5 lib/ecam.c
+13 −3 lib/filter.c
+149 −1 lib/header.h
+1 −1 lib/init.c
+1 −0 lib/internal.h
+7 −0 lib/libpci.ver
+1 −1 lib/names-net.c
+13 −4 lib/pci.h
+34 −26 lib/physmem-windows.c
+108 −64 lib/sysfs.c
+1 −1 lib/win32-cfgmgr32.c
+244 −248 lib/win32-helpers.c
+2 −6 lib/win32-helpers.h
+1 −6 lib/win32-kldbg.c
+2 −2 lmr/margin_hw.c
+385 −4 ls-ecaps.c
+90 −11 lspci.c
+18 −6 lspci.man
+1,749 −371 pci.ids
+3 −3 pcilib.man
+6 −1 setpci.c
+4 −3 setpci.man
+356 −0 tests/cap-flit-log
+2 −2 tests/cap-ide
+16 −0 tools/build-man
12 changes: 11 additions & 1 deletion package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,24 @@ cd "$SCRIPTPATH"
rm -rf "${SCRIPTPATH}/build"
mkdir -p "${SCRIPTPATH}/build/bin"

#
# Build statically-linked dmidecode binary
#
pushd extern/dmidecode
git clean -dfx
git reset --hard HEAD
make -j$(nproc) dmidecode CC="gcc" CFLAGS="-Os -static -flto" LDFLAGS="-static -flto"
install -Dm0755 dmidecode "${SCRIPTPATH}/build/bin/dmidecode"
popd

#
# Build statically-linked pciutils 'lspci' binary and pci.ids.gz
#

pushd extern/pciutils
git clean -dfx
git reset --hard HEAD
make -j$(nproc) update-pciids lspci OPT=-Os IDSDIR="./hwdata" LIBKMOD=no DNS=no HWDB=no ZLIB=yes SHARED=no CC="cc -static -flto"
make -j$(nproc) update-pciids lspci OPT=-Os IDSDIR="./hwdata" LIBKMOD=no DNS=no HWDB=no ZLIB=yes SHARED=no RANLIB=gcc-ranlib AR=gcc-ar CC="gcc -static -flto"
mkdir hwdata
./update-pciids
install -Dm0755 update-pciids "${SCRIPTPATH}/build/bin/update-pciids"
Expand Down
Loading