summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-14 20:18:17 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-14 20:18:17 +0100
commitea5d780653a715fcefb0bd844e286dd8b3c6ce12 (patch)
treef2b321955064836e8fefcfa5db32728e4d3e40df /meta/packages
parent846794c17e88ae9d7a79bdebf31c0ab31474c22a (diff)
downloadpoky-ea5d780653a715fcefb0bd844e286dd8b3c6ce12.tar.gz
glibc-package.bbclass: Sync with OE.dev and remove hardcoded path references
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/glibc/glibc-package.bbclass25
1 files changed, 13 insertions, 12 deletions
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index d7ff64d7e9..f362194d28 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -29,22 +29,22 @@ BINARY_LOCALE_ARCHES ?= "arm.*"
29PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" 29PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
30PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" 30PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
31 31
32libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" 32libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*"
33 33
34FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo" 34FILES_${PN} = "${sysconfdir} ${libc_baselibs} ${base_sbindir}/ldconfig ${libexecdir}/* ${datadir}/zoneinfo"
35FILES_ldd = "${bindir}/ldd" 35FILES_ldd = "${bindir}/ldd"
36FILES_libsegfault = "/lib/libSegFault*" 36FILES_libsegfault = "${base_libdir}/libSegFault*"
37FILES_glibc-extra-nss = "/lib/libnss*" 37FILES_glibc-extra-nss = "${base_libdir}/libnss*"
38FILES_sln = "/sbin/sln" 38FILES_sln = "${base_sbindir}/sln"
39FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen" 39FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen"
40FILES_nscd = "${sbindir}/nscd*" 40FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
41FILES_glibc-utils = "${bindir}/* ${sbindir}/*" 41FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
42FILES_glibc-gconv = "${libdir}/gconv/*" 42FILES_glibc-gconv = "${libdir}/gconv/*"
43FILES_${PN}-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug" 43FILES_${PN}-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
44FILES_catchsegv = "${bindir}/catchsegv" 44FILES_catchsegv = "${bindir}/catchsegv"
45RDEPENDS_catchsegv = "libsegfault" 45RDEPENDS_catchsegv = "libsegfault"
46FILES_glibc-pcprofile = "/lib/libpcprofile.so" 46FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so"
47FILES_glibc-thread-db = "/lib/libthread_db*" 47FILES_glibc-thread-db = "${base_libdir}/libthread_db*"
48FILES_localedef = "${bindir}/localedef" 48FILES_localedef = "${bindir}/localedef"
49RPROVIDES_glibc-dev += "libc-dev" 49RPROVIDES_glibc-dev += "libc-dev"
50 50
@@ -61,6 +61,7 @@ def get_glibc_fpu_setting(bb, d):
61 return "" 61 return ""
62 62
63EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" 63EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
64EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
64 65
65OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" 66OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
66 67
@@ -141,14 +142,14 @@ do_prep_locale_tree() {
141 treedir=${WORKDIR}/locale-tree 142 treedir=${WORKDIR}/locale-tree
142 rm -rf $treedir 143 rm -rf $treedir
143 mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale 144 mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale
144 cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n 145 cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n
145 # unzip to avoid parsing errors 146 # unzip to avoid parsing errors
146 for i in $treedir/${datadir}/i18n/charmaps/*gz; do 147 for i in $treedir/${datadir}/i18n/charmaps/*gz; do
147 gunzip $i 148 gunzip $i
148 done 149 done
149 cp -a ${D}/lib/* $treedir/lib 150 cp -pPR ${D}${base_libdir}/* $treedir/lib
150 if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then 151 if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then
151 cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib 152 cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
152 fi 153 fi
153 install -m 0755 ${D}${bindir}/localedef $treedir/bin 154 install -m 0755 ${D}${bindir}/localedef $treedir/bin
154} 155}
@@ -157,7 +158,7 @@ do_collect_bins_from_locale_tree() {
157 treedir=${WORKDIR}/locale-tree 158 treedir=${WORKDIR}/locale-tree
158 159
159 mkdir -p ${D}${libdir} 160 mkdir -p ${D}${libdir}
160 cp -a $treedir/${libdir}/locale ${D}${libdir} 161 cp -pPR $treedir/${libdir}/locale ${D}${libdir}
161} 162}
162 163
163python package_do_split_gconvs () { 164python package_do_split_gconvs () {