From 195ad299cd30094308a5cff3f99b03b6c9b0e031 Mon Sep 17 00:00:00 2001 From: Guofang Date: Tue, 15 Sep 2026 12:09:19 +0800 Subject: [PATCH] Rename rockylinux9 build directory to rocky9 Co-Authored-By: Claude Sonnet 5 --- INCLUDED_LIBRARIES.md | 2 +- README.md | 6 +++--- alpine3.24/Dockerfile | 2 +- build-all.sh | 2 +- {rockylinux9 => rocky9}/Dockerfile | 0 {rockylinux9 => rocky9}/build.sh | 2 +- {rockylinux9 => rocky9}/cachelib-optional-interface.patch | 0 .../rapidjson-generic-string-ref-assignment.patch | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename {rockylinux9 => rocky9}/Dockerfile (100%) rename {rockylinux9 => rocky9}/build.sh (89%) rename {rockylinux9 => rocky9}/cachelib-optional-interface.patch (100%) rename {rockylinux9 => rocky9}/rapidjson-generic-string-ref-assignment.patch (100%) diff --git a/INCLUDED_LIBRARIES.md b/INCLUDED_LIBRARIES.md index 1117808..23faf06 100644 --- a/INCLUDED_LIBRARIES.md +++ b/INCLUDED_LIBRARIES.md @@ -48,4 +48,4 @@ The image includes position-independent static builds of these libraries. Protobuf and libxml2 enable zlib support, and LibDwarf enables compressed debug section support using zlib and Zstd. ZeroMQ enables CURVE security using static libsodium. CZMQ enables UUID support using static util-linux libuuid while disabling undeclared optional integrations. librdkafka includes SSL, zlib, Zstd, and bundled LZ4 support while disabling undeclared optional integrations. spdlog uses external fmt, glog uses gflags, and all Meta libraries share the same release tag. -**Alpine-only exception:** the `alpine3.24` image does not build Folly, Fizz, Wangle, mvfst, fbthrift, or CacheLib. These aren't on Meta's supported-OS list, and Folly's portability layer reaches for glibc-only macros/symbols with no musl branch (e.g. `off64_t`/`lseek64`/`pread64` in `folly/portability/Unistd.h`, `__ELF_NATIVE_CLASS` in `folly/debugging/symbolizer/Elf.cpp`), so patching each one as it surfaces risks introducing subtle bugs in code this project doesn't own. `debian13` and `rockylinux9` are glibc-based and build the full list above, Meta libraries included. +**Alpine-only exception:** the `alpine3.24` image does not build Folly, Fizz, Wangle, mvfst, fbthrift, or CacheLib. These aren't on Meta's supported-OS list, and Folly's portability layer reaches for glibc-only macros/symbols with no musl branch (e.g. `off64_t`/`lseek64`/`pread64` in `folly/portability/Unistd.h`, `__ELF_NATIVE_CLASS` in `folly/debugging/symbolizer/Elf.cpp`), so patching each one as it surfaces risks introducing subtle bugs in code this project doesn't own. `debian13` and `rocky9` are glibc-based and build the full list above, Meta libraries included. diff --git a/README.md b/README.md index 0f91eda..650c52e 100644 --- a/README.md +++ b/README.md @@ -9,20 +9,20 @@ Each build script automatically selects Docker or Podman: ```sh ./build-all.sh ./debian13/build.sh -./rockylinux9/build.sh +./rocky9/build.sh ./alpine3.24/build.sh ``` Use environment variables to select the container engine or override image names: ```sh -CONTAINER_ENGINE=podman IMAGE_NAME=my-build-env ./rockylinux9/build.sh +CONTAINER_ENGINE=podman IMAGE_NAME=my-build-env ./rocky9/build.sh ``` ## Run ```sh docker run --rm -it debian13-source-stack -docker run --rm -it rockylinux9-source-stack +docker run --rm -it rocky9-source-stack docker run --rm -it alpine3.24-source-stack ``` diff --git a/alpine3.24/Dockerfile b/alpine3.24/Dockerfile index 61652c2..b1a73c6 100644 --- a/alpine3.24/Dockerfile +++ b/alpine3.24/Dockerfile @@ -335,7 +335,7 @@ RUN curl --fail --location --output numactl.tar.gz \ # folly/debugging/symbolizer/Elf.cpp). Patching around each one as it # surfaces is more likely to introduce subtle bugs than to reach a solid # build, so this stack is not built here. See INCLUDED_LIBRARIES.md for -# details; debian13 and rockylinux9 are unaffected and still build it. +# details; debian13 and rocky9 are unaffected and still build it. RUN curl --fail --location --output util-linux.tar.xz \ https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.42/util-linux-2.42.2.tar.xz \ diff --git a/build-all.sh b/build-all.sh index 082b143..842cf7f 100755 --- a/build-all.sh +++ b/build-all.sh @@ -5,5 +5,5 @@ set -eu SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) "$SCRIPT_DIR/debian13/build.sh" -"$SCRIPT_DIR/rockylinux9/build.sh" +"$SCRIPT_DIR/rocky9/build.sh" "$SCRIPT_DIR/alpine3.24/build.sh" diff --git a/rockylinux9/Dockerfile b/rocky9/Dockerfile similarity index 100% rename from rockylinux9/Dockerfile rename to rocky9/Dockerfile diff --git a/rockylinux9/build.sh b/rocky9/build.sh similarity index 89% rename from rockylinux9/build.sh rename to rocky9/build.sh index 6270e02..38e4b49 100755 --- a/rockylinux9/build.sh +++ b/rocky9/build.sh @@ -2,7 +2,7 @@ set -eu -IMAGE_NAME="${IMAGE_NAME:-rockylinux9-source-stack}" +IMAGE_NAME="${IMAGE_NAME:-rocky9-source-stack}" SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) if [ -n "${CONTAINER_ENGINE:-}" ]; then diff --git a/rockylinux9/cachelib-optional-interface.patch b/rocky9/cachelib-optional-interface.patch similarity index 100% rename from rockylinux9/cachelib-optional-interface.patch rename to rocky9/cachelib-optional-interface.patch diff --git a/rockylinux9/rapidjson-generic-string-ref-assignment.patch b/rocky9/rapidjson-generic-string-ref-assignment.patch similarity index 100% rename from rockylinux9/rapidjson-generic-string-ref-assignment.patch rename to rocky9/rapidjson-generic-string-ref-assignment.patch