Skip to content

Commit

Permalink
Merge branch 'master' into chimeralinux
Browse files Browse the repository at this point in the history
  • Loading branch information
takano32 committed Aug 29, 2023
2 parents c69a795 + 540a194 commit db04f43
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ jobs:
almalinux, amazonlinux,
centos, centos8, fedora, mageia,
opensuse, oraclelinux, rockylinux,
archlinux, chimeralinux, gentoo, manjarolinux] # void-linux
# redhat, cbl-mariner
archlinux, cbl-mariner, chimeralinux, gentoo, manjarolinux] # void-linux
uses: ./.github/workflows/build.yml
with:
linux: ${{ matrix.linux }}
Expand Down
5 changes: 3 additions & 2 deletions cbl-mariner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ RUN git clone --depth 1 ${ORIGIN} /build-kernel/linux
RUN while :; do cd /build-kernel/linux && git fetch --unshallow && break || sleep 5; done
RUN cd /build-kernel/linux && git pull --all

RUN yum install -y make gcc bc bison flex openssl-devel
RUN yum install -y diffutils cpio zstd rpm-build rsync
RUN yum install -y make gcc bc bison flex awk openssl-devel
RUN yum install -y binutils diffutils cpio zstd rpm-build rsync
RUN yum install -y llvm clang lld
RUN yum install -y glibc-headers kernel-headers

RUN yum clean all

Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eux

CI=${CI:-false}
LINUX_VERSION=v6.4
LINUX_VERSION=v6.5

MAKE=gmake
if which gmake > /dev/null; then
Expand Down
2 changes: 1 addition & 1 deletion linux-mint/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM takano32/linux-mint:21.1
FROM takano32/linux-mint:21.2
LABEL maintainer "TAKANO Mitsuhiro <[email protected]>"

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion void-linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ghcr.io/void-linux/void-linux:latest-thin-bb-x86_64
LABEL maintainer "TAKANO Mitsuhiro <[email protected]>"

RUN xbps-install -Suvy xbps
RUN xbps-install -Suvy bash

RUN xbps-install -Suvy git

ENV ORIGIN=https://github.com/torvalds/linux.git
Expand Down

0 comments on commit db04f43

Please sign in to comment.