diff --git a/helpers/DATA/lvm2/enable_udeb_build.patch b/helpers/DATA/lvm2/enable_udeb_build.patch new file mode 100644 index 0000000000000000000000000000000000000000..b8d3566a0b862526beedf9ee3129d8255759df1f --- /dev/null +++ b/helpers/DATA/lvm2/enable_udeb_build.patch @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000..96794c0bf963595935da8044192b9ef8b77f5ded --- /dev/null +++ b/helpers/DATA/lvm2/fix_path_on_udeb_files.patch @@ -0,0 +1,16 @@ +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 + etc/lvm/lvm.conf + sbin/lvchange + sbin/lvconvert diff --git a/helpers/make-lvm2 b/helpers/make-lvm2 index 937d4dedffa89f3703d104242bd90edba5a06280..5f4a73bf59aa11ee76cf49d007a9d7b0f431b204 100644 --- a/helpers/make-lvm2 +++ b/helpers/make-lvm2 @@ -23,10 +23,16 @@ # or fetch such packages from Debian in order to build the required udeb packages. ## -VERSION=0 +VERSION=1 NETINST=true + . ./config +#Enable udeb path by default +patch -p1 < $DATA/enable_udeb_build.patch + +#Fix udeb path usr/lib... instead of lib/... +patch -p1 < $DATA/fix_path_on_udeb_files.patch changelog "Rebuild upstream to get udeb dependency for debian-installer." compile