[oe-commits] org.oe.dev merge of 'c6c228c0cd2991434c9bb9e2a46ea7de66af8962'
oe commit
openembedded-commits at lists.openembedded.org
Thu Aug 30 08:00:44 UTC 2007
merge of 'c6c228c0cd2991434c9bb9e2a46ea7de66af8962'
and 'd0ad1bdf2a54c68b55cdc43378bb68bb835cfe47'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: aed2298456d46f0959e1914ef43989606cfb8241
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aed2298456d46f0959e1914ef43989606cfb8241
Files:
1
conf/distro/include/angstrom-eglibc.inc
packages/glibc/eglibc-package.bbclass
packages/glibc/eglibc_svn.bb
classes/base.bbclass
classes/debian.bbclass
classes/image.bbclass
classes/meta.bbclass
classes/native.bbclass
Diffs:
#
# mt diff -rc6c228c0cd2991434c9bb9e2a46ea7de66af8962 -raed2298456d46f0959e1914ef43989606cfb8241
#
#
#
# patch "conf/distro/include/angstrom-eglibc.inc"
# from [58bb03f9d2c14cb37e201fb02fbd7f20e95a164e]
# to [a9d422962bc950016e570647fc57248ccb3808d7]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [8328c4054f3e1a11f234ea681bc3158fa3acbacd]
# to [9123c49174291ea4f5984cf71ed04167013eecc6]
#
# patch "packages/glibc/eglibc_svn.bb"
# from [879645d294cfb3a060b88f5cd32e7d3c3607e39e]
# to [334ae8b71bcd61a32433aa783d962a5d622087fb]
#
============================================================
--- conf/distro/include/angstrom-eglibc.inc 58bb03f9d2c14cb37e201fb02fbd7f20e95a164e
+++ conf/distro/include/angstrom-eglibc.inc a9d422962bc950016e570647fc57248ccb3808d7
@@ -1,8 +1,8 @@
# eglibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
-PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial"
+PREFERRED_PROVIDER_virtual/libiconv = "eglibc"
+PREFERRED_PROVIDER_virtual/libintl = "eglibc"
+PREFERRED_PROVIDER_virtual/libc = "eglibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate"
============================================================
--- packages/glibc/eglibc-package.bbclass 8328c4054f3e1a11f234ea681bc3158fa3acbacd
+++ packages/glibc/eglibc-package.bbclass 9123c49174291ea4f5984cf71ed04167013eecc6
@@ -29,6 +29,15 @@ PACKAGES_DYNAMIC = "eglibc-gconv-* eglib
PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
PACKAGES_DYNAMIC = "eglibc-gconv-* eglibc-charmap-* eglibc-localedata-*"
+RPROVIDES_eglibc = "glibc"
+RPROVIDES_eglibc-utils = "glibc-utils"
+RPROVIDES_eglibc-dev = "glibc-dev"
+RPROVIDES_eglibc-doc = "glibc-doc"
+RPROVIDES_eglibc-locale = "glibc-locale"
+RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
+RPROVIDES_eglibc-thread-db = "glibc-thread-db"
+RPROVIDES_eglibc-pcprofiles = "glibc-pcprofiles"
+
libc_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*"
FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo"
============================================================
--- packages/glibc/eglibc_svn.bb 879645d294cfb3a060b88f5cd32e7d3c3607e39e
+++ packages/glibc/eglibc_svn.bb 334ae8b71bcd61a32433aa783d962a5d622087fb
@@ -1,8 +1,8 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
DEFAULT_PREFERENCE = "-1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
-PV = "2.6+svn${SRCDATE}"
+PV = "2.6+svnr${SRCREV}"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
file://export-fcntl2.patch;patch=1 \
file://etc/ld.so.conf \
@@ -10,8 +10,8 @@ B = "${WORKDIR}/build-${TARGET_SYS}"
S = "${WORKDIR}/trunk/libc"
B = "${WORKDIR}/build-${TARGET_SYS}"
-#PACKAGES_DYNAMIC = "libc6*"
-#RPROVIDES_${PN}-dev = "libc6-dev"
+PACKAGES_DYNAMIC = "libc6*"
+RPROVIDES_${PN}-dev = "libc6-dev"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
@@ -86,6 +86,9 @@ do_stage() {
}
do_stage() {
+ # FIXME: this removes files from staging
+ # make sure there isn't a conflicting libc in staging
+ # this should be solved differently
rm -f ${STAGING_LIBDIR}/libc.so.6
oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
#
# mt diff -rd0ad1bdf2a54c68b55cdc43378bb68bb835cfe47 -raed2298456d46f0959e1914ef43989606cfb8241
#
#
#
# patch "classes/base.bbclass"
# from [12ae0941acb2d92ee9cb83584bee1f690719f1c4]
# to [0b7bd90cd81cad21be3a5562472533d725e69760]
#
# patch "classes/debian.bbclass"
# from [c8744fcd1ac06134fbce495b44748686576b45ba]
# to [0314e5e02b030c0b609710095a3d82e11a7a713a]
#
# patch "classes/image.bbclass"
# from [4de98f478a319e0c9de999d79c0bf5a753f37a10]
# to [9ce7e97fa49142c8e94930461f94af3ec3c18110]
#
# patch "classes/meta.bbclass"
# from [7743ea6d250c46af99b14f35b48ceef9a1f19aaa]
# to [98de235f8180dc8d230b3844e981dacd87d269dd]
#
# patch "classes/native.bbclass"
# from [c2da24d1d82109665f7e1243119569f9ef1f9542]
# to [9790e613a5cd8ec531d788c5dd2d9642523821ca]
#
============================================================
--- classes/base.bbclass 12ae0941acb2d92ee9cb83584bee1f690719f1c4
+++ classes/base.bbclass 0b7bd90cd81cad21be3a5562472533d725e69760
@@ -864,54 +864,7 @@ def base_after_parse(d):
bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d)
return
-#
-# Various backwards compatibility stuff to be removed
-# when we switch to bitbake 1.8.2+ as a minimum version
-#
-def base_oldbitbake_workarounds(d):
- import bb
- from bb import __version__
- from distutils.version import LooseVersion
-
- if (LooseVersion(__version__) > "1.8.0"):
- return
-
- pn = bb.data.getVar('PN', d, True)
- srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, True)
- if srcdate != None:
- bb.data.setVar('SRCDATE', srcdate, d)
- depends = bb.data.getVar('DEPENDS', d, False)
- patchdeps = bb.data.getVar("PATCHTOOL", d, True)
- if patchdeps:
- patchdeps = "%s-native " % patchdeps
- if not patchdeps in bb.data.getVar("PROVIDES", d, True):
- depends = patchdeps + depends
- if bb.data.inherits_class('rootfs_ipk', d):
- depends = "ipkg-native ipkg-utils-native fakeroot-native " + depends
- if bb.data.inherits_class('rootfs_deb', d):
- depends = "dpkg-native apt-native fakeroot-native " + depends
- if bb.data.inherits_class('image', d):
- depends = "makedevs-native " + depends
- for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
- deps = bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or ""
- if deps:
- depends = depends + " %s" % deps
- for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
- depends = depends + " %s" % dep
-
- packages = bb.data.getVar('PACKAGES', d, True)
- if packages != '':
- if bb.data.inherits_class('package_ipk', d):
- depends = "ipkg-utils-native " + depends
- if bb.data.inherits_class('package_deb', d):
- depends = "dpkg-native " + depends
- if bb.data.inherits_class('package', d):
- depends = "${PACKAGE_DEPENDS} fakeroot-native " + depends
-
- bb.data.setVar('DEPENDS', depends, d)
-
python () {
- base_oldbitbake_workarounds(d)
base_after_parse(d)
}
============================================================
--- classes/debian.bbclass c8744fcd1ac06134fbce495b44748686576b45ba
+++ classes/debian.bbclass 0314e5e02b030c0b609710095a3d82e11a7a713a
@@ -1,11 +1,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pk
STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian"
# Debian package renaming only occurs when a package is built
# We therefore have to make sure we build all runtime packages
# before building the current package to make the packages runtime
# depends are correct
-BUILD_ALL_DEPS = "1"
-
+#
# Better expressed as ensure all RDEPENDS package before we package
# This means we can't have circular RDEPENDS/RRECOMMENDS
do_package_write[rdeptask] = "do_package"
============================================================
--- classes/image.bbclass 4de98f478a319e0c9de999d79c0bf5a753f37a10
+++ classes/image.bbclass 9ce7e97fa49142c8e94930461f94af3ec3c18110
@@ -1,9 +1,8 @@ PACKAGES = ""
inherit rootfs_${IMAGE_PKGTYPE}
PACKAGES = ""
# We need to recursively follow RDEPENDS and RRECOMMENDS for images
-BUILD_ALL_DEPS = "1"
do_rootfs[recrdeptask] = "do_package_write do_deploy do_populate_staging"
# Images are generally built explicitly, do not need to be part of world.
============================================================
--- classes/meta.bbclass 7743ea6d250c46af99b14f35b48ceef9a1f19aaa
+++ classes/meta.bbclass 98de235f8180dc8d230b3844e981dacd87d269dd
@@ -1,5 +1,4 @@ PACKAGES = ""
PACKAGES = ""
-BUILD_ALL_DEPS = "1"
do_build[recrdeptask] = "do_build"
============================================================
--- classes/native.bbclass c2da24d1d82109665f7e1243119569f9ef1f9542
+++ classes/native.bbclass 9790e613a5cd8ec531d788c5dd2d9642523821ca
@@ -11,9 +11,6 @@ RPROVIDES = "${PN}"
# RPROVIDES becomes unnecessary.
RPROVIDES = "${PN}"
-# Need to resolve package RDEPENDS as well as DEPENDS
-BUILD_ALL_DEPS = "1"
-
# Break the circular dependency as a result of DEPENDS
# in package.bbclass
PACKAGE_DEPENDS = ""
More information about the Openembedded-commits
mailing list