From ee46cf104b4a187edd60de39329bf39da731f269 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Mon, 14 Mar 2022 19:42:06 +0100 Subject: [PATCH 1/3] build_library/check_root: use the new location for kernel modules The standard location is /usr/lib/modules but on Flatcar "lib" was a symlink to "lib64". Now this is going to be split up in separate directories but with compatibility symlinks. Add the new location to the ignore list. --- build_library/check_root | 1 + 1 file changed, 1 insertion(+) diff --git a/build_library/check_root b/build_library/check_root index ec1531d4d9..50636f1905 100755 --- a/build_library/check_root +++ b/build_library/check_root @@ -106,6 +106,7 @@ USR_LINKS = ("/bin/", "/sbin/", "/lib/", "/lib32/", "/lib64/") IGNORE_SHEBANG = ( "*/python[0-9].[0-9]/cgi.py", "*/usr/lib64/modules/*/source/scripts/*", + "*/usr/lib/modules/*/source/scripts/*", "*/usr/share/nova-agent/*/etc/gentoo/nova-agent", "*/tmp/*", "*/Documentation/*", From e2759a3e6796b8286b89e04c432dcbc5e20920e4 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 15 Mar 2022 11:03:25 +0100 Subject: [PATCH 2/3] build_library/set_lsb_release: create compatibility symlink The os-release file was not only accessible through /usr/lib/ but also through /usr/lib64 because "lib" was just a symlink. Now that we split them up into two directories, add a compatibility symlink in case /usr/lib64 was used to access os-release. A check is added to also work without the split which is useful if the split is not done for the SDK at the same time. --- build_library/set_lsb_release | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release index 17a85184d4..9b71a95907 100755 --- a/build_library/set_lsb_release +++ b/build_library/set_lsb_release @@ -62,6 +62,10 @@ CPE_NAME="cpe:2.3:o:${OS_ID}-linux:${OS_ID}_linux:${FLATCAR_VERSION}:*:*:*:*:*:* EOF sudo ln -sf "../usr/lib/os-release" "${ROOT_FS_DIR}/etc/os-release" sudo ln -sf "../../lib/os-release" "${ROOT_FS_DIR}/usr/share/flatcar/os-release" +# Compat for split of lib64 into lib and lib64 +if [ ! -e "${ROOT_FS_DIR}/usr/lib64/os-release" ]; then + sudo ln -sf "../lib/os-release" "${ROOT_FS_DIR}/usr/lib64/os-release" +fi # Create the defaults for the coreos configuration files in the usr directory sudo_clobber "${ROOT_FS_DIR}/usr/share/flatcar/release" < Date: Tue, 15 Mar 2022 14:12:17 +0100 Subject: [PATCH 3/3] jenkins/images.sh: use correct board for comparison The output always was about amd64 because the board was not set. Pass the board along. --- jenkins/images.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jenkins/images.sh b/jenkins/images.sh index c651fb1b4c..d972b5dbba 100755 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -133,6 +133,8 @@ set +x set +e echo "===================================================================" echo +export BOARD_A="${BOARD}" +export BOARD_B="${BOARD}" if [ "${GROUP}" != "developer" ]; then export CHANNEL_A="${GROUP}" else