From 35bf6237ed5d55956b3956a83bdcc9205bef43fc Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Thu, 13 Mar 2025 13:41:52 -0700 Subject: [PATCH] DLPX-93685 LTS 24.04: Upgrade fails due to libkdumpfile conflict with upstream libkdumpfile10 package PR URL: https://www.github.com/delphix/linux-pkg/pull/340 --- package-lists/build/main.pkgs | 1 + packages/libkdumpfile/config.sh | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 packages/libkdumpfile/config.sh diff --git a/package-lists/build/main.pkgs b/package-lists/build/main.pkgs index ffa597a8..0a0a669c 100644 --- a/package-lists/build/main.pkgs +++ b/package-lists/build/main.pkgs @@ -17,6 +17,7 @@ fluentd-gems gdb-python grub2 host-jdks +libkdumpfile make-jpkg makedumpfile masking diff --git a/packages/libkdumpfile/config.sh b/packages/libkdumpfile/config.sh new file mode 100644 index 00000000..f6e5c179 --- /dev/null +++ b/packages/libkdumpfile/config.sh @@ -0,0 +1,34 @@ +#!/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/libkdumpfile.git" + +UPSTREAM_GIT_URL="https://github.com/ptesarik/libkdumpfile.git" +UPSTREAM_GIT_BRANCH="tip" + +function prepare() { + logmust install_build_deps_from_control_file +} + +function build() { + logmust dpkg_buildpackage_default +} + +function update_upstream() { + logmust update_upstream_from_git +}