From 6208bbb766b680cefc6f09d1b6511c210b99b803 Mon Sep 17 00:00:00 2001
From: Prakash Surya <prakash.surya@perforce.com>
Date: Tue, 11 Mar 2025 13:49:07 -0700
Subject: [PATCH 1/2] DLPX-93639 LTS 24.04: Upgrade fails due to drgn conflict
 with upstream python3-drgn package

PR URL: https://www.github.com/delphix/linux-pkg/pull/339
---
 package-lists/build/main.pkgs |  1 +
 packages/drgn/config.sh       | 40 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 packages/drgn/config.sh

diff --git a/package-lists/build/main.pkgs b/package-lists/build/main.pkgs
index 452a6c83..ffa597a8 100644
--- a/package-lists/build/main.pkgs
+++ b/package-lists/build/main.pkgs
@@ -11,6 +11,7 @@ delphix-platform
 delphix-rust
 delphix-sso-app
 docker-python-image
+drgn
 dwarves
 fluentd-gems
 gdb-python
diff --git a/packages/drgn/config.sh b/packages/drgn/config.sh
new file mode 100644
index 00000000..2d65c14e
--- /dev/null
+++ b/packages/drgn/config.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+#
+# Copyright 2019, 2025 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/drgn.git"
+
+UPSTREAM_GIT_URL="https://github.com/osandov/drgn.git"
+UPSTREAM_GIT_BRANCH="main"
+
+function prepare() {
+	#
+	# Strictly speaking libkdumpfile is not a hard prerequisite for
+	# drgn itself, but it is a hard requirement in our use-case as
+	# we do want to use drgn for kdump-compressed crash dumps.
+	#
+	logmust install_pkgs "$DEPDIR"/libkdumpfile/*.deb
+	logmust install_build_deps_from_control_file
+}
+
+function build() {
+	logmust dpkg_buildpackage_default
+}
+
+function update_upstream() {
+	logmust update_upstream_from_git
+}

From 221ae16dffde33aa7c00bfac236588d997634d74 Mon Sep 17 00:00:00 2001
From: Prakash Surya <prakash.surya@perforce.com>
Date: Tue, 11 Mar 2025 13:58:16 -0700
Subject: [PATCH 2/2] fixup: remove internal libkdump file install

---
 packages/drgn/config.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/drgn/config.sh b/packages/drgn/config.sh
index 2d65c14e..0bb3fe37 100644
--- a/packages/drgn/config.sh
+++ b/packages/drgn/config.sh
@@ -22,12 +22,6 @@ UPSTREAM_GIT_URL="https://github.com/osandov/drgn.git"
 UPSTREAM_GIT_BRANCH="main"
 
 function prepare() {
-	#
-	# Strictly speaking libkdumpfile is not a hard prerequisite for
-	# drgn itself, but it is a hard requirement in our use-case as
-	# we do want to use drgn for kdump-compressed crash dumps.
-	#
-	logmust install_pkgs "$DEPDIR"/libkdumpfile/*.deb
 	logmust install_build_deps_from_control_file
 }