Skip to content

Commit

Permalink
Merge branch 'master' into linux-v6.8
Browse files Browse the repository at this point in the history
  • Loading branch information
takano32 committed Mar 10, 2024
2 parents 3c40235 + 1a160f6 commit a07c446
Show file tree
Hide file tree
Showing 13 changed files with 77 additions and 76 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ jobs:
strategy:
fail-fast: false
matrix:
linux: [linux-mint, ubuntu, # debian, kalilinux
linux: [debian, kalilinux, linux-mint, ubuntu,
almalinux, amazonlinux,
centos, centos8, fedora, # mageia
opensuse, rockylinux, # oraclelinux
centos, centos8, fedora, mageia,
opensuse, oraclelinux, rockylinux,
archlinux, cbl-mariner, chimeralinux,
gentoo, parrot, solus]
# manjarolinux, void-linux
gentoo, parrot, solus, void-linux]
# manjarolinux
# redhat
uses: ./.github/workflows/build.yml
with:
Expand Down
1 change: 0 additions & 1 deletion almalinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN cd /build-kernel/linux && git pull --all
RUN yum groupinstall -y "Development tools"
RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down
1 change: 0 additions & 1 deletion amazonlinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN cd /build-kernel/linux && git pull --all

RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down
4 changes: 3 additions & 1 deletion archlinux/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ while :; do $SUDO makepkg -o --skippgpcheck && break || sleep 5; done
# `makepkg` in `$BUILD_DIR/linux`
JOBS=$(getconf _NPROCESSORS_ONLN)
JOBS=$(expr "$JOBS" + "$JOBS")
$SUDO MAKEFLAGS="-j$JOBS" makepkg --skippgpcheck
JOBS=$(expr "$JOBS" + "$JOBS")
echo "MAKEFLAGS=\"-j$JOBS\"" | tee -a /etc/makepkg.conf
$SUDO makepkg --skippgpcheck

cd $BUILD_DIR
# mv linux/src/archlinux-linux/Documentation/output ../htmldocs
Expand Down
1 change: 0 additions & 1 deletion centos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN cd /build-kernel/linux && git pull --all

RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down
1 change: 0 additions & 1 deletion centos8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ RUN cd /build-kernel/linux && git pull --all

RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down
120 changes: 60 additions & 60 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,135 +1,135 @@
version: '3.9'
services:
ubuntu:
build:
context: .
dockerfile: ./ubuntu/Dockerfile
ports:
- 8001:8000
almalinux:
build:
context: .
dockerfile: ./almalinux/Dockerfile
ports:
- 8002:8000
archlinux:
build:
context: .
dockerfile: ./archlinux/Dockerfile
ports:
- 8003:8000
chimeralinux:
build:
context: .
dockerfile: ./chimeralinux/Dockerfile
ports:
- 8004:8000
gentoo:
build:
context: .
dockerfile: ./gentoo/Dockerfile
ports:
- 8005:8000
amazonlinux:
build:
context: .
dockerfile: ./amazonlinux/Dockerfile
ports:
- 8006:8000
opensuse:
archlinux:
build:
context: .
dockerfile: ./opensuse/Dockerfile
dockerfile: ./archlinux/Dockerfile
ports:
- 8007:8000
rockylinux:
- 8003:8000
cbl-mariner:
build:
context: .
dockerfile: ./rockylinux/Dockerfile
dockerfile: ./cbl-mariner/Dockerfile
ports:
- 8008:8000
- 8019:8000
centos:
build:
context: .
dockerfile: ./centos/Dockerfile
ports:
- 8009:8000
mageia:
centos8:
build:
context: .
dockerfile: ./mageia/Dockerfile
dockerfile: ./centos/Dockerfile
ports:
- 8010:8000
- 8018:8000
chimeralinux:
build:
context: .
dockerfile: ./chimeralinux/Dockerfile
ports:
- 8004:8000
debian:
build:
context: .
dockerfile: ./debian/Dockerfile
ports:
- 8011:8000
redhat:
fedora:
build:
context: .
dockerfile: ./redhat/Dockerfile
dockerfile: ./fedora/Dockerfile
ports:
- 8012:8000
void-linux:
- 8016:8000
gentoo:
build:
context: .
dockerfile: ./void-linux/Dockerfile
dockerfile: ./gentoo/Dockerfile
ports:
- 8013:8000
- 8005:8000
kalilinux:
build:
context: .
dockerfile: ./kalilinux/Dockerfile
ports:
- 8017:8000
linux-mint:
build:
context: .
dockerfile: ./linux-mint/Dockerfile
ports:
- 8014:8000
mageia:
build:
context: .
dockerfile: ./mageia/Dockerfile
ports:
- 8010:8000
opensuse:
build:
context: .
dockerfile: ./opensuse/Dockerfile
ports:
- 8007:8000
oraclelinux:
build:
context: .
dockerfile: ./oraclelinux/Dockerfile
ports:
- 8015:8000
fedora:
parrot:
build:
context: .
dockerfile: ./fedora/Dockerfile
dockerfile: ./parrot/Dockerfile
ports:
- 8016:8000
kalilinux:
- 8021:8000
rockylinux:
build:
context: .
dockerfile: ./kalilinux/Dockerfile
dockerfile: ./rockylinux/Dockerfile
ports:
- 8017:8000
centos8:
- 8008:8000
solus:
build:
context: .
dockerfile: ./centos/Dockerfile
dockerfile: ./solus/Dockerfile
ports:
- 8018:8000
cbl-mariner:
- 8022:8000
ubuntu:
build:
context: .
dockerfile: ./cbl-mariner/Dockerfile
dockerfile: ./ubuntu/Dockerfile
ports:
- 8019:8000
manjarolinux:
- 8001:8000
void-linux:
build:
context: .
dockerfile: ./manjarolinux/Dockerfile
dockerfile: ./void-linux/Dockerfile
ports:
- 8020:8000
parrot:
- 8013:8000
redhat:
build:
context: .
dockerfile: ./parrot/Dockerfile
dockerfile: ./redhat/Dockerfile
ports:
- 8021:8000
solus:
- 8012:8000
manjarolinux:
build:
context: .
dockerfile: ./solus/Dockerfile
dockerfile: ./manjarolinux/Dockerfile
ports:
- 8022:8000
- 8020:8000

5 changes: 4 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ OS_ID=`echo echo $OS_ID | /bin/sh`
MAKE_BINDEB_PKG=("debian" "kali")
MAKE_BINRPM_PKG=("debian" "gentoo"
"almalinux" "amzn" "centos" "fedora" "linuxmint"
"mageia" "opensuse-tumbleweed" "ol" "rocky" "voidlinux")
"opensuse-tumbleweed" "rocky")
# mageia, ol voidlinux
MAKE_HTMLDOCS=("ol")

# USE_LLVM=("chimera" "debian" "kali" "voidlinux")
Expand Down Expand Up @@ -86,6 +87,7 @@ unset IFS
LOCALVERSION=-$(date +%Y%m%d)
JOBS=$(getconf _NPROCESSORS_ONLN)
JOBS=$(expr "$JOBS" + "$JOBS")
JOBS=$(expr "$JOBS" + "$JOBS")
time $MAKE $MAKE_OPTS -j $JOBS O=/build-kernel/build/ LOCALVERSION=$LOCALVERSION
time $MAKE $MAKE_OPTS -j $JOBS modules O=/build-kernel/build/ LOCALVERSION=$LOCALVERSION
IFS="|"
Expand All @@ -94,6 +96,7 @@ if [[ "(${MAKE_BINDEB_PKG[*]})" =~ ${OS_ID} ]]; then
time $MAKE $MAKE_OPTS -j $JOBS bindeb-pkg O=/build-kernel/build/ LOCALVERSION=$LOCALVERSION
fi
if [[ "(${MAKE_BINRPM_PKG[*]})" =~ ${OS_ID} ]]; then
[ -x "$(which yum)" ] && yum install -y dwarves perl
mkdir -p /build-kernel/rpm-pkg
time $MAKE $MAKE_OPTS -j $JOBS binrpm-pkg O=/build-kernel/build/ LOCALVERSION=$LOCALVERSION
fi
Expand Down
2 changes: 1 addition & 1 deletion fedora/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN cd /build-kernel/linux && git pull --all
RUN yum groupinstall -y "Development tools"
RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl
RUN yum install -y which

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down
1 change: 0 additions & 1 deletion mageia/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ RUN yum install -y python3-dnf
RUN yum install -y ncurses-devel make gcc bc bison flex openssl-devel
RUN yum install -y lib64elfutils-devel elfutils
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl
RUN yum install -y llvm clang lld

# make htmldocs
Expand Down
4 changes: 3 additions & 1 deletion manjarolinux/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ while :; do $SUDO makepkg -o --skippgpcheck && break || sleep 5; done
# `makepkg` in `$BUILD_DIR/linux`
JOBS=$(getconf _NPROCESSORS_ONLN)
JOBS=$(expr "$JOBS" + "$JOBS")
$SUDO MAKEFLAGS="-j$JOBS" makepkg --skippgpcheck
JOBS=$(expr "$JOBS" + "$JOBS")
echo "MAKEFLAGS=\"-j$JOBS\"" | tee -a /etc/makepkg.conf
$SUDO makepkg --skippgpcheck

cd $BUILD_DIR
# mv linux/src/archlinux-linux/Documentation/output ../htmldocs
Expand Down
1 change: 0 additions & 1 deletion oraclelinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN cd /build-kernel/linux && git pull --all
RUN yum groupinstall -y "Development tools"
RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down
2 changes: 1 addition & 1 deletion rockylinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN cd /build-kernel/linux && git pull --all
RUN yum groupinstall -y "Development tools"
RUN yum install -y ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel
RUN yum install -y make diffutils cpio zstd rpm-build rsync
RUN yum install -y dwarves perl
RUN yum install -y which

# make htmldocs
RUN yum install -y python3-pip graphviz texlive-latex librsvg2-tools
Expand Down

0 comments on commit a07c446

Please sign in to comment.