[meta-oe][PATCH V3] pmdk: fix install error

[meta-oe][PATCH V3] pmdk: fix install error

[Yongxin Liu]

Install files to /usr instead of /usr/local.
Install bash_completion file to /etc/.
Remove unnecessary files which are only for debugging.
Set FILES to package /etc/bash_completion.d/pmempool.

Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
---
 meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb b/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb
index 3da22a970..cbd9174c0 100644
--- a/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb
+++ b/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb
@@ -35,24 +35,10 @@ EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}'"
 EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'"
 
 do_install() {
-	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-
-	# Copy these into the standard directories
-	install -d ${D}${bindir}/
-	mv ${D}/usr/local/bin/pmempool ${D}${bindir}/
-	mv ${D}/usr/local/bin/daxio ${D}${bindir}/
-
-	install -d ${D}${libdir}
-	mv ${D}/usr/local/lib/*so* ${D}${libdir}/
-
-	install -d ${D}${libdir}/pkgconfig
-	mv ${D}/usr/local/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig/
-
-	install -d ${D}${includedir}
-	mv ${D}/usr/local/include/* ${D}${includedir}/
+	oe_runmake prefix=${prefix} DESTDIR=${D} sysconfdir=/etc install
 
 	# Remove uneeded files
-	rm -rf ${D}/usr/local/
+	rm -rf ${D}/usr/lib64/pmdk_debug
 }
 
 # Include these by default otherwise the SDK is not very useful
@@ -60,5 +46,6 @@ FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio"
 FILES_${PN} += "${libdir}/*so*"
 FILES_${PN} += "${libdir}/pkgconfig/*.pc"
 FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/*"
+FILES_${PN} += "${sysconfdir}"
 
 COMPATIBLE_HOST='(x86_64).*'
-- 
2.14.4

Re: [meta-oe][PATCH V3] pmdk: fix install error

[Liu, Yongxin]

Please ignore this patch. 
It doesn't locate the root cause for pmdk installation.

pmdk libraries can be installed in lib or lib64, depending on different host build system. 


Thanks,
Yongxin


> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] On Behalf Of
> Yongxin Liu
> Sent: Tuesday, January 15, 2019 13:03
> To: openembedded-devel@lists.openembedded.org
> Subject: [oe] [meta-oe][PATCH V3] pmdk: fix install error
> 
> Install files to /usr instead of /usr/local.
> Install bash_completion file to /etc/.
> Remove unnecessary files which are only for debugging.
> Set FILES to package /etc/bash_completion.d/pmempool.
> 
> Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
> ---
>  meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb | 19 +++----------------
>  1 file changed, 3 insertions(+), 16 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb b/meta-
> oe/recipes-extended/pmdk/pmdk_1.4.2.bb
> index 3da22a970..cbd9174c0 100644
> --- a/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb
> +++ b/meta-oe/recipes-extended/pmdk/pmdk_1.4.2.bb
> @@ -35,24 +35,10 @@ EXTRA_OEMAKE = "HOST_SYS='${HOST_SYS}'
> EXTRA_CFLAGS='${SELECTED_OPTIMIZATION}'"
>  EXTRA_OEMAKE_append_libc-musl = " EXTRA_LIBS='-lfts'"
> 
>  do_install() {
> -	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
> -
> -	# Copy these into the standard directories
> -	install -d ${D}${bindir}/
> -	mv ${D}/usr/local/bin/pmempool ${D}${bindir}/
> -	mv ${D}/usr/local/bin/daxio ${D}${bindir}/
> -
> -	install -d ${D}${libdir}
> -	mv ${D}/usr/local/lib/*so* ${D}${libdir}/
> -
> -	install -d ${D}${libdir}/pkgconfig
> -	mv ${D}/usr/local/lib/pkgconfig/*.pc ${D}${libdir}/pkgconfig/
> -
> -	install -d ${D}${includedir}
> -	mv ${D}/usr/local/include/* ${D}${includedir}/
> +	oe_runmake prefix=${prefix} DESTDIR=${D} sysconfdir=/etc install
> 
>  	# Remove uneeded files
> -	rm -rf ${D}/usr/local/
> +	rm -rf ${D}/usr/lib64/pmdk_debug
>  }
> 
>  # Include these by default otherwise the SDK is not very useful
> @@ -60,5 +46,6 @@ FILES_${PN} += "${bindir}/pmempool ${bindir}/daxio"
>  FILES_${PN} += "${libdir}/*so*"
>  FILES_${PN} += "${libdir}/pkgconfig/*.pc"
>  FILES_${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/*"
> +FILES_${PN} += "${sysconfdir}"
> 
>  COMPATIBLE_HOST='(x86_64).*'
> --
> 2.14.4
> 
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel