[OE-core] [PATCH v2] eglibc: Restore ${PN} to before ${PN}-dev in PACKAGES
Saul Wold
sgw at linux.intel.com
Tue Sep 11 18:19:28 UTC 2012
On 09/11/2012 11:14 AM, Phil Blundell wrote:
> Commit 13544fbc6217fee1731a6da1e2cf94901a500842 changed the ordering
> of PACKAGES so that ${PN}-dev came before ${PN}. However, this caused
> the FILES matching to go wrong if ${libdir} == ${base_libdir}. Fix this
> by moving ${PN} ahead of ${PN}-dev once again.
>
> Signed-off-by: Phil Blundell <pb at pbcl.net>
> ---
> V2: now with high-tech PR goodness
>
> meta/recipes-core/eglibc/eglibc-package.inc | 2 +-
> meta/recipes-core/eglibc/eglibc_2.16.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
> index edf7a75..adf31de 100644
> --- a/meta/recipes-core/eglibc/eglibc-package.inc
> +++ b/meta/recipes-core/eglibc/eglibc-package.inc
> @@ -17,7 +17,7 @@ python __anonymous () {
> # Set this to zero if you don't want ldconfig in the output package
> USE_LDCONFIG ?= "1"
>
> -PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN} eglibc-extra-nss"
> +PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-mtrace ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} eglibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
>
Did you do a build with BUILD_HISTORY enabled and verified nothing
changes in the standard case?
Sau!
> # The ld.so in this eglibc supports the GNU_HASH
> RPROVIDES_${PN} = "glibc rtld(GNU_HASH)"
> diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
> index c4bc18c..ffa4d5f 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.16.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
> @@ -3,7 +3,7 @@ require eglibc.inc
> SRCREV = "20393"
>
> DEPENDS += "gperf-native"
> -PR = "r7"
> +PR = "r8"
> PR_append = "+svnr${SRCPV}"
>
> EGLIBC_BRANCH="eglibc-2_16"
>
More information about the Openembedded-core
mailing list