Skip to content

Commit

Permalink
Stop consuming adoptopenjdk, bpftrace, bcc, fio, gdb-python and mold …
Browse files Browse the repository at this point in the history
…from internal sources in favor of upstream packages for LTS upgrade

PR URL: https://www.github.com/delphix/linux-pkg/pull/325
  • Loading branch information
palash-gandhi committed Oct 16, 2024
1 parent 8f9b7b5 commit 499fcc5
Show file tree
Hide file tree
Showing 13 changed files with 7 additions and 308 deletions.
8 changes: 0 additions & 8 deletions .github/scripts/verify-query-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions package-lists/build/main.pkgs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# List of non-kernel packages to be included in the Delphix Appliance.
#

adoptopenjdk
bcc
bpftrace
challenge-response
cloud-init
crash-python
Expand All @@ -16,17 +13,14 @@ delphix-sso-app
drgn
docker-python-image
dwarves
fio
fluentd-gems
gdb-python
grub2
host-jdks
libkdumpfile
make-jpkg
makedumpfile
masking
misc-debs
mold
nfs-utils
performance-diagnostics
ptools
Expand Down
81 changes: 0 additions & 81 deletions packages/adoptopenjdk/config.sh

This file was deleted.

39 changes: 0 additions & 39 deletions packages/bcc/config.sh

This file was deleted.

42 changes: 0 additions & 42 deletions packages/bpftrace/config.sh

This file was deleted.

8 changes: 2 additions & 6 deletions packages/containerized-masking/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,19 @@ source "$PWD/lib/common.sh"

DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/dms-core-gate.git"

PACKAGE_DEPENDENCIES="adoptopenjdk"
SKIP_COPYRIGHTS_CHECK=true

function prepare() {
logmust install_pkgs "$DEPDIR"/adoptopenjdk/*.deb
echo "Nothing to prepare"
}

function build() {
export JAVA_HOME
JAVA_HOME=$(cat "$DEPDIR/adoptopenjdk/JDK_PATH") ||
die "Failed to read $DEPDIR/adoptopenjdk/JDK_PATH"

logmust cd "$WORKDIR/repo"

local args=()

set_secret_build_args
args+=("-Dorg.gradle.java.home=/lib/jvm/java-8-openjdk-amd64/")
args+=("${_SECRET_BUILD_ARGS[@]}")

args+=("-Porg.gradle.configureondemand=false")
Expand Down
8 changes: 2 additions & 6 deletions packages/delphix-sso-app/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
# shellcheck disable=SC2034

DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/saml-app.git"
PACKAGE_DEPENDENCIES="adoptopenjdk"

function prepare() {
logmust install_pkgs "$DEPDIR"/adoptopenjdk/*.deb
echo "Nothing to prepare"
}

function build() {
local java_home
java_home=$(cat "$DEPDIR/adoptopenjdk/JDK_PATH") ||
die "Failed to read $DEPDIR/adoptopenjdk/JDK_PATH"
logmust cd "$WORKDIR/repo"
logmust sudo ./gradlew "-Dorg.gradle.java.home=$java_home" distDeb
logmust sudo ./gradlew distDeb
logmust sudo mv ./build/distributions/*deb "$WORKDIR/artifacts/"
}
41 changes: 0 additions & 41 deletions packages/fio/config.sh

This file was deleted.

27 changes: 0 additions & 27 deletions packages/gdb-python/config.sh

This file was deleted.

8 changes: 1 addition & 7 deletions packages/masking/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,13 @@
source "$PWD/lib/common.sh"

DEFAULT_PACKAGE_GIT_URL="https://github.com/delphix/dms-core-gate.git"
PACKAGE_DEPENDENCIES="adoptopenjdk"

function prepare() {
logmust read_list "$WORKDIR/repo/packaging/build-dependencies"
logmust install_pkgs "${_RET_LIST[@]}"

logmust install_pkgs "$DEPDIR"/adoptopenjdk/*.deb
}

function build() {
export JAVA_HOME
JAVA_HOME=$(cat "$DEPDIR/adoptopenjdk/JDK_PATH") ||
die "Failed to read $DEPDIR/adoptopenjdk/JDK_PATH"

logmust cd "$WORKDIR/repo"

#
Expand All @@ -51,6 +44,7 @@ function build() {
local args=()

set_secret_build_args
args+=("-Dorg.gradle.java.home=/lib/jvm/java-8-openjdk-amd64/")
args+=("${_SECRET_BUILD_ARGS[@]}")

args+=("-Porg.gradle.configureondemand=false")
Expand Down
Loading

0 comments on commit 499fcc5

Please sign in to comment.