From e2d72b185fc756871a5be485c2fbf3bf9d9b7441 Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Tue, 20 Aug 2024 13:47:20 -0600 Subject: [PATCH] Test removing bpftrace and bcc --- .github/scripts/verify-query-packages.sh | 8 ----- README.md | 8 ++--- package-lists/build/main.pkgs | 2 -- packages/bcc/config.sh | 39 ---------------------- packages/bpftrace/config.sh | 42 ------------------------ 5 files changed, 4 insertions(+), 95 deletions(-) delete mode 100644 packages/bcc/config.sh delete mode 100644 packages/bpftrace/config.sh diff --git a/.github/scripts/verify-query-packages.sh b/.github/scripts/verify-query-packages.sh index 65cc85f..c405117 100755 --- a/.github/scripts/verify-query-packages.sh +++ b/.github/scripts/verify-query-packages.sh @@ -30,14 +30,6 @@ read -r -a fields <<<"$(./query-packages.sh single -o git-url zfs 2>&1)" test ${#fields[@]} -eq 1 test "${fields[0]}" == 'https://github.com/delphix/zfs.git' -# Expect: "bpftrace bcc true https://github.com/delphix/bpftrace.git" -read -r -a fields <<<"$(./query-packages.sh single -o name,dependencies,can-update,git-url bpftrace 2>&1)" -test ${#fields[@]} -eq 4 -test "${fields[0]}" == 'bpftrace' -test "${fields[1]}" == 'bcc' -test "${fields[2]}" == 'true' -test "${fields[3]}" == 'https://github.com/delphix/bpftrace.git' - # Expect that "list all" outputs all directory names under packages/ diff <(ls -1 packages | sort) <(./query-packages.sh list all 2>&1 | sort) diff --git a/README.md b/README.md index 4efa6b0..5bd947b 100644 --- a/README.md +++ b/README.md @@ -281,11 +281,11 @@ of some of the scripts defined above. * **package_S3_URL**: Similar to the package_VAR variables above. This is used to override the default S3 location for where package build-dependencies are fetched for a given linux-pkg package. For instance, if you are building - bpftrace, which has `PACKAGE_DEPENDENCIES="bcc"` in its config, the + masking, which has `PACKAGE_DEPENDENCIES="adoptopenjdk"` in its config, the `fetch_dependencies()` stage in the build will fetch the latest build - artifacts of the bcc package from a predetermined S3 location. If you pass - `BCC_S3_URL=s3://path/to/custom/bcc/artifacts` then those artifacts will be - fetched insteasd. + artifacts of the openjdk package from a predetermined S3 location. If you + pass `ADOPTOPENJDK_S3_URL=s3://path/to/custom/adoptopenjdk/artifacts` then + those artifacts will be fetched insteasd. * **DELPHIX_PACKAGE_MIRROR_MAIN, DELPHIX_PACKAGE_MIRROR_SECONDARY**: When the [setup.sh](#setupsh) script is run, it will configure the apt sources diff --git a/package-lists/build/main.pkgs b/package-lists/build/main.pkgs index d96c1fb..80334e2 100644 --- a/package-lists/build/main.pkgs +++ b/package-lists/build/main.pkgs @@ -3,8 +3,6 @@ # adoptopenjdk -bcc -bpftrace challenge-response cloud-init crash-python diff --git a/packages/bcc/config.sh b/packages/bcc/config.sh deleted file mode 100644 index 17ac503..0000000 --- a/packages/bcc/config.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2018, 2020 Delphix -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# shellcheck disable=SC2034 - -DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/bcc.git" - -UPSTREAM_GIT_URL=https://github.com/iovisor/bcc.git -UPSTREAM_GIT_BRANCH=master - -function prepare() { - logmust install_build_deps_from_control_file -} - -function build() { - logmust cd "$WORKDIR/repo" - # Note: the string to determine the version was copied from bcc's - # debian/rules file. - PACKAGE_VERSION=$(dpkg-parsechangelog | sed -rne 's,^Version: (.*),\1,p') - - logmust dpkg_buildpackage_default -} - -function update_upstream() { - logmust update_upstream_from_git -} diff --git a/packages/bpftrace/config.sh b/packages/bpftrace/config.sh deleted file mode 100644 index 79cfa30..0000000 --- a/packages/bpftrace/config.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2018, 2020 Delphix -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# shellcheck disable=SC2034 - -DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/bpftrace.git" -PACKAGE_DEPENDENCIES="bcc" - -UPSTREAM_GIT_URL="https://github.com/iovisor/bpftrace.git" -UPSTREAM_GIT_BRANCH="master" - -function fetch() { - logmust fetch_repo_from_git - logmust git submodule init - logmust git submodule update --recursive -} - -function prepare() { - logmust install_pkgs "$DEPDIR"/bcc/libbcc_*.deb - logmust install_build_deps_from_control_file -} - -function build() { - logmust dpkg_buildpackage_default -} - -function update_upstream() { - logmust update_upstream_from_git -}