Fixed error in referencing PKGSUFFIX

PATCH In review Lianhao Lu 2 participants 3 messages Aug 4, 2011

Share & tools

Lianhao Lu

author

2011-08-04 10:38 UTC #0 lore raw

cover Fixed error in referencing PKGSUFFIX

$ was missing when referencing PKGSUFFIX in eglibc-package.inc.

This patch fixed the BUG #1329.

The following changes since commit fbb734e5753655de30c82c0a036c9043820e02cb:
Dongxiao Xu (1):

        multilib: Use BPN instead of PN for style like lib${PN}

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/bug1329
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/bug1329

Lianhao Lu (1):
eglibc-package.inc: Fixed error in referencing PKGSUFFIX

 meta/recipes-core/eglibc/eglibc-package.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Lianhao Lu

author

2011-08-04 10:38 UTC #1 lore raw

PATCH 1/1 eglibc-package.inc: Fixed error in referencing PKGSUFFIX

[YOCTO #1329] Added the missing $ when referencing PKGSUFFIX in FILES_* variables set.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-core/eglibc/eglibc-package.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

meta/recipes-core/eglibc/eglibc-package.inc +4 -4

index 77519d2..5308bb9 100644
@@ -56,10 +56,10 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba
 FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
 FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
 FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
-FILES_libcidn{PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
-FILES_libmemusage{PKGSUFFIX} = "${base_libdir}/libmemusage.so"
-FILES_eglibc-extra-nss{PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
-FILES_sln{PKGSUFFIX} = "/sbin/sln"
+FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
+FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so"
+FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
+FILES_sln${PKGSUFFIX} = "/sbin/sln"
 FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
 FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
 FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*.a \

Signature · 1 line

1.7.0.4

Richard Purdie

2011-08-04 12:03 UTC #2 lore raw

Re: [PATCH 1/1] eglibc-package.inc: Fixed error in referencing PKGSUFFIX

Quoted 17 lines · Lianhao Lu

[YOCTO #1329] Added the missing $ when referencing PKGSUFFIX in FILES_* variables set.

Signed-off-by Lianhao Lu <[email protected]>

---
 meta/recipes-core/eglibc/eglibc-package.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

meta/recipes-core/eglibc/eglibc-package.inc +0 -1

index 77519d2..5308bb9 100644
@@ -56,10 +56,10 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba
 FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
 FILES_ldd${PKGSUFFIX} = "${bindir}/ldd"
 FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*"
-FILES_libcidn{PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"

meta/recipes-core/eglibc/eglibc-package.inc libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba · line 65

Quoted 10 lines

meta/recipes-core/eglibc/eglibc-package.inc +4 -3

-FILES_libmemusage{PKGSUFFIX} = "${base_libdir}/libmemusage.so"
-FILES_eglibc-extra-nss{PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
-FILES_sln{PKGSUFFIX} = "/sbin/sln"
+FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
+FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so"
+FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
+FILES_sln${PKGSUFFIX} = "/sbin/sln"
 FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/"
 FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so"
 FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*.a \

Thanks, merged to master with added PR bumps.

Cheers,

Richard