mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

openldap: fix strip issue with new patch

Browse Source 
The patch install-strip.patch tries to fix the [already-stripped] QA
error with an outdated install-sh script which causes a parallel
installation failure:

  ../../build/shtool mkdir -p TOPDIR/tmp-glibc/work/core2-32-wrs-linux/openldap/2.5.9-r0/image/usr/lib
  STRIPPROG="" ../../i686-wrs-linux-libtool --mode=install ../../contrib/ldapc++/install-sh -c  -m 644 liblber.la TOPDIR/tmp-glibc/work/core2-32-wrs-linux/openldap/2.5.9-r0/image/usr/lib
  mkdir: cannot create directory 'TOPDIR/tmp-glibc/work/core2-32-wrs-linux/openldap/2.5.9-r0/image/usr/lib': File exists

With the new version of openldap, we can fix the strip issue by
unsetting STRIP_OPTS.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2021-12-09 17:56:14 +08:00
committed by Khem Raj
parent edc54a229f
commit 1fd5ca10a2
3 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/openldap/openldap/0001-build-top.mk-unset-STRIP_OPTS.patch
+38
View File
@@ -0,0 +1,38 @@
From 321839cbd1d57f12d3d6695254d2003473d8dd1a Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Wed, 8 Dec 2021 16:58:55 +0800
Subject: [PATCH] build/top.mk: unset STRIP_OPTS
Unset STRIP_OPTS to disable strip to fix QA errors:
ERROR: openldap-2.5.9-r0 do_package: QA Issue: File
'/usr/bin/ldapcompare' from openldap was already stripped, this will
prevent future debugging! [already-stripped]
ERROR: openldap-2.5.9-r0 do_package: QA Issue: File
'/usr/bin/ldapdelete' from openldap was already stripped, this will
prevent future debugging! [already-stripped]
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
build/top.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/top.mk b/build/top.mk
index 38ce146..6e9fe1f 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -60,7 +60,7 @@ INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_SCRIPT = $(INSTALL)
-STRIP_OPTS = -s
+STRIP_OPTS =
LINT = lint
5LINT = 5lint
--
2.17.1
meta-oe/recipes-support/openldap/openldap/install-strip.patch
-17
View File
@@ -1,17 +0,0 @@
# This patch ensures that the install operations which strip
# programs and libraries (LTINSTALL) work in a cross build
# environment.
Upstream-Status: Inappropriate [embedded specific]
--- a/build/top.mk
+++ b/build/top.mk
@@ -125,7 +125,7 @@ LTCOMPILE_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=compile \
LTLINK_MOD = $(LIBTOOL) $(LTONLY_MOD) --mode=link \
$(CC) $(LT_CFLAGS) $(LDFLAGS) $(LTFLAGS_MOD)
-LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+LTINSTALL = STRIPPROG="" $(LIBTOOL) --mode=install $(top_srcdir)/contrib/ldapc++/install-sh -c
LTFINISH = $(LIBTOOL) --mode=finish
# Misc UNIX commands used in build environment
meta-oe/recipes-support/openldap/openldap_2.5.9.bb
+1 -5
View File
@@ -21,6 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
file://slapd.service \
file://remove-user-host-pwd-from-version.patch \
file://0001-ldif-filter-fix-parallel-build-failure.patch \
file://0001-build-top.mk-unset-STRIP_OPTS.patch \
"
SRC_URI[md5sum] = "237fc2d881c27f8dd5d9f396e2865c11"
@@ -28,11 +29,6 @@ SRC_URI[sha256sum] = "c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364
DEPENDS = "util-linux groff-native"
# The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when
# installing .so and executables, this fails in cross compilation
# environments
SRC_URI += "file://install-strip.patch"
inherit autotools-brokensep update-rc.d systemd pkgconfig
# CV SETTINGS