From c250f1baefeb3b31756c08162672a68485db6510 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 6 Nov 2026 13:23:07 +0900 Subject: [PATCH 1/2] src/aports: switch to the upstream GitLab (v3.24.4) Switch from the mirror https://github.com/alpinelinux/aports.git to the upstream https://git.alpinelinux.org/aports.git as the GitHub mirror is out of sync. Signed-off-by: Akihiro Suda --- .gitmodules | 2 +- README.md | 2 +- src/aports | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9bb64a1..504ea06 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/aports"] path = src/aports - url = https://github.com/alpinelinux/aports.git + url = https://git.alpinelinux.org/aports.git diff --git a/README.md b/README.md index 8de0ecb..8212271 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Only `x86_64` and `aarch64` have been tested but other architectures can also be ## Building and testing -Note that this repo includes the [Alpine aports](https://github.com/alpinelinux/aports.git) repository as a submodule. If you didn't specify the `--recursive` option when cloning this repo, then you need to initialize the submodule by running: +Note that this repo includes the [Alpine aports](https://gitlab.alpinelinux.org/alpine/aports) repository as a submodule. If you didn't specify the `--recursive` option when cloning this repo, then you need to initialize the submodule by running: ``` git submodule update --init diff --git a/src/aports b/src/aports index ee92350..105b835 160000 --- a/src/aports +++ b/src/aports @@ -1 +1 @@ -Subproject commit ee92350c8a4509152dc91c693814215a884c07c3 +Subproject commit 105b835acd9971b9770fb61f5a1ddcc133c180dc From 1aa0173fee43024e3fcf845c78efe82a25d0533c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 6 Nov 2026 01:57:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20Alpine=20version=203.24.3=20?= =?UTF-8?q?=E2=86=92=203.24.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Akihiro Suda --- .github/workflows/release.yml | 2 +- Makefile | 2 +- README.md | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7c780e..2a7b6b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: pull_request: env: - ALPINE_VERSION: 3.24.3 + ALPINE_VERSION: 3.24.4 DOCKER_BUILDKIT: 1 permissions: diff --git a/Makefile b/Makefile index a413486..aa0377d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -ALPINE_VERSION ?= 3.24.3 +ALPINE_VERSION ?= 3.24.4 REPO_VERSION ?= $(shell echo "$(ALPINE_VERSION)" | sed -E 's/^([0-9]+\.[0-9]+).*/v\1/') GIT_TAG ?= $(shell echo "v$(ALPINE_VERSION)" | sed 's/^vedge$$/origin\/master/') BUILD_ID ?= $(shell git describe --tags) diff --git a/README.md b/README.md index 8212271..4077c33 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Note that this repo includes the [Alpine aports](https://gitlab.alpinelinux.org/ git submodule update --init ``` -The examples show the default values for `ALPINE_VERSION=3.24.3 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`. +The examples show the default values for `ALPINE_VERSION=3.24.4 EDITION=std`, `ARCH` defaults to the OS architecture `uname -m`. The options need to be specified only to select non-default setting. ### Build the builder @@ -55,7 +55,7 @@ The options need to be specified only to select non-default setting. The ISO builder will be created inside a docker image. You can specify the Alpine version used to create it: ``` -make mkimage ALPINE_VERSION=3.24.3 +make mkimage ALPINE_VERSION=3.24.4 ``` ### Build the ISO @@ -63,17 +63,17 @@ make mkimage ALPINE_VERSION=3.24.3 This docker image can then be used to create ISO images that will be stored under `./iso`: ``` -make iso ALPINE_VERSION=3.24.3 EDITION=std +make iso ALPINE_VERSION=3.24.4 EDITION=std ``` ### Run the ISO with qemu ``` -make run ALPINE_VERSION=3.24.3 EDITION=std +make run ALPINE_VERSION=3.24.4 EDITION=std ``` ### Run the ISO with Lima ``` -make lima ALPINE_VERSION=3.24.3 EDITION=std +make lima ALPINE_VERSION=3.24.4 EDITION=std ```