From 865637de4cf6b1b4483e10a94e4ee2c0582ffa52 Mon Sep 17 00:00:00 2001 From: Andrey Babanin Date: Tue, 24 Mar 2026 18:04:42 +0100 Subject: [PATCH] Update baselibs hash to 5d759cc --- .../score_modules_target_sw.MODULE.bazel | 6 +-- known_good.json | 5 +- .../baselibs/003-acl-fixes-for-aarch64.patch | 49 ------------------- patches/baselibs/BUILD | 0 4 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 patches/baselibs/003-acl-fixes-for-aarch64.patch delete mode 100644 patches/baselibs/BUILD diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index ce6dbf7b831..f3f7ef83d22 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -17,11 +17,7 @@ bazel_dep(name = "score_baselibs") git_override( module_name = "score_baselibs", - commit = "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e", - patch_strip = 1, - patches = [ - "//patches/baselibs:003-acl-fixes-for-aarch64.patch", - ], + commit = "5d759ccd144337284faa095e1012cda49d73e779", remote = "https://github.com/eclipse-score/baselibs.git", ) diff --git a/known_good.json b/known_good.json index 0e8c80815ee..ea86fdc3f70 100644 --- a/known_good.json +++ b/known_good.json @@ -3,10 +3,7 @@ "target_sw": { "score_baselibs": { "repo": "https://github.com/eclipse-score/baselibs.git", - "hash": "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e", - "bazel_patches": [ - "//patches/baselibs:003-acl-fixes-for-aarch64.patch" - ], + "hash": "5d759ccd144337284faa095e1012cda49d73e779", "metadata": { "extra_test_config": [ "//score/json:base_library=nlohmann", diff --git a/patches/baselibs/003-acl-fixes-for-aarch64.patch b/patches/baselibs/003-acl-fixes-for-aarch64.patch deleted file mode 100644 index 14c0c4cac22..00000000000 --- a/patches/baselibs/003-acl-fixes-for-aarch64.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 7b6f319..efa7b1c 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -98,6 +98,13 @@ deb( - visibility = ["//visibility:public"], - ) - -+deb( -+ name = "acl-deb-aarch64", -+ build = "//third_party/acl:acl.BUILD", -+ urls = ["https://launchpadlibrarian.net/581258948/libacl1-dev_2.3.1-1_arm64.deb"], -+ visibility = ["//visibility:public"], -+) -+ - deb( - name = "valgrind-deb", - build = "//third_party/valgrind:valgrind.BUILD", -diff --git a/third_party/acl/BUILD b/third_party/acl/BUILD -index b71d5df..da07995 100644 ---- a/third_party/acl/BUILD -+++ b/third_party/acl/BUILD -@@ -1,5 +1,8 @@ - alias( - name = "acl", -- actual = "@acl-deb//:acl", -+ actual = select({ -+ "@platforms//cpu:aarch64": "@acl-deb-aarch64//:acl", -+ "//conditions:default": "@acl-deb//:acl", -+ }), - visibility = ["//visibility:public"], - ) -diff --git a/third_party/acl/acl.BUILD b/third_party/acl/acl.BUILD -index 718726c..b695a6a 100644 ---- a/third_party/acl/acl.BUILD -+++ b/third_party/acl/acl.BUILD -@@ -1,8 +1,9 @@ - cc_library( - name = "acl", -- srcs = [ -- "usr/lib/libacl.a", -- ], -+ srcs = select({ -+ "@platforms//cpu:aarch64": ["usr/lib/aarch64-linux-gnu/libacl.a"], -+ "//conditions:default": ["usr/lib/libacl.a"], -+ }), - hdrs = [ - "usr/include/acl/libacl.h", - "usr/include/sys/acl.h", diff --git a/patches/baselibs/BUILD b/patches/baselibs/BUILD deleted file mode 100644 index e69de29bb2d..00000000000