diff options
| author |   Geoff Parker <geoffrey.parker@arthrex.com> | 2020-10-09 11:33:35 -0700 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-10-09 17:22:31 -0700 |
| commit | 5efc3e8f70185fffadd307050c0542a2bcff5fcd (patch) | |
| tree | 20ac0f819ca88bfec4525996fc957b62427f5dbe /meta-oe/recipes-support | |
| parent | cc512cd9e1aec90ca590288d7004f8bb144998e5 (diff) | |
| download | meta-openembedded-5efc3e8f70185fffadd307050c0542a2bcff5fcd.tar.gz | |
multipath-tools: replace perl with sed in libdmmp/Makefile for pseudo
The multipath-tools libdmmp/Makefile install target uses 'perl -i' instead
of 'sed -i' for string substitutions. The perl method creates a temporary file
and overwrites the original which changes the inodes and corrupts the pseudo
db. Changes to pseduo cause a build abort rather than allow possible bad
ownership or permissions settings on the files. 'sed -i' is compatible
with pseudo.
see https://wiki.yoctoproject.org/wiki/Pseudo_Abort
Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch new file mode 100644 index 0000000000..b35d67cf59 --- /dev/null +++ b/meta-oe/recipes-support/multipath-tools/files/0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch @@ -0,0 +1,40 @@ +From 35421d03898ac1b38f97a76241e6a29086d0c9f1 Mon Sep 17 00:00:00 2001 +From: Geoff Parker <geoffrey.parker@arthrex.com> +Date: Fri, 9 Oct 2020 17:48:47 +0000 +Subject: [PATCH] libdmmp/Makefile: replace perl with sed in install target to + work with pseudo + +The multipath-tools libdmmp/Makefile install target uses 'perl -i' instead +of 'sed -i' for string substitutions. The perl method creates a temporary file +and overwrites the original which changes the inodes and corrupts the pseudo +db. Changes to pseduo cause a build abort rather than allow possible bad +ownership or permissions settings on the files. 'sed -i' is compatible +with pseudo. + +Signed-off-by: Geoff Parker <geoffrey.parker@arthrex.com> +--- + libdmmp/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libdmmp/Makefile b/libdmmp/Makefile +index 1dd3f340..8166075c 100644 +--- a/libdmmp/Makefile ++++ b/libdmmp/Makefile +@@ -34,11 +34,11 @@ install: + $(LN) $(LIBS) $(DESTDIR)$(usrlibdir)/$(DEVLIB) + $(INSTALL_PROGRAM) -m 644 -D \ + $(PKGFILE).in $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ ++ sed -i 's|__VERSION__|$(LIBDMMP_VERSION)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__LIBDIR__|$(usrlibdir)|g' \ ++ sed -i 's|__LIBDIR__|$(usrlibdir)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) +- perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \ ++ sed -i 's|__INCLUDEDIR__|$(includedir)|g' \ + $(DESTDIR)$(pkgconfdir)/$(PKGFILE) + @for file in docs/man/*.3.gz; do \ + $(INSTALL_PROGRAM) -m 644 -D \ +-- +2.20.1 + diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb index 48a348d801..331c0cd018 100644 --- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb +++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb @@ -43,6 +43,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \ file://0029-multipath-tools-modify-Makefile.inc-for-cross-compil.patch \ file://0030-Always-use-devmapper.patch \ file://0031-Always-use-devmapper-for-kpartx.patch \ + file://0032-libdmmp-Makefile-replace-perl-with-sed-in-install-ta.patch \ file://0001-fix-bug-of-do_compile-and-do_install.patch \ file://0001-add-explicit-dependency-on-libraries.patch \ file://0001-fix-boolean-value-with-json-c-0.14.patch \ |