CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lvm2: remove deprecated patches using profile for udebs.

Browse source
This commit is contained in:
Luis Guzmán 2024-09-27 20:53:20 +00:00
parent 94e50ed96a
commit 8b130213c9
3 changed files with 1 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

28
helpers/DATA/lvm2/enable_udeb_build.patch
View file

@ -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 \

16
helpers/DATA/lvm2/fix_path_on_udeb_files.patch
View file

@ -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

8
helpers/make-lvm2
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2022 Luis Guzmán <ark@switnet.org> # Copyright (C) 2024 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2022 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2022 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -29,12 +29,6 @@ NETINST=true
. ./config . ./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 # dmsetup is needed for lvm work, the installer hangs without it
sed '/Package: lvm2-udeb/,/^$/s/^Depends:/Depends: dmsetup-udeb,/' -i debian/control sed '/Package: lvm2-udeb/,/^$/s/^Depends:/Depends: dmsetup-udeb,/' -i debian/control