[oe-commits] org.oe.dev merge of '0e25c8665bca3c8d9e7c99e4432c9ce60811994c'
hrw commit
openembedded-commits at lists.openembedded.org
Tue Sep 4 11:03:30 UTC 2007
merge of '0e25c8665bca3c8d9e7c99e4432c9ce60811994c'
and '72c178b1440b044fcf6acdbb1cd21921f80d5b9b'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a6e42a94ed8d8ffb78e24cd960a603aa9feccd9c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a6e42a94ed8d8ffb78e24cd960a603aa9feccd9c
Files:
1
packages/madwifi/madwifi-ng_r2702-20070903.bb
classes/base.bbclass
classes/debian.bbclass
classes/multimachine.bbclass
classes/package.bbclass
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_rpm.bbclass
classes/package_tar.bbclass
classes/rm_work.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
conf/bitbake.conf
packages/glibc/glibc-package.bbclass
packages/glibc/glibc_2.2.5.bb
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_cvs.bb
Diffs:
#
# mt diff -r0e25c8665bca3c8d9e7c99e4432c9ce60811994c -ra6e42a94ed8d8ffb78e24cd960a603aa9feccd9c
#
#
#
# add_file "packages/madwifi/madwifi-ng_r2702-20070903.bb"
# content [c1a3090f2306173ae94202b7e71f996c56c9a7f4]
#
# patch "classes/base.bbclass"
# from [372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041]
# to [d0d8cdb0b25aaa62b66b99e71e401912b449c593]
#
# patch "classes/debian.bbclass"
# from [0314e5e02b030c0b609710095a3d82e11a7a713a]
# to [3faf23c6fd98ff2bd435268edd5e503953d4eef5]
#
# patch "classes/multimachine.bbclass"
# from [a237dbcaf9325ca862cbf52d3bb70f3314591e1d]
# to [b825fe152383c51713a009221a6fa34f71baf94b]
#
# patch "classes/package.bbclass"
# from [8214219f4cf766c4e5f3298b107e9215fe944e47]
# to [133959252573ef8846b3b217a8fc0a1245d0233f]
#
# patch "classes/package_deb.bbclass"
# from [73842f1df6176a56ec4f8018d2d98ca667df785f]
# to [a9e3536edbfc3c7688cdfdf6eb31098a6756cb91]
#
# patch "classes/package_ipk.bbclass"
# from [1872f53596730bd9e157720baf9341c875d2bc44]
# to [89bc8829d8e01336d5c7388a5fa756a042940a40]
#
# patch "classes/package_rpm.bbclass"
# from [bb81b0ca13339c5590f4287cb163cfd408618bab]
# to [544d06eecdf8053fd26fb5ad0149bf70d704de12]
#
# patch "classes/package_tar.bbclass"
# from [3b2206e771dcb118314fab5af6570042df83f633]
# to [cb0aff337888acb90332c226a3b5ba7c508f5190]
#
# patch "classes/rm_work.bbclass"
# from [ee47e8ab4e8989bafbb4ab34525d27fa9ea12103]
# to [e7bd77dd0dc1cf9bd9e2b63fb4bbb5351e7b1ebe]
#
# patch "classes/rootfs_deb.bbclass"
# from [721dd852a06abb344a5af38514cf89deeaa73f78]
# to [58bcec513e02215254895fcca453dfb26ab4d111]
#
# patch "classes/rootfs_ipk.bbclass"
# from [c9bd969ffbc28a671b048b88d67a776b1b7fc57e]
# to [0a6a677036faf7c5f940acbb04357cb21c26a3fc]
#
# patch "conf/bitbake.conf"
# from [d345b97ed205e335f85c0528040d80119f07236d]
# to [27f28821d89de0f8fab490644ac698eedc27f811]
#
============================================================
--- packages/madwifi/madwifi-ng_r2702-20070903.bb c1a3090f2306173ae94202b7e71f996c56c9a7f4
+++ packages/madwifi/madwifi-ng_r2702-20070903.bb c1a3090f2306173ae94202b7e71f996c56c9a7f4
@@ -0,0 +1,14 @@
+# Bitbake recipe for the madwifi-ng driver
+
+# Don't use this unless you know what you're doing -- this version does
+# *NOT* build on BE kernels.
+DEFAULT_PREFERENCE = "-1"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
+
+# PR set after the include, to override what's set in the included file.
+PR = "r0"
============================================================
--- classes/base.bbclass 372ea5a35ab3fd0e2d7d37ea1bb72d4d9e69a041
+++ classes/base.bbclass d0d8cdb0b25aaa62b66b99e71e401912b449c593
@@ -374,6 +374,12 @@ oe_machinstall() {
fi
}
+# Remove and re-create ${D} so that is it guaranteed to be empty
+do_install_prepend() {
+ rm -rf ${D}
+ mkdir -p ${D}
+}
+
addtask listtasks
do_listtasks[nostamp] = "1"
python do_listtasks() {
@@ -576,10 +582,6 @@ python base_do_unpack() {
local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
except bb.MalformedUrl, e:
raise FuncFailed('Unable to generate local path for malformed uri: %s' % e)
- # dont need any parameters for extraction, strip them off
- # RP: Insane. localpath shouldn't have parameters
- # RP: Scehdule for removal with bitbake 1.8.8
- local = re.sub(';.*$', '', local)
local = os.path.realpath(local)
ret = oe_unpack_file(local, localdata, url)
if not ret:
@@ -871,14 +873,6 @@ python () {
base_after_parse(d)
}
-# Remove me when we switch to bitbake 1.8.8
-def base_get_srcrev(d):
- import bb
-
- if hasattr(bb.fetch, "get_srcrev"):
- return bb.fetch.get_srcrev(d)
- return "NOT IMPLEMENTED"
-
# Patch handling
inherit patch
============================================================
--- classes/debian.bbclass 0314e5e02b030c0b609710095a3d82e11a7a713a
+++ classes/debian.bbclass 3faf23c6fd98ff2bd435268edd5e503953d4eef5
@@ -7,7 +7,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pk
#
# 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"
+do_package_write_ipk[rdeptask] = "do_package"
+do_package_write_deb[rdeptask] = "do_package"
+do_package_write_tar[rdeptask] = "do_package"
+do_package_write_rpm[rdeptask] = "do_package"
python debian_package_name_hook () {
import glob, copy, stat, errno, re
============================================================
--- classes/multimachine.bbclass a237dbcaf9325ca862cbf52d3bb70f3314591e1d
+++ classes/multimachine.bbclass b825fe152383c51713a009221a6fa34f71baf94b
@@ -1,9 +1,7 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${M
STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}"
STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"
-# Enable me to fix pkgdata problems with multimachine
-# Requires all install tasks to rerun (wipe all install stamps from tmp/stamps/
-#PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
+PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
# Find any machine specific sub packages and if present, mark the
# whole package as machine specific for multimachine purposes.
============================================================
--- classes/package.bbclass 8214219f4cf766c4e5f3298b107e9215fe944e47
+++ classes/package.bbclass 133959252573ef8846b3b217a8fc0a1245d0233f
@@ -1,7 +1,9 @@
#
# General packaging help functions
#
+PKGDEST = "${WORKDIR}/install"
+
def legitimize_package_name(s):
"""
Make sure package names are legitimate strings
@@ -120,18 +122,12 @@ python () {
python () {
import bb
-
if bb.data.getVar('PACKAGES', d, True) != '':
deps = bb.data.getVarFlag('do_package', 'depends', d) or ""
for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split():
deps += " %s:do_populate_staging" % dep
bb.data.setVarFlag('do_package', 'depends', deps, d)
- deps = bb.data.getVarFlag('do_package_write', 'depends', d) or ""
- for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split():
- deps += " %s:do_populate_staging" % dep
- bb.data.setVarFlag('do_package_write', 'depends', deps, d)
-
# shlibs requires any DEPENDS to have already packaged for the *.list files
bb.data.setVarFlag('do_package', 'deptask', 'do_package', d)
}
@@ -380,25 +376,21 @@ python populate_packages () {
if not os.path.islink(file) and not os.path.isdir(file) and isexec(file):
runstrip(file, d)
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+ os.system('rm -rf %s' % pkgdest)
+
for pkg in package_list:
localdata = bb.data.createCopy(d)
- root = os.path.join(workdir, "install", pkg)
+ root = os.path.join(pkgdest, pkg)
+ bb.mkdirhier(root)
- os.system('rm -rf %s' % root)
-
- bb.data.setVar('ROOT', '', localdata)
- bb.data.setVar('ROOT_%s' % pkg, root, localdata)
bb.data.setVar('PKG', pkg, localdata)
-
overrides = bb.data.getVar('OVERRIDES', localdata, 1)
if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined')
- bb.data.setVar('OVERRIDES', overrides+':'+pkg, localdata)
-
+ bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata)
bb.data.update_data(localdata)
- root = bb.data.getVar('ROOT', localdata, 1)
- bb.mkdirhier(root)
filesvar = bb.data.getVar('FILES', localdata, 1) or ""
files = filesvar.split()
for file in files:
@@ -451,7 +443,7 @@ python populate_packages () {
for pkg in package_list:
dangling_links[pkg] = []
pkg_files[pkg] = []
- inst_root = os.path.join(workdir, "install", pkg)
+ inst_root = os.path.join(pkgdest, pkg)
for root, dirs, files in os.walk(inst_root):
for f in files:
path = os.path.join(root, f)
@@ -572,6 +564,8 @@ python package_do_shlibs() {
bb.error("TARGET_SYS not defined")
return
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+
shlibs_dir = os.path.join(staging, target_sys, "shlibs")
old_shlibs_dir = os.path.join(staging, "shlibs")
bb.mkdirhier(shlibs_dir)
@@ -584,7 +578,7 @@ python package_do_shlibs() {
needed[pkg] = []
sonames = list()
- top = os.path.join(workdir, "install", pkg)
+ top = os.path.join(pkgdest, pkg)
for root, dirs, files in os.walk(top):
for file in files:
soname = None
@@ -670,7 +664,7 @@ python package_do_shlibs() {
else:
bb.note("Couldn't find shared library provider for %s" % n)
- deps_file = os.path.join(workdir, "install", pkg + ".shlibdeps")
+ deps_file = os.path.join(pkgdest, pkg + ".shlibdeps")
if os.path.exists(deps_file):
os.remove(deps_file)
if len(deps):
@@ -703,6 +697,8 @@ python package_do_pkgconfig () {
bb.error("TARGET_SYS not defined")
return
+ pkgdest = bb.data.getVar('PKGDEST', d, 1)
+
shlibs_dir = os.path.join(staging, target_sys, "shlibs")
old_shlibs_dir = os.path.join(staging, "shlibs")
bb.mkdirhier(shlibs_dir)
@@ -716,7 +712,7 @@ python package_do_pkgconfig () {
for pkg in packages.split():
pkgconfig_provided[pkg] = []
pkgconfig_needed[pkg] = []
- top = os.path.join(workdir, "install", pkg)
+ top = os.path.join(pkgdest, pkg)
for root, dirs, files in os.walk(top):
for file in files:
m = pc_re.match(file)
@@ -779,7 +775,7 @@ python package_do_pkgconfig () {
found = True
if found == False:
bb.note("couldn't find pkgconfig module '%s' in any package" % n)
- deps_file = os.path.join(workdir, "install", pkg + ".pcdeps")
+ deps_file = os.path.join(pkgdest, pkg + ".pcdeps")
if os.path.exists(deps_file):
os.remove(deps_file)
if len(deps):
@@ -793,14 +789,14 @@ python read_shlibdeps () {
packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
for pkg in packages:
rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
- shlibsfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".shlibdeps", d)
+ shlibsfile = bb.data.expand("${PKGDEST}/" + pkg + ".shlibdeps", d)
if os.access(shlibsfile, os.R_OK):
fd = file(shlibsfile)
lines = fd.readlines()
fd.close()
for l in lines:
rdepends.append(l.rstrip())
- pcfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".pcdeps", d)
+ pcfile = bb.data.expand("${PKGDEST}/" + pkg + ".pcdeps", d)
if os.access(pcfile, os.R_OK):
fd = file(pcfile)
lines = fd.readlines()
@@ -906,21 +902,14 @@ addtask package before do_build after do
do_package[dirs] = "${D}"
addtask package before do_build after do_install
-
-
-PACKAGE_WRITE_FUNCS ?= "read_subpackage_metadata"
-
-python package_do_package_write () {
- for f in (bb.data.getVar('PACKAGE_WRITE_FUNCS', d, 1) or '').split():
- bb.build.exec_func(f, d)
+# Dummy task to mark when all packaging is complete
+do_package_write () {
+ :
}
-do_package_write[dirs] = "${D}"
addtask package_write before do_build after do_package
-
EXPORT_FUNCTIONS do_package do_package_write
-
#
# Helper functions for the package writing classes
#
============================================================
--- classes/package_deb.bbclass 73842f1df6176a56ec4f8018d2d98ca667df785f
+++ classes/package_deb.bbclass a9e3536edbfc3c7688cdfdf6eb31098a6756cb91
@@ -1,14 +1,11 @@ inherit package
#
# Copyright 2006-2007 OpenedHand Ltd.
#
inherit package
-PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native"
-
BOOTSTRAP_EXTRA_RDEPENDS += "dpkg"
DISTRO_EXTRA_RDEPENDS += "dpkg"
-PACKAGE_WRITE_FUNCS += "do_package_deb"
IMAGE_PKGTYPE ?= "deb"
python package_deb_fn () {
@@ -271,5 +268,5 @@ do_package_write_deb[dirs] = "${D}"
bb.build.exec_func("do_package_deb", d)
}
do_package_write_deb[dirs] = "${D}"
-#addtask package_write_deb before do_package_write after do_package
+addtask package_write_deb before do_package_write after do_package
============================================================
--- classes/package_ipk.bbclass 1872f53596730bd9e157720baf9341c875d2bc44
+++ classes/package_ipk.bbclass 89bc8829d8e01336d5c7388a5fa756a042940a40
@@ -1,9 +1,6 @@ inherit package
inherit package
-PACKAGE_EXTRA_DEPENDS += "ipkg-utils-native fakeroot-native"
-
BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg"
-PACKAGE_WRITE_FUNCS += "do_package_ipk"
IMAGE_PKGTYPE ?= "ipk"
IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf"
@@ -313,4 +310,4 @@ do_package_write_ipk[dirs] = "${D}"
bb.build.exec_func("do_package_ipk", d)
}
do_package_write_ipk[dirs] = "${D}"
+addtask package_write_ipk before do_package_write after do_package
-
============================================================
--- classes/package_rpm.bbclass bb81b0ca13339c5590f4287cb163cfd408618bab
+++ classes/package_rpm.bbclass 544d06eecdf8053fd26fb5ad0149bf70d704de12
@@ -1,8 +1,7 @@ RPMBUILD="rpmbuild --short-circuit ${RPM
inherit package
inherit rpm_core
RPMBUILD="rpmbuild --short-circuit ${RPMOPTS}"
-PACKAGE_WRITE_FUNCS += "do_package_rpm"
IMAGE_PKGTYPE ?= "rpm"
python write_specfile() {
@@ -144,4 +143,4 @@ do_package_write_rpm[dirs] = "${D}"
bb.build.exec_func("do_package_rpm", d)
}
do_package_write_rpm[dirs] = "${D}"
+addtask package_write_rpm before do_build after do_package
-#addtask package_write_rpm before do_build after do_package
============================================================
--- classes/package_tar.bbclass 3b2206e771dcb118314fab5af6570042df83f633
+++ classes/package_tar.bbclass cb0aff337888acb90332c226a3b5ba7c508f5190
@@ -1,8 +1,5 @@ inherit package
inherit package
-PACKAGE_EXTRA_DEPENDS += "tar-native"
-
-PACKAGE_WRITE_FUNCS += "do_package_tar"
IMAGE_PKGTYPE ?= "tar"
python package_tar_fn () {
@@ -111,4 +108,4 @@ do_package_write_tar[dirs] = "${D}"
bb.build.exec_func("do_package_tar", d)
}
do_package_write_tar[dirs] = "${D}"
+addtask package_write_tar before do_build after do_package
-#addtask package_write_tar before do_build after do_package
============================================================
--- classes/rm_work.bbclass ee47e8ab4e8989bafbb4ab34525d27fa9ea12103
+++ classes/rm_work.bbclass e7bd77dd0dc1cf9bd9e2b63fb4bbb5351e7b1ebe
@@ -20,9 +20,7 @@ do_rm_work () {
fi
done
}
-# Uncomment me when we can use bitbake 1.8.8
-#addtask rm_work after do_${RMWORK_ORIG_TASK}
-addtask rm_work after do_build
+addtask rm_work after do_${RMWORK_ORIG_TASK}
do_rm_work_all () {
:
============================================================
--- classes/rootfs_deb.bbclass 721dd852a06abb344a5af38514cf89deeaa73f78
+++ classes/rootfs_deb.bbclass 58bcec513e02215254895fcca453dfb26ab4d111
@@ -1,9 +1,9 @@ do_rootfs[depends] += "dpkg-native:do_po
#
# Copyright 2006-2007 Openedhand Ltd.
#
do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging"
-do_rootfs[recrdeptask] += "do_package_write"
+do_rootfs[recrdeptask] += "do_package_write_deb"
fakeroot rootfs_deb_do_rootfs () {
set +e
============================================================
--- classes/rootfs_ipk.bbclass c9bd969ffbc28a671b048b88d67a776b1b7fc57e
+++ classes/rootfs_ipk.bbclass 0a6a677036faf7c5f940acbb04357cb21c26a3fc
@@ -6,7 +6,7 @@ do_rootfs[depends] += "ipkg-native:do_po
#
do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
-do_rootfs[recrdeptask] += "do_package_write"
+do_rootfs[recrdeptask] += "do_package_write_ipk"
IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
============================================================
--- conf/bitbake.conf d345b97ed205e335f85c0528040d80119f07236d
+++ conf/bitbake.conf 27f28821d89de0f8fab490644ac698eedc27f811
@@ -383,7 +383,7 @@ SRCDATE = "${DATE}"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
SRCDATE = "${DATE}"
-SRCREV = "${@base_get_srcrev(d)}"
+SRCREV = "${@bb.fetch.get_srcrev(d)}"
AUTOREV = "${@bb.fetch.get_srcrev(d)}"
SRC_URI = "file://${FILE}"
#
# mt diff -r72c178b1440b044fcf6acdbb1cd21921f80d5b9b -ra6e42a94ed8d8ffb78e24cd960a603aa9feccd9c
#
#
#
# patch "packages/glibc/glibc-package.bbclass"
# from [9dba580dba140e0ac409182fb8682f99d79b11f6]
# to [6fd787a481dfe0225e24a491cb5fb0b7937c3b58]
#
# patch "packages/glibc/glibc_2.2.5.bb"
# from [995d93bdb007daea101ad6dcc7927ed839ae65ac]
# to [c94ca1957557440865f3a087a491e78c82ac50c8]
#
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
# from [da9da8bbd7bba0f4afab9bfb2c084c446312aab7]
# to [9d66f3495d89533b0863b4cbebd1f7bb0178f2a6]
#
# patch "packages/glibc/glibc_2.3.2.bb"
# from [6782b7a2e35c5af3ef006ffe3ee0d7f255b0a4d7]
# to [9899b2926f98c47bf6f98b3152712ec3e0402c3d]
#
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
# from [68bb875d125161d71d29fe0ec5b9154cf9cad73e]
# to [7c004eef4c30f17d8e8dbda2fd9474d5780ab4ca]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
# from [aca320916a51bba93d34b29a7d980c21fdd654bc]
# to [f8890769d3ce7943c36fa8f56afab1ef7475e346]
#
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
# from [f460c6269190d5de4a53f2034fd521c66650b7fd]
# to [a9a264d70bf4eece2297cfa0d8e655647c03b3b3]
#
# patch "packages/glibc/glibc_2.3.3.bb"
# from [4852c1cb6256dc293b22edffa7f099bc373b27a5]
# to [7ebe44a2dd859533057aa8289095737f4da1cea3]
#
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
# from [0bdc803a96e16478f8babc05149bcd358f31b3ba]
# to [98cebeae3c0ce6e140197e208b78795709e718e0]
#
# patch "packages/glibc/glibc_2.4.bb"
# from [4dce5800e5ee479d50aadfabe74f8d54c9016194]
# to [15f3f20149c15a3bf357a1bae18153f259f9fe90]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [170dda6f2f98765930f6d592ced234fcca5b3c30]
# to [e59d8141690b43e2f369f7656638840f02908a89]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [46d87654a2c402275e3e9fb45fcd94cb8311edc8]
# to [7a41e230f67e4998589ab65552c2369752fe2137]
#
# patch "packages/glibc/glibc_cvs.bb"
# from [84cb326e8c277c18df0cb035314ecdc612de9cb2]
# to [8601413e7136492ce2d9b65e94e01bd11de422fe]
#
============================================================
--- packages/glibc/glibc-package.bbclass 9dba580dba140e0ac409182fb8682f99d79b11f6
+++ packages/glibc/glibc-package.bbclass 6fd787a481dfe0225e24a491cb5fb0b7937c3b58
@@ -79,6 +79,9 @@ do_install() {
mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
done
rm -f ${D}/etc/rpc
+ rm -f ${D}${includedir}/scsi/sg.h
+ rm -f ${D}${includedir}/scsi/scsi_ioctl.h
+ rm -f ${D}${includedir}/scsi/scsi.h
}
TMP_LOCALE="/tmp/locale${libdir}/locale"
============================================================
--- packages/glibc/glibc_2.2.5.bb 995d93bdb007daea101ad6dcc7927ed839ae65ac
+++ packages/glibc/glibc_2.2.5.bb c94ca1957557440865f3a087a491e78c82ac50c8
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r10"
+PR = "r11"
DEFAULT_PREFERENCE_sh3 = "-99"
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb da9da8bbd7bba0f4afab9bfb2c084c446312aab7
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb 9d66f3495d89533b0863b4cbebd1f7bb0178f2a6
@@ -1,9 +1,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r22"
+PR = "r23"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.2.bb 6782b7a2e35c5af3ef006ffe3ee0d7f255b0a4d7
+++ packages/glibc/glibc_2.3.2.bb 9899b2926f98c47bf6f98b3152712ec3e0402c3d
@@ -1,6 +1,6 @@ require glibc.inc
require glibc.inc
-PR = "r11"
+PR = "r12"
DEFAULT_PREFERENCE_sh3 = "-99"
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb 68bb875d125161d71d29fe0ec5b9154cf9cad73e
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb 7c004eef4c30f17d8e8dbda2fd9474d5780ab4ca
@@ -1,9 +1,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r7"
+PR = "r8"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb aca320916a51bba93d34b29a7d980c21fdd654bc
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb f8890769d3ce7943c36fa8f56afab1ef7475e346
@@ -1,9 +1,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r7"
+PR = "r8"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb f460c6269190d5de4a53f2034fd521c66650b7fd
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb a9a264d70bf4eece2297cfa0d8e655647c03b3b3
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r5"
+PR = "r6"
GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.3.3.bb 4852c1cb6256dc293b22edffa7f099bc373b27a5
+++ packages/glibc/glibc_2.3.3.bb 7ebe44a2dd859533057aa8289095737f4da1cea3
@@ -1,6 +1,6 @@ require glibc.inc
require glibc.inc
-PR = "r8"
+PR = "r9"
DEFAULT_PREFERENCE_sh3 = "-99"
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb 0bdc803a96e16478f8babc05149bcd358f31b3ba
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb 98cebeae3c0ce6e140197e208b78795709e718e0
@@ -1,8 +1,8 @@ SRCDATE = "20050627"
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
SRCDATE = "20050627"
-PR = "r13"
+PR = "r14"
#Doesnt build for sh3
DEFAULT_PREFERENCE_sh3="-1"
============================================================
--- packages/glibc/glibc_2.4.bb 4dce5800e5ee479d50aadfabe74f8d54c9016194
+++ packages/glibc/glibc_2.4.bb 15f3f20149c15a3bf357a1bae18153f259f9fe90
@@ -1,6 +1,6 @@ require glibc.inc
require glibc.inc
-PR = "r12"
+PR = "r13"
#add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
============================================================
--- packages/glibc/glibc_2.5.bb 170dda6f2f98765930f6d592ced234fcca5b3c30
+++ packages/glibc/glibc_2.5.bb e59d8141690b43e2f369f7656638840f02908a89
@@ -5,7 +5,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
-PR = "r6"
+PR = "r7"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
============================================================
--- packages/glibc/glibc_2.6.1.bb 46d87654a2c402275e3e9fb45fcd94cb8311edc8
+++ packages/glibc/glibc_2.6.1.bb 7a41e230f67e4998589ab65552c2369752fe2137
@@ -5,7 +5,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev"
-PR = "r0"
+PR = "r1"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
============================================================
--- packages/glibc/glibc_cvs.bb 84cb326e8c277c18df0cb035314ecdc612de9cb2
+++ packages/glibc/glibc_cvs.bb 8601413e7136492ce2d9b65e94e01bd11de422fe
@@ -1,7 +1,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
-PR = "r5"
+PR = "r6"
PV = "2.3.5+cvs${SRCDATE}"
GLIBC_ADDONS ?= "ports,linuxthreads"
More information about the Openembedded-commits
mailing list