From 8b130213c90aae058de79283546cbb0d9e4448d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 27 Sep 2024 20:53:20 +0000 Subject: [PATCH] lvm2: remove deprecated patches using profile for udebs. --- helpers/DATA/lvm2/enable_udeb_build.patch | 28 ------------------- .../DATA/lvm2/fix_path_on_udeb_files.patch | 16 ----------- helpers/make-lvm2 | 8 +----- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 helpers/DATA/lvm2/enable_udeb_build.patch delete mode 100644 helpers/DATA/lvm2/fix_path_on_udeb_files.patch diff --git a/helpers/DATA/lvm2/enable_udeb_build.patch b/helpers/DATA/lvm2/enable_udeb_build.patch deleted file mode 100644 index b8d3566..0000000 --- a/helpers/DATA/lvm2/enable_udeb_build.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru source/debian/rules source/debian/rules ---- source/debian/rules 2021-10-06 04:31:36.000000000 -0500 -+++ source/debian/rules 2022-08-18 22:47:15.148996989 -0500 -@@ -77,10 +77,7 @@ - - BUILDS := - ifneq ($(filter lvm2,$(shell dh_listpackages)),) --BUILDS += deb --endif --ifneq ($(filter lvm2-udeb,$(shell dh_listpackages)),) --BUILDS += udeb -+BUILDS += deb udeb - endif - ifneq ($(filter lvm2-dbusd,$(shell dh_listpackages)),) - BUILDS += deb_all -@@ -130,12 +127,10 @@ - -- $(GENCONTROL_ARGS) - - override_dh_install: --ifneq ($(filter lvm2-udeb,$(shell dh_listpackages)),) - dh_install --sourcedir=debian/build/install_udeb \ - -pdmsetup-udeb \ - -plibdevmapper$(DEVMAPPER_ABINAME)-udeb \ - -plvm2-udeb --endif - dh_install --sourcedir=debian/build/install_deb_all \ - -plvm2-dbusd - dh_install --sourcedir=debian/build/install_deb \ diff --git a/helpers/DATA/lvm2/fix_path_on_udeb_files.patch b/helpers/DATA/lvm2/fix_path_on_udeb_files.patch deleted file mode 100644 index deda98c..0000000 --- a/helpers/DATA/lvm2/fix_path_on_udeb_files.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nru source/debian/dmsetup-udeb.install source_fix/debian/dmsetup-udeb.install ---- source/debian/dmsetup-udeb.install 2021-05-19 17:33:13.000000000 +0000 -+++ source_fix/debian/dmsetup-udeb.install 2022-09-11 22:22:13.806360893 +0000 -@@ -1,2 +1,2 @@ --lib/udev/rules.d/*dm*.rules lib/udev/rules.d/ -+usr/lib/udev/rules.d/*dm*.rules lib/udev/rules.d/ - sbin/dmsetup -diff -Nru source/debian/lvm2-udeb.install source_fix/debian/lvm2-udeb.install ---- source/debian/lvm2-udeb.install 2021-05-19 17:33:13.000000000 +0000 -+++ source_fix/debian/lvm2-udeb.install 2022-09-11 22:22:32.382314653 +0000 -@@ -1,4 +1,4 @@ --lib/udev/rules.d/*-lvm*.rules -+usr/lib/udev/rules.d/*-lvm*.rules lib/udev/rules.d/ - etc/lvm/lvm.conf - sbin/lvchange - sbin/lvconvert diff --git a/helpers/make-lvm2 b/helpers/make-lvm2 index 088a3a4..fa99d0d 100644 --- a/helpers/make-lvm2 +++ b/helpers/make-lvm2 @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2022 Luis Guzmán +# Copyright (C) 2024 Luis Guzmán # Copyright (C) 2022 Ruben Rodriguez # # This program is free software; you can redistribute it and/or modify @@ -29,12 +29,6 @@ NETINST=true . ./config -#Enable udeb path by default -patch --no-backup-if-mismatch -p1 < $DATA/enable_udeb_build.patch - -#Fix udeb path usr/lib... instead of lib/... -patch --no-backup-if-mismatch -p1 < $DATA/fix_path_on_udeb_files.patch - # dmsetup is needed for lvm work, the installer hangs without it sed '/Package: lvm2-udeb/,/^$/s/^Depends:/Depends: dmsetup-udeb,/' -i debian/control