diff options
| author | Lianhao Lu <lianhao.lu@intel.com> | 2011-08-04 18:36:23 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 12:57:44 +0100 |
| commit | 810259e6e0a41db8178d824fd35e5b567d39e3fe (patch) | |
| tree | 050c096e88bc44e5aec7915281c28a235a9be164 | |
| parent | 5fbac72eb8c3cddf10876cf007aff54180c7264e (diff) | |
| download | poky-810259e6e0a41db8178d824fd35e5b567d39e3fe.tar.gz | |
eglibc-package.inc: Fixed error in referencing PKGSUFFIX
[YOCTO #1329] Added the missing $ when referencing PKGSUFFIX in FILES_*
variables set.
[RP: Added PR bumps]
(From OE-Core rev: cd5440f6fa4b1d470c722039b4d2ea6f9b4bfd88)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.13.bb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 77519d286f..5308bb944f 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc | |||
| @@ -56,10 +56,10 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba | |||
| 56 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" | 56 | FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}" |
| 57 | FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" | 57 | FILES_ldd${PKGSUFFIX} = "${bindir}/ldd" |
| 58 | FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" | 58 | FILES_libsegfault${PKGSUFFIX} = "${base_libdir}/libSegFault*" |
| 59 | FILES_libcidn{PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" | 59 | FILES_libcidn${PKGSUFFIX} = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*" |
| 60 | FILES_libmemusage{PKGSUFFIX} = "${base_libdir}/libmemusage.so" | 60 | FILES_libmemusage${PKGSUFFIX} = "${base_libdir}/libmemusage.so" |
| 61 | FILES_eglibc-extra-nss{PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" | 61 | FILES_eglibc-extra-nss${PKGSUFFIX} = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*" |
| 62 | FILES_sln{PKGSUFFIX} = "/sbin/sln" | 62 | FILES_sln${PKGSUFFIX} = "/sbin/sln" |
| 63 | FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" | 63 | FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" |
| 64 | FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" | 64 | FILES_libsotruss${PKGSUFFIX} = "${libdir}/audit/sotruss-lib.so" |
| 65 | FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ | 65 | FILES_${PN}-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ |
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index 1ada8927b0..3a95b59fb9 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | require eglibc.inc | 1 | require eglibc.inc |
| 2 | 2 | ||
| 3 | DEPENDS += "gperf-native" | 3 | DEPENDS += "gperf-native" |
| 4 | PR = "r20" | 4 | PR = "r21" |
| 5 | 5 | ||
| 6 | SRCREV = "14158" | 6 | SRCREV = "14158" |
| 7 | 7 | ||
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb index 41fe7c7df7..d9935bea02 100644 --- a/meta/recipes-core/eglibc/eglibc_2.13.bb +++ b/meta/recipes-core/eglibc/eglibc_2.13.bb | |||
| @@ -3,7 +3,7 @@ require eglibc.inc | |||
| 3 | SRCREV = "14157" | 3 | SRCREV = "14157" |
| 4 | 4 | ||
| 5 | DEPENDS += "gperf-native" | 5 | DEPENDS += "gperf-native" |
| 6 | PR = "r9" | 6 | PR = "r10" |
| 7 | PR_append = "+svnr${SRCPV}" | 7 | PR_append = "+svnr${SRCPV}" |
| 8 | 8 | ||
| 9 | EGLIBC_BRANCH="eglibc-2_13" | 9 | EGLIBC_BRANCH="eglibc-2_13" |
