From e4801876a46ad5b3884ccd674e67ef0b3fd67cb9 Mon Sep 17 00:00:00 2001 From: Shuichi Ihara Date: Fri, 12 Jul 2024 06:53:02 +0900 Subject: [PATCH] LU-18010 build: remove dpatch from dependency dpatch is no longer available in ubuntu24.04. Let's remove from dependency. if it really needs, use quilt instead. Test-Parameters: trivial Signed-off-by: Shuichi Ihara Change-Id: I94939ec6fe87fdbfe2a5904298d90ec324796921 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55711 Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- debian/control.main | 4 ++-- debian/rules | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/debian/control.main b/debian/control.main index 112f12b..08b70a7 100644 --- a/debian/control.main +++ b/debian/control.main @@ -4,7 +4,7 @@ Priority: optional Maintainer: Lustre Developers Uploaders: Lustre Developers Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers-amd64 | linux-headers-arm64, rsync, libssl-dev, libpython3-dev, swig, libmount-dev, ed +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers-amd64 | linux-headers-arm64, rsync, libssl-dev, libpython3-dev, swig, libmount-dev, ed Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, dpatch, pkg-config +Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, pkg-config Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Whamcloud and available from diff --git a/debian/rules b/debian/rules index 22d3c4dc..7fe4c68 100755 --- a/debian/rules +++ b/debian/rules @@ -647,7 +647,6 @@ binary-modules: prep-deb-files clean: dh_testdir dh_testroot - dpatch deapply-all -v -$(MAKE) distclean rm -rf debian/substvars debian/*.bak debian/*~ *~ *-stamp ls -d debian/lustre-*-modules-* | grep -v _KVERS_ | grep -v dkms | xargs rm -f || true @@ -662,11 +661,9 @@ clean: patch: patch-stamp patch-stamp: - dpatch apply-all -v touch $@ unpatch: - dpatch deapply-all -v rm -rf debian/patched patch-stamp .PHONY: binary-arch clean source diff binary binary-indep binary-arch install configure -- 1.8.3.1