From e6785997dbe68ee9f043bc0b7801e3c99845d4f5 Mon Sep 17 00:00:00 2001 From: Palash Gandhi Date: Thu, 3 Oct 2024 12:13:41 -0700 Subject: [PATCH] Stop consuming bpftrace, bcc, fio, gdb-python and mold from internal forks in favor of upstream packages for LTS upgrade PR URL: https://www.github.com/delphix/linux-pkg/pull/325 --- .github/scripts/verify-query-packages.sh | 8 ----- README.md | 7 +--- package-lists/build/main.pkgs | 5 --- packages/bcc/config.sh | 39 ---------------------- packages/bpftrace/config.sh | 42 ------------------------ packages/fio/config.sh | 41 ----------------------- packages/gdb-python/config.sh | 27 --------------- packages/mold/config.sh | 34 ------------------- 8 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 packages/bcc/config.sh delete mode 100644 packages/bpftrace/config.sh delete mode 100644 packages/fio/config.sh delete mode 100644 packages/gdb-python/config.sh delete mode 100644 packages/mold/config.sh diff --git a/.github/scripts/verify-query-packages.sh b/.github/scripts/verify-query-packages.sh index 65cc85f0..c4051171 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 ae292b4b..4a5aa0b4 100644 --- a/README.md +++ b/README.md @@ -280,12 +280,7 @@ 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 - `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. + fetched for a given linux-pkg package. * **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 d96c1fb9..f67b6c6c 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 @@ -16,9 +14,7 @@ delphix-sso-app drgn docker-python-image dwarves -fio fluentd-gems -gdb-python grub2 host-jdks libkdumpfile @@ -26,7 +22,6 @@ make-jpkg makedumpfile masking misc-debs -mold nfs-utils performance-diagnostics ptools diff --git a/packages/bcc/config.sh b/packages/bcc/config.sh deleted file mode 100644 index 17ac5032..00000000 --- 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 79cfa307..00000000 --- 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 -} diff --git a/packages/fio/config.sh b/packages/fio/config.sh deleted file mode 100644 index 758ff252..00000000 --- a/packages/fio/config.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2018, 2022 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/fio.git" - -function prepare() { - logmust install_pkgs \ - libaio-dev \ - librdmacm-dev \ - libibverbs-dev \ - librbd-dev \ - libgtk2.0-dev \ - libcairo2-dev \ - libnuma-dev \ - flex \ - bison \ - libglusterfs-dev \ - libpmem-dev \ - libpmemblk-dev -} - -function build() { - logmust cd "$WORKDIR/repo/" - logmust dpkg-buildpackage -b -us -uc - logmust mv "$WORKDIR"/*deb "$WORKDIR/artifacts/" -} diff --git a/packages/gdb-python/config.sh b/packages/gdb-python/config.sh deleted file mode 100644 index df5e2beb..00000000 --- a/packages/gdb-python/config.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2019, 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/gdb-python.git" - -function prepare() { - logmust install_build_deps_from_control_file -} - -function build() { - logmust dpkg_buildpackage_default -} diff --git a/packages/mold/config.sh b/packages/mold/config.sh deleted file mode 100644 index 589ef63a..00000000 --- a/packages/mold/config.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright 2023 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/mold.git" - -UPSTREAM_GIT_URL=https://salsa.debian.org/pkg-llvm-team/mold.git -UPSTREAM_GIT_BRANCH=master - -function prepare() { - logmust install_build_deps_from_control_file -} - -function build() { - logmust dpkg_buildpackage_default -} - -function update_upstream() { - logmust update_upstream_from_git -}