From 1d09e252e381e851351efce4dae544490c0e9262 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 12 May 2025 11:58:16 +0200 Subject: [PATCH 1/2] coreos-base/misc-files: add back BCC tools This file was not sourced because it does not have '.bash' or '.sh' suffix. Signed-off-by: Mathieu Tortuyaux --- .../files/bash/{99-flatcar-bcc => 99-flatcar-bcc.bash} | 0 .../{misc-files-0-r7.ebuild => misc-files-0-r8.ebuild} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/{99-flatcar-bcc => 99-flatcar-bcc.bash} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/{misc-files-0-r7.ebuild => misc-files-0-r8.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/99-flatcar-bcc b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/99-flatcar-bcc.bash similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/99-flatcar-bcc rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/files/bash/99-flatcar-bcc.bash diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r8.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r8.ebuild index 3917896acf..15a0374c97 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r7.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/misc-files/misc-files-0-r8.ebuild @@ -131,7 +131,7 @@ src_install() { done insinto '/etc/bash/bashrc.d' - doins "${FILESDIR}/bash/99-flatcar-bcc" + doins "${FILESDIR}/bash/99-flatcar-bcc.bash" insinto '/usr/share/flatcar' # The "oems" folder should contain a file "$OEMID" for each expected OEM sysext and From 89a01dd504a4cb91132e5028011951400ce29d72 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 12 May 2025 12:00:51 +0200 Subject: [PATCH 2/2] changelog: add entry Signed-off-by: Mathieu Tortuyaux --- changelog/bugfixes/2025-05-12-bcc.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/bugfixes/2025-05-12-bcc.md diff --git a/changelog/bugfixes/2025-05-12-bcc.md b/changelog/bugfixes/2025-05-12-bcc.md new file mode 100644 index 0000000000..c7dfc9b29b --- /dev/null +++ b/changelog/bugfixes/2025-05-12-bcc.md @@ -0,0 +1 @@ +- Added back some BCC tools ([scripts#2900](https://github.com/flatcar/scripts/pull/2900))