Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
b7045432
Commit
b7045432
authored
2 years ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
lvm2: fix udeb build paths.
parent
de91dd7c
No related branches found
No related tags found
1 merge request
!860
lvm2: fix udeb build paths.
Pipeline
#675
passed
2 years ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
helpers/DATA/lvm2/enable_udeb_build.patch
+28
-0
28 additions, 0 deletions
helpers/DATA/lvm2/enable_udeb_build.patch
helpers/DATA/lvm2/fix_path_on_udeb_files.patch
+16
-0
16 additions, 0 deletions
helpers/DATA/lvm2/fix_path_on_udeb_files.patch
helpers/make-lvm2
+7
-1
7 additions, 1 deletion
helpers/make-lvm2
with
51 additions
and
1 deletion
helpers/DATA/lvm2/enable_udeb_build.patch
0 → 100644
+
28
−
0
View file @
b7045432
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 \
This diff is collapsed.
Click to expand it.
helpers/DATA/lvm2/fix_path_on_udeb_files.patch
0 → 100644
+
16
−
0
View file @
b7045432
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
This diff is collapsed.
Click to expand it.
helpers/make-lvm2
+
7
−
1
View file @
b7045432
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment