From f21c534ded86cc71493bdb0a076cc2d3a90560a9 Mon Sep 17 00:00:00 2001 From: Florian Hofhammer Date: Fri, 14 Oct 2022 16:12:01 +0200 Subject: [PATCH 1/2] musl: add missing submodule auto-initialization Signed-off-by: Florian Hofhammer --- Makefile.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7a6f4097421..455a378a2b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -252,6 +252,12 @@ else GLIBC_SRC_GIT := endif +ifeq ($(findstring $(srcdir),$(MUSL_SRCDIR)),$(srcdir)) +MUSL_SRC_GIT := $(MUSL_SRCDIR)/.git +else +MUSL_SRC_GIT := +endif + ifeq ($(findstring $(srcdir),$(QEMU_SRCDIR)),$(srcdir)) QEMU_SRC_GIT := $(QEMU_SRCDIR)/.git else @@ -742,7 +748,7 @@ stamps/build-gcc-musl-stage1: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-binutils $(MAKE) -C $(notdir $@) inhibit-libc=true install-target-libgcc mkdir -p $(dir $@) && touch $@ -stamps/build-musl-linux-headers: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 +stamps/build-musl-linux-headers: $(MUSL_SRCDIR) $(MUSL_SRC_GIT) stamps/build-gcc-musl-stage1 rm -rf $@ $(notdir $@) mkdir $(notdir $@) cd $(notdir $@) && CC="$(MUSL_CC_FOR_TARGET)" $ Date: Fri, 14 Oct 2022 16:39:52 +0200 Subject: [PATCH 2/2] github: move build job to Ubuntu 20.04/22.04 Ubuntu 18.04 is deprecated and will be fully removed from GitHub Actions soon (https://github.com/actions/runner-images/issues/6002) Signed-off-by: Florian Hofhammer --- .github/workflows/build.yaml | 2 +- .github/workflows/nightly-release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6481c87f313..11399133d90 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-22.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] exclude: diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index b8449e465c1..011b453b273 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-22.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] exclude: