* [CONSOLIDATED PULL 00/14]
@ 2011-08-05 15:27 Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 01/14] buildstats.bbclass: Adding disk io measurement Saul Wold
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw)
To: openembedded-core
Richard,
This Set includes changes multilib and ppc64, you may want to
review the ppc64 changes.
Thanks
Sau!
The following changes since commit 8a731122e7811275f20065ba27645b97fadf362d:
eglibc: Fix patch merge breakage (2011-08-04 15:41:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Beth Flanagan (1):
buildstats.bbclass: Adding disk io measurement
Khem Raj (3):
autoconf: Remove patch=1 from SRC_URI
autoconf: Remove code checking for hardcoded /usr/local
coreutils: Fix build on uclibc
Kumar Gala (7):
libmusicbrainz: utilize base_libdir when configured
libproxy: utilize libdir when configured
prelink: Add lib64 dirs to prelink.conf
tune/arch-powerpc64: include arch-powerpc.inc to keep things in sync
gcc-4.6: Add support for the e5500 PowerPC core
image-mklibs.bbclass: Add powerpc64 arch support
image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib
Mark Hatle (1):
libzypp: Increase the size of the arch compat table
Saul Wold (2):
dpkg: Update to use perlnative
linux-yocto_3.0: Fix SRC_URI to use yoctoproject.org
meta/classes/buildstats.bbclass | 220 ++++++----
meta/classes/image-mklibs.bbclass | 11 +-
.../machine/include/powerpc/arch-powerpc64.inc | 4 +
.../remove-usr-local-lib-from-m4.patch | 31 ++
meta/recipes-core/coreutils/coreutils_8.12.bb | 6 +-
meta/recipes-devtools/autoconf/autoconf.inc | 4 +-
.../autoconf/remove-usr-local-lib-from-m4.patch | 29 ++
meta/recipes-devtools/autoconf/autoconf_2.68.bb | 22 +-
meta/recipes-devtools/dpkg/dpkg.inc | 4 +-
meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb | 2 +-
meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +-
.../gcc/gcc-4.6/powerpc-e5500.patch | 465 ++++++++++++++++++++
meta/recipes-devtools/prelink/prelink/prelink.conf | 8 +-
meta/recipes-devtools/prelink/prelink_git.bb | 2 +-
.../arm-workaround-global-constructor.patch | 23 +-
.../libzypp/libzypp/libzypp-compatargs.patch | 54 +++
...libzypp-pokyarch.patch => libzypp-oearch.patch} | 24 +-
meta/recipes-extended/libzypp/libzypp_git.bb | 69 ++--
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
.../allow-libdir-override.patch | 19 +
.../musicbrainz/libmusicbrainz_3.0.3.bb | 7 +-
meta/recipes-support/libproxy/libproxy_0.4.6.bb | 4 +-
22 files changed, 847 insertions(+), 166 deletions(-)
create mode 100644 meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch
create mode 100644 meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch
create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch
create mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch
rename meta/recipes-extended/libzypp/libzypp/{libzypp-pokyarch.patch => libzypp-oearch.patch} (98%)
create mode 100644 meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch
--
1.7.3.4
^ permalink raw reply [flat|nested] 16+ messages in thread* [CONSOLIDATED PULL 01/14] buildstats.bbclass: Adding disk io measurement 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 02/14] autoconf: Remove patch=1 from SRC_URI Saul Wold ` (13 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Beth Flanagan <elizabeth.flanagan@intel.com> This commit adds disk-io statistics functionality on a build and per-task basis. It pulls measurements for whatever partition TMPDIR exists on. This data could be off if SSTATE_DIR and DL_DIR exist on a different partition/volume. Notes on what this pulls: ReadsComp: Total number of reads complete ReadsMerged: Total number of adjacent reads merged SectRead: Total number of sectors read TimeReads: Total number of m/s spent reading WritesComp: Total number of writes completed SectWrite: Total number of sectors written TimeWrite: Total number of m/s spent writing IOinProgress: Total amount of IO in progress at the time of we look at /proc/diskstats. TimeIO: Total number of m/s spent doing IO WTimeIO: Weighted time doing I/O. From iostats.txt: "This field is incremented at each I/O start, I/O completion, I/O merge, or read of these stats by the number of I/Os in progress (field 9) times the number of milliseconds spent doing I/O since the last update of this field. This can provide an easy measure of both I/O completion time and the backlog that may be accumulating." Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com> --- meta/classes/buildstats.bbclass | 220 +++++++++++++++++++++++++-------------- 1 files changed, 142 insertions(+), 78 deletions(-) diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass index 8077035..939e3af 100644 --- a/meta/classes/buildstats.bbclass +++ b/meta/classes/buildstats.bbclass @@ -1,5 +1,6 @@ BUILDSTATS_BASE = ${TMPDIR}/buildstats/ BNFILE = ${BUILDSTATS_BASE}/.buildname +DEVFILE = ${BUILDSTATS_BASE}/.device ################################################################################ # Build statistics gathering. @@ -19,9 +20,79 @@ def get_cputime(): fields = open("/proc/stat", "r").readline().rstrip().split()[1:] return sum(int(field) for field in fields) +def set_bn(e): + bn = e.getPkgs()[0] + "-" + bb.data.getVar('MACHINE',e.data, True) + try: + os.remove(bb.data.getVar('BNFILE', e.data, True)) + except: + pass + file = open(bb.data.getVar('BNFILE', e.data, True), "w") + file.write(os.path.join(bn, bb.data.getVar('BUILDNAME', e.data, True))) + file.close() + +def get_bn(e): + file = open(bb.data.getVar('BNFILE', e.data, True)) + bn = file.readline() + file.close() + return bn + +def set_device(e): + tmpdir = bb.data.getVar('TMPDIR', e.data, True) + try: + os.remove(bb.data.getVar('DEVFILE', e.data, True)) + except: + pass + ############################################################################ + # We look for the volume TMPDIR lives on. To do all disks would make little + # sense and not give us any particularly useful data. In theory we could do + # something like stick DL_DIR on a different partition and this would + # throw stats gathering off. The same goes with SSTATE_DIR. However, let's + # get the basics in here and work on the cornercases later. + ############################################################################ + device=os.stat(tmpdir) + majordev=os.major(device.st_dev) + minordev=os.minor(device.st_dev) + for line in open("/proc/diskstats", "r"): + if majordev == int(line.split()[0]) and minordev == int(line.split()[1]): + rdev=line.split()[2] + file = open(bb.data.getVar('DEVFILE', e.data, True), "w") + file.write(rdev) + file.close() + +def get_device(e): + file = open(bb.data.getVar('DEVFILE', e.data, True)) + device = file.readline() + file.close() + return device + +def get_diskstats(dev): + import itertools + ############################################################################ + # For info on what these are, see kernel doc file iostats.txt + ############################################################################ + DSTAT_KEYS = ['ReadsComp', 'ReadsMerged', 'SectRead', 'TimeReads', 'WritesComp', 'SectWrite', 'TimeWrite', 'IOinProgress', 'TimeIO', 'WTimeIO'] + for x in open("/proc/diskstats", "r"): + if dev in x: + diskstats_val = x.rstrip().split()[4:] + diskstats = dict(itertools.izip(DSTAT_KEYS, diskstats_val)) + return diskstats + +def set_diskdata(var, dev, data): + data.setVar(var, get_diskstats(dev)) + +def get_diskdata(var, dev, data): + olddiskdata = data.getVar(var, False) + diskdata = {} + if olddiskdata is None: + return + newdiskdata = get_diskstats(dev) + for key in olddiskdata.iterkeys(): + diskdata["Start"+key] = str(int(olddiskdata[key])) + diskdata["End"+key] = str(int(newdiskdata[key])) + return diskdata + def set_timedata(var, data): import time - time = time.time() cputime = get_cputime() proctime = get_process_cputime(os.getpid()) @@ -42,26 +113,35 @@ def get_timedata(var, data): cpuperc = None return timediff, cpuperc -############################################## -# We need to set the buildname to a file since -# BUILDNAME changes throughout a build -############################################## - -def set_bn(e): - bn = e.getPkgs()[0] + "-" + bb.data.getVar('MACHINE',e.data, True) - try: - os.remove(bb.data.getVar('BNFILE',e.data, True)) - except: - pass - file = open(bb.data.getVar('BNFILE',e.data, True), "w") - file.write(os.path.join(bn, bb.data.getVar('BUILDNAME', e.data, True))) - file.close() - -def get_bn(e): - file = open(bb.data.getVar('BNFILE',e.data, True)) - bn = file.readline() +def write_task_data(status, logfile, dev, e): + bn = get_bn(e) + bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) + taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data)) + file = open(os.path.join(logfile), "a") + timedata = get_timedata("__timedata_task", e.data) + if timedata: + elapsedtime, cpu = timedata + file.write(bb.data.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" % + (e.task, elapsedtime), e.data)) + if cpu: + file.write("CPU usage: %0.1f%% \n" % cpu) + ############################################################################ + # Here we gather up disk data. In an effort to avoid lying with stats + # I do a bare minimum of analysis of collected data. + # The simple fact is, doing disk io collection on a per process basis + # without effecting build time would be difficult. + # For the best information, running things with BB_TOTAL_THREADS = "1" + # would return accurate per task results. + ############################################################################ + diskdata = get_diskdata("__diskdata_task", dev, e.data) + if diskdata: + for key in sorted(diskdata.iterkeys()): + file.write(key + ": " + diskdata[key] + "\n") + if status is "passed": + file.write("Status: PASSED") + else: + file.write("Status: FAILED") file.close() - return bn python run_buildstats () { import bb.build @@ -69,22 +149,27 @@ python run_buildstats () { import bb.data import time, subprocess, platform + if isinstance(e, bb.event.BuildStarted): - ############################################## + ######################################################################## # at first pass make the buildstats heriarchy and then # set the buildname - ############################################## + ######################################################################## try: bb.mkdirhier(bb.data.getVar('BUILDSTATS_BASE', e.data, True)) except: pass set_bn(e) bn = get_bn(e) + set_device(e) + device = get_device(e) + bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) try: bb.mkdirhier(bsdir) except: pass + set_diskdata("__diskdata_build", device, e.data) set_timedata("__timedata_build", e.data) build_time = os.path.join(bsdir, "build_stats") # write start of build into build_time @@ -99,27 +184,36 @@ python run_buildstats () { file.close() elif isinstance(e, bb.event.BuildCompleted): - bn=get_bn(e) - timedata = get_timedata("__timedata_build", e.data) - if not timedata: - return - time, cpu = timedata + bn = get_bn(e) + dev = get_device(e) bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) + taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data)) build_time = os.path.join(bsdir, "build_stats") - # write end of build and cpu used into build_time file = open(build_time, "a") - file.write("Elapsed time: %0.2f seconds \n" % (time)) - if cpu: - file.write("CPU usage: %0.1f%% \n" % cpu) + ######################################################################## + # Write build statistics for the build + ######################################################################## + timedata = get_timedata("__timedata_build", e.data) + if timedata: + time, cpu = timedata + # write end of build and cpu used into build_time + file = open(build_time, "a") + file.write("Elapsed time: %0.2f seconds \n" % (time)) + if cpu: + file.write("CPU usage: %0.1f%% \n" % cpu) + diskio = get_diskdata("__diskdata_build", dev, e.data) + if diskio: + for key in sorted(diskio.iterkeys()): + file.write(key + ": " + diskio[key] + "\n") file.close() - if isinstance(e, bb.build.TaskStarted): - bn=get_bn(e) - set_timedata("__timedata_task", e.data) - + bn = get_bn(e) + device = get_device(e) bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data)) + set_diskdata("__diskdata_task", device, e.data) + set_timedata("__timedata_task", e.data) try: bb.mkdirhier(taskdir) except: @@ -131,29 +225,13 @@ python run_buildstats () { file.close() elif isinstance(e, bb.build.TaskSucceeded): - bn=get_bn(e) - timedata = get_timedata("__timedata_task", e.data) - if not timedata: - return - elapsedtime, cpu = timedata + bn = get_bn(e) + device = get_device(e) bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data)) - file = open(os.path.join(taskdir, e.task), "a") - file.write(bb.data.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" % - (e.task, elapsedtime), e.data)) - file.write("Ended: %0.2f \n" % time.time()) - if cpu: - file.write("CPU usage: %0.1f%% \n" % cpu) - - file.write("Status: PASSED") - file.close() - - ############################################## - # Alot of metric gathering occurs here. - # Reminder: I stripped out some in process stuff here - ############################################## - + write_task_data("passed", os.path.join(taskdir, e.task), device, e) if e.task == "do_rootfs": + bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) bs=os.path.join(bsdir, "build_stats") file = open(bs,"a") rootfs = bb.data.getVar('IMAGE_ROOTFS', e.data, True) @@ -162,35 +240,21 @@ python run_buildstats () { file.close() elif isinstance(e, bb.build.TaskFailed): - bn=get_bn(e) - timedata = get_timedata("__timedata_task", e.data) - if not timedata: - return - time, cpu = timedata + bn = get_bn(e) + device = get_device(e) bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn) taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data)) - ############################################## - # If the task fails dump the regular data. - # fgrep -R "FAILED" <bsdir> - # will grep all the events that failed. - ############################################## - file = open(os.path.join(taskdir, e.task), "a") - file.write(bb.data.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" % - (e.task, time), e.data)) - if cpu: - file.write("CPU usage: %0.1f%% \n" % cpu) - file.write("Status: FAILED") - file.close() - ############################################## - # Lets make things easier and tell people where the build failed in build_status - # We do this here because BuildCompleted triggers no matter what the status of the - # build actually is - ############################################## + write_task_data("failed", os.path.join(taskdir, e.task), device, e) + ######################################################################## + # Lets make things easier and tell people where the build failed in + # build_status. We do this here because BuildCompleted triggers no + # matter what the status of the build actually is + ######################################################################## build_status = os.path.join(bsdir, "build_stats") file = open(build_status,"a") file.write(bb.data.expand("Failed at: ${PF} at task: %s \n" % e.task, e.data)) file.close() - + } addhandler run_buildstats -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 02/14] autoconf: Remove patch=1 from SRC_URI 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 01/14] buildstats.bbclass: Adding disk io measurement Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 03/14] autoconf: Remove code checking for hardcoded /usr/local Saul Wold ` (12 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Khem Raj <raj.khem@gmail.com> Edit summary field s/produced/produce/ Fix the license related warning WARNING: autoconf-native: No generic license file exists for: GPLv2|GPLv3 at /b/openembedded-core/meta/files/common-licenses WARNING: autoconf-native: There is also no SPDXLICENSEMAP for this license type: GPLv2|GPLv3 at /b/openembedded-core/meta/files/common-licenses Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-devtools/autoconf/autoconf.inc | 4 ++-- meta/recipes-devtools/autoconf/autoconf_2.68.bb | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 47b2b84..08a1b02 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -1,4 +1,4 @@ -SUMMARY = "A GNU tool that procuded shell scripts to automatically configure software." +SUMMARY = "A GNU tool that procude shell scripts to automatically configure software." DESCRIPTION = "Autoconf is an extensible package of M4 macros that produce shell scripts to automatically \ configure software source code packages. Autoconf creates a configuration script for a package from a template \ file that lists the operating system features that the package can use, in the form of M4 macro calls." @@ -9,6 +9,6 @@ DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 gnu-config" SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ - file://program_prefix.patch;patch=1" + file://program_prefix.patch" inherit autotools diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb index 638e677..3b196a6 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb @@ -6,16 +6,17 @@ PARALLEL_MAKE = "" DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 gnu-config" -LICENSE = "GPLv2|GPLv3" +LICENSE = "GPLv2 & GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI += "file://autoreconf-include.patch;patch=1 \ - file://autoreconf-exclude.patch;patch=1 \ - file://autoreconf-foreign.patch;patch=1 \ - file://autoreconf-gnuconfigize.patch;patch=1 \ - file://autoheader-nonfatal-warnings.patch;patch=1 \ - ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \ - file://config_site.patch;patch=1" +SRC_URI += "file://autoreconf-include.patch \ + file://autoreconf-exclude.patch \ + file://autoreconf-foreign.patch \ + file://autoreconf-gnuconfigize.patch \ + file://autoheader-nonfatal-warnings.patch \ + ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d)]} \ + file://config_site.patch \ + " SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e571454332c8" @@ -23,6 +24,6 @@ SRC_URI[sha256sum] = "c491fb273fd6d4ca925e26ceed3d177920233c76d542b150ff35e57145 DEPENDS_virtclass-native = "m4-native gnu-config-native" RDEPENDS_${PN}_virtclass-native = "m4-native gnu-config-native" -SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch;patch=1" +SRC_URI_append_virtclass-native = " file://fix_path_xtra.patch" BBCLASSEXTEND = "native" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 03/14] autoconf: Remove code checking for hardcoded /usr/local 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 01/14] buildstats.bbclass: Adding disk io measurement Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 02/14] autoconf: Remove patch=1 from SRC_URI Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 04/14] coreutils: Fix build on uclibc Saul Wold ` (11 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Khem Raj <raj.khem@gmail.com> This code is only relevant for AIX and causes problems with OE QA sniffer which detects -L/usr/local/lib on linker commandline during cross compile and rightly barfs This only happens when getloadavg() is not found in libc so we do not reach that code with eglibc but only with uclibc Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../autoconf/remove-usr-local-lib-from-m4.patch | 29 ++++++++++++++++++++ meta/recipes-devtools/autoconf/autoconf_2.68.bb | 3 +- 2 files changed, 31 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000..55d2e2f --- /dev/null +++ b/meta/recipes-devtools/autoconf/autoconf/remove-usr-local-lib-from-m4.patch @@ -0,0 +1,29 @@ +We have problem using hardcoded directories like /usr/local here +which will be checked for cross builds. This is a special case which +is valid for AIX only. We do not have AIX as one of our supported +build host or target. Therefore we get rid of the hardcoded paths +and make life easier for cross compilation process. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] +Index: autoconf-2.68/lib/autoconf/functions.m4 +=================================================================== +--- autoconf-2.68.orig/lib/autoconf/functions.m4 2010-09-22 14:52:19.000000000 -0700 ++++ autoconf-2.68/lib/autoconf/functions.m4 2011-08-03 11:57:05.822199513 -0700 +@@ -749,15 +749,6 @@ if test $ac_have_func = no; then + [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) + fi + +-if test $ac_have_func = no; then +- # There is a commonly available library for RS/6000 AIX. +- # Since it is not a standard part of AIX, it might be installed locally. +- ac_getloadavg_LIBS=$LIBS +- LIBS="-L/usr/local/lib $LIBS" +- AC_CHECK_LIB(getloadavg, getloadavg, +- [LIBS="-lgetloadavg $LIBS"], [LIBS=$ac_getloadavg_LIBS]) +-fi +- + # Make sure it is really in the library, if we think we found it, + # otherwise set up the replacement function. + AC_CHECK_FUNCS(getloadavg, [], diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb b/meta/recipes-devtools/autoconf/autoconf_2.68.bb index 3b196a6..c6209a3 100644 --- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb +++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb @@ -1,6 +1,6 @@ require autoconf.inc -PR = "r1" +PR = "r2" PARALLEL_MAKE = "" @@ -16,6 +16,7 @@ SRC_URI += "file://autoreconf-include.patch \ file://autoheader-nonfatal-warnings.patch \ ${@['file://path_prog_fixes.patch', ''][bb.data.inherits_class('native', d)]} \ file://config_site.patch \ + file://remove-usr-local-lib-from-m4.patch \ " SRC_URI[md5sum] = "864d785215aa60d627c91fcb21b05b07" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 04/14] coreutils: Fix build on uclibc 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (2 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 03/14] autoconf: Remove code checking for hardcoded /usr/local Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 05/14] libmusicbrainz: utilize base_libdir when configured Saul Wold ` (10 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Khem Raj <raj.khem@gmail.com> coreutils has getloadavg.m4 of its own. So we need to make sure that we remove the portions which look into hardcoded /usr/local/lib paths. These tests are only for AIX so we dont lose much Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../remove-usr-local-lib-from-m4.patch | 31 ++++++++++++++++++++ meta/recipes-core/coreutils/coreutils_8.12.bb | 6 ++- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000..aac097a --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.12/remove-usr-local-lib-from-m4.patch @@ -0,0 +1,31 @@ +We have problem using hardcoded directories like /usr/local here +which will be checked for cross builds. This is a special case which +is valid for AIX only. We do not have AIX as one of our supported +build host or target. Therefore we get rid of the hardcoded paths +and make life easier for cross compilation process. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] + +Index: coreutils-8.12/m4/getloadavg.m4 +=================================================================== +--- coreutils-8.12.orig/m4/getloadavg.m4 2011-08-03 14:03:59.982197767 -0700 ++++ coreutils-8.12/m4/getloadavg.m4 2011-08-03 14:04:20.402197763 -0700 +@@ -44,16 +44,6 @@ AC_CHECK_FUNC([getloadavg], [], + [LIBS="-lutil $LIBS" gl_have_func=yes]) + fi + +- if test $gl_have_func = no; then +- # There is a commonly available library for RS/6000 AIX. +- # Since it is not a standard part of AIX, it might be installed locally. +- gl_getloadavg_LIBS=$LIBS +- LIBS="-L/usr/local/lib $LIBS" +- AC_CHECK_LIB([getloadavg], [getloadavg], +- [LIBS="-lgetloadavg $LIBS" gl_have_func=yes], +- [LIBS=$gl_getloadavg_LIBS]) +- fi +- + # Set up the replacement function if necessary. + if test $gl_have_func = no; then + AC_LIBOBJ([getloadavg]) diff --git a/meta/recipes-core/coreutils/coreutils_8.12.bb b/meta/recipes-core/coreutils/coreutils_8.12.bb index 00746b9..0004ce7 100644 --- a/meta/recipes-core/coreutils/coreutils_8.12.bb +++ b/meta/recipes-core/coreutils/coreutils_8.12.bb @@ -7,13 +7,15 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils" LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad" -PR = "r2" +PR = "r3" DEPENDS = "gmp" DEPENDS_virtclass-native = "" inherit autotools gettext -SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz" +SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.gz \ + file://remove-usr-local-lib-from-m4.patch \ + " SRC_URI[md5sum] = "fce7999953a67243d00d75cc86dbcaa6" SRC_URI[sha256sum] = "9e233a62c98a3378a7b0483d2ae3d662dbaf6cd3917d3830d3514665e12a85c8" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 05/14] libmusicbrainz: utilize base_libdir when configured 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (3 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 04/14] coreutils: Fix build on uclibc Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 06/14] libproxy: utilize libdir " Saul Wold ` (9 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> Pass $libdir through when we configure to support a location other than /lib. We also have to tweak the cmake files to allow $libdir to even be set. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- .../allow-libdir-override.patch | 19 +++++++++++++++++++ .../musicbrainz/libmusicbrainz_3.0.3.bb | 7 +++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch new file mode 100644 index 0000000..88f414a --- /dev/null +++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch @@ -0,0 +1,19 @@ +Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont +easily have a way of determining something that patches ${LIB_SUFFIX} so we'll +set LIB_INSTALL_DIR. + +Signed-off-by: Kumar Gala <galak@kernel.crashing.org> + +Index: libmusicbrainz-3.0.3/CMakeLists.txt +=================================================================== +--- libmusicbrainz-3.0.3.orig/CMakeLists.txt ++++ libmusicbrainz-3.0.3/CMakeLists.txt +@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) + SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") + SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) + SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) +-SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) ++SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") + SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb index d6fb2f4..4814b6d 100644 --- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb +++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb @@ -6,12 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \ file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=9ab2846573f560cea7561da472803a72" DEPENDS = "expat neon" -PR = "r2" +PR = "r3" SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${BPN}-${PV}.tar.gz \ - file://fix_build_issue_for_gcc_4.5.0.patch " + file://fix_build_issue_for_gcc_4.5.0.patch \ + file://allow-libdir-override.patch " SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a" SRC_URI[sha256sum] = "7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5" inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir}" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 06/14] libproxy: utilize libdir when configured 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (4 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 05/14] libmusicbrainz: utilize base_libdir when configured Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 07/14] prelink: Add lib64 dirs to prelink.conf Saul Wold ` (8 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> Pass $libdir through when we configure to support a location other than /lib. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/recipes-support/libproxy/libproxy_0.4.6.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/libproxy/libproxy_0.4.6.bb b/meta/recipes-support/libproxy/libproxy_0.4.6.bb index b24e8ba..5ee4979 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.6.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.6.bb @@ -14,12 +14,12 @@ SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz" SRC_URI[md5sum] = "199c6b120baf1f7258a55f38d5ec74f5" SRC_URI[sha256sum] = "9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30" -PR = "r1" +PR = "r2" inherit cmake pkgconfig EXTRA_OECMAKE = "-DWITH_WEBKIT=no -DWITH_GNOME=yes -DWITH_KDE4=no \ - -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no" + -DWITH_PYTHON=no -DWITH_PERL=no -DWITH_MOZJS=no -DWITH_NM=no -DLIB_INSTALL_DIR=${libdir}" FILES_${PN}-dbg += "${libdir}/libproxy/${PV}/plugins/.debug/ ${libdir}/libproxy/${PV}/modules/.debug/" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 07/14] prelink: Add lib64 dirs to prelink.conf 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (5 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 06/14] libproxy: utilize libdir " Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 08/14] tune/arch-powerpc64: include arch-powerpc.inc to keep things in sync Saul Wold ` (7 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> Handle multlib or cases that baselib is lib64. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/recipes-devtools/prelink/prelink/prelink.conf | 8 ++++---- meta/recipes-devtools/prelink/prelink_git.bb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/prelink/prelink/prelink.conf b/meta/recipes-devtools/prelink/prelink/prelink.conf index c5a4f4a..ed30c28 100644 --- a/meta/recipes-devtools/prelink/prelink/prelink.conf +++ b/meta/recipes-devtools/prelink/prelink/prelink.conf @@ -12,7 +12,7 @@ -l /usr/bin -l /usr/X11R6/bin -l /usr/games --l /usr/local/lib --l /lib --l /usr/lib --l /usr/X11R6/lib +-l /usr/local/lib{,64} +-l /lib{,64} +-l /usr/lib{,64} +-l /usr/X11R6/lib{,64} diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb index c653d4d..bb95da7 100644 --- a/meta/recipes-devtools/prelink/prelink_git.bb +++ b/meta/recipes-devtools/prelink/prelink_git.bb @@ -10,7 +10,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" SRCREV = "ac461e73b17253a4da25c5aafeac7193b553156c" PV = "1.0+git${SRCPV}" -PR = "r4" +PR = "r5" # # The cron script attempts to re-prelink the system daily -- on -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 08/14] tune/arch-powerpc64: include arch-powerpc.inc to keep things in sync 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (6 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 07/14] prelink: Add lib64 dirs to prelink.conf Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:27 ` [CONSOLIDATED PULL 09/14] gcc-4.6: Add support for the e5500 PowerPC core Saul Wold ` (6 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> Added a DEFAULTTUNE setting and included arch-powerpc.inc. This way we pick up the changes to TUNE_PKGARCH and things should be kept more in sync going forward. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- .../machine/include/powerpc/arch-powerpc64.inc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc index a965d59..7ef8ddc 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc @@ -1,3 +1,7 @@ +DEFAULTTUNE ?= "powerpc64" + +require conf/machine/include/powerpc/arch-powerpc.inc + TUNEVALID[m64] = "Power ELF64 standard ABI" TUNE_CONFLICTS[m64] = "m32 nf" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 09/14] gcc-4.6: Add support for the e5500 PowerPC core 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (7 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 08/14] tune/arch-powerpc64: include arch-powerpc.inc to keep things in sync Saul Wold @ 2011-08-05 15:27 ` Saul Wold 2011-08-05 15:28 ` [CONSOLIDATED PULL 10/14] image-mklibs.bbclass: Add powerpc64 arch support Saul Wold ` (5 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:27 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> Implements basic e5500 enablement in gcc, with a scheduler, -mcpu flag, etc... Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/recipes-devtools/gcc/gcc-4.6.inc | 3 +- .../gcc/gcc-4.6/powerpc-e5500.patch | 465 ++++++++++++++++++++ 2 files changed, 467 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc index 7d8170c..f952ac8 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6.inc +++ b/meta/recipes-devtools/gcc/gcc-4.6.inc @@ -1,6 +1,6 @@ require gcc-common.inc -PR = "r3" +PR = "r4" # Third digit in PV should be incremented after a minor release # happens from this branch on gcc e.g. currently its 4.6.0 @@ -67,6 +67,7 @@ SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \ file://COLLECT_GCC_OPTIONS.patch \ file://volatile_access_backport.patch \ file://use-defaults.h-and-t-oe-in-B.patch \ + file://powerpc-e5500.patch \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch b/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch new file mode 100644 index 0000000..1f478f3 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch @@ -0,0 +1,465 @@ +Upstream-Status: Pending + +Implements basic e5500 enablement in gcc, with a scheduler, -mcpu +flag, etc... + +Also splits the masks for popcntb, popcntd, and cmpb. Originally those +masks would also control other instructions that e5500 does not +support (so, we either get none or all). + +For the lack of means to do tests, those instructions were never +enabled until now. The new instructions enabled with this patch are: +popcntb, popcntw, popcntd, bpermd, prtyw, prtyd, cmpb, ldbrx, and +stdbrx. + +Signed-off-by: Edmar Wienskoski <edmar@freescale.com> +Signed-off-by: Kumar Gala <galak@kernel.crashing.org> + +Index: gcc-4_6-branch/gcc/config.gcc +=================================================================== +--- gcc-4_6-branch.orig/gcc/config.gcc ++++ gcc-4_6-branch/gcc/config.gcc +@@ -395,7 +395,7 @@ powerpc*-*-*) + extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h" + need_64bit_hwint=yes + case x$with_cpu in +- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell|xa2|xe500mc64) ++ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500) + cpu_is_64bit=yes + ;; + esac +@@ -3493,7 +3493,7 @@ case "${target}" in + | 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \ + | 476 | 476fp | 505 | 601 | 602 | 603 | 603e | ec603e \ + | 604 | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \ +- | a2 | e300c[23] | 854[08] | e500mc | e500mc64 | titan\ ++ | a2 | e300c[23] | 854[08] | e500mc | e500mc64 | e5500 | titan\ + | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell) + # OK + ;; +Index: gcc-4_6-branch/gcc/config/rs6000/e5500.md +=================================================================== +--- /dev/null ++++ gcc-4_6-branch/gcc/config/rs6000/e5500.md +@@ -0,0 +1,176 @@ ++;; Pipeline description for Freescale PowerPC e5500 core. ++;; Copyright (C) 2011 Free Software Foundation, Inc. ++;; Contributed by Edmar Wienskoski (edmar@freescale.com) ++;; ++;; This file is part of GCC. ++;; ++;; GCC is free software; you can redistribute it and/or modify it ++;; under the terms of the GNU General Public License as published ++;; by the Free Software Foundation; either version 3, or (at your ++;; option) any later version. ++;; ++;; GCC is distributed in the hope that it will be useful, but WITHOUT ++;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ++;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public ++;; License for more details. ++;; ++;; You should have received a copy of the GNU General Public License ++;; along with GCC; see the file COPYING3. If not see ++;; <http://www.gnu.org/licenses/>. ++;; ++;; e5500 64-bit SFX(2), CFX, LSU, FPU, BU ++;; Max issue 3 insns/clock cycle (includes 1 branch) ++ ++(define_automaton "e5500_most,e5500_long") ++(define_cpu_unit "e5500_decode_0,e5500_decode_1" "e5500_most") ++ ++;; SFX. ++(define_cpu_unit "e5500_sfx_0,e5500_sfx_1" "e5500_most") ++ ++;; CFX. ++(define_cpu_unit "e5500_cfx_stage0,e5500_cfx_stage1" "e5500_most") ++ ++;; Non-pipelined division. ++(define_cpu_unit "e5500_cfx_div" "e5500_long") ++ ++;; LSU. ++(define_cpu_unit "e5500_lsu" "e5500_most") ++ ++;; FPU. ++(define_cpu_unit "e5500_fpu" "e5500_long") ++ ++;; BU. ++(define_cpu_unit "e5500_bu" "e5500_most") ++ ++;; The following units are used to make the automata deterministic. ++(define_cpu_unit "present_e5500_decode_0" "e5500_most") ++(define_cpu_unit "present_e5500_sfx_0" "e5500_most") ++(presence_set "present_e5500_decode_0" "e5500_decode_0") ++(presence_set "present_e5500_sfx_0" "e5500_sfx_0") ++ ++;; Some useful abbreviations. ++(define_reservation "e5500_decode" ++ "e5500_decode_0|e5500_decode_1+present_e5500_decode_0") ++(define_reservation "e5500_sfx" ++ "e5500_sfx_0|e5500_sfx_1+present_e5500_sfx_0") ++ ++;; SFX. ++(define_insn_reservation "e5500_sfx" 1 ++ (and (eq_attr "type" "integer,insert_word,insert_dword,delayed_compare,\ ++ shift,cntlz,exts") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_sfx") ++ ++(define_insn_reservation "e5500_sfx2" 2 ++ (and (eq_attr "type" "cmp,compare,fast_compare,trap") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_sfx") ++ ++(define_insn_reservation "e5500_delayed" 2 ++ (and (eq_attr "type" "var_shift_rotate,var_delayed_compare,popcnt") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_sfx*2") ++ ++(define_insn_reservation "e5500_two" 2 ++ (and (eq_attr "type" "two") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_decode+e5500_sfx,e5500_sfx") ++ ++(define_insn_reservation "e5500_three" 3 ++ (and (eq_attr "type" "three") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,(e5500_decode+e5500_sfx)*2,e5500_sfx") ++ ++;; SFX - Mfcr. ++(define_insn_reservation "e5500_mfcr" 4 ++ (and (eq_attr "type" "mfcr") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_sfx_0*4") ++ ++;; SFX - Mtcrf. ++(define_insn_reservation "e5500_mtcrf" 1 ++ (and (eq_attr "type" "mtcr") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_sfx_0") ++ ++;; SFX - Mtjmpr. ++(define_insn_reservation "e5500_mtjmpr" 1 ++ (and (eq_attr "type" "mtjmpr,mfjmpr") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_sfx") ++ ++;; CFX - Multiply. ++(define_insn_reservation "e5500_multiply" 4 ++ (and (eq_attr "type" "imul") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_cfx_stage0,e5500_cfx_stage1") ++ ++(define_insn_reservation "e5500_multiply_i" 5 ++ (and (eq_attr "type" "imul2,imul3,imul_compare") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_cfx_stage0,\ ++ e5500_cfx_stage0+e5500_cfx_stage1,e5500_cfx_stage1") ++ ++;; CFX - Divide. ++(define_insn_reservation "e5500_divide" 16 ++ (and (eq_attr "type" "idiv") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_cfx_stage0+e5500_cfx_div,\ ++ e5500_cfx_div*15") ++ ++(define_insn_reservation "e5500_divide_d" 26 ++ (and (eq_attr "type" "ldiv") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_cfx_stage0+e5500_cfx_div,\ ++ e5500_cfx_div*25") ++ ++;; LSU - Loads. ++(define_insn_reservation "e5500_load" 3 ++ (and (eq_attr "type" "load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u,\ ++ load_l,sync") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_lsu") ++ ++(define_insn_reservation "e5500_fpload" 4 ++ (and (eq_attr "type" "fpload,fpload_ux,fpload_u") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_lsu") ++ ++;; LSU - Stores. ++(define_insn_reservation "e5500_store" 3 ++ (and (eq_attr "type" "store,store_ux,store_u,store_c") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_lsu") ++ ++(define_insn_reservation "e5500_fpstore" 3 ++ (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_lsu") ++ ++;; FP. ++(define_insn_reservation "e5500_float" 7 ++ (and (eq_attr "type" "fpsimple,fp,fpcompare,dmul") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_fpu") ++ ++(define_insn_reservation "e5500_sdiv" 20 ++ (and (eq_attr "type" "sdiv") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_fpu*20") ++ ++(define_insn_reservation "e5500_ddiv" 35 ++ (and (eq_attr "type" "ddiv") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_fpu*35") ++ ++;; BU. ++(define_insn_reservation "e5500_branch" 1 ++ (and (eq_attr "type" "jmpreg,branch,isync") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_bu") ++ ++;; BU - CR logical. ++(define_insn_reservation "e5500_cr_logical" 1 ++ (and (eq_attr "type" "cr_logical,delayed_cr") ++ (eq_attr "cpu" "ppce5500")) ++ "e5500_decode,e5500_bu") +Index: gcc-4_6-branch/gcc/config/rs6000/rs6000-opts.h +=================================================================== +--- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000-opts.h ++++ gcc-4_6-branch/gcc/config/rs6000/rs6000-opts.h +@@ -53,6 +53,7 @@ enum processor_type + PROCESSOR_PPCE300C3, + PROCESSOR_PPCE500MC, + PROCESSOR_PPCE500MC64, ++ PROCESSOR_PPCE5500, + PROCESSOR_POWER4, + PROCESSOR_POWER5, + PROCESSOR_POWER6, +Index: gcc-4_6-branch/gcc/config/rs6000/rs6000.c +=================================================================== +--- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000.c ++++ gcc-4_6-branch/gcc/config/rs6000/rs6000.c +@@ -779,6 +779,25 @@ struct processor_costs ppce500mc64_cost + 1, /* prefetch streams /*/ + }; + ++/* Instruction costs on PPCE5500 processors. */ ++static const ++struct processor_costs ppce5500_cost = { ++ COSTS_N_INSNS (5), /* mulsi */ ++ COSTS_N_INSNS (5), /* mulsi_const */ ++ COSTS_N_INSNS (5), /* mulsi_const9 */ ++ COSTS_N_INSNS (5), /* muldi */ ++ COSTS_N_INSNS (14), /* divsi */ ++ COSTS_N_INSNS (14), /* divdi */ ++ COSTS_N_INSNS (7), /* fp */ ++ COSTS_N_INSNS (10), /* dmul */ ++ COSTS_N_INSNS (36), /* sdiv */ ++ COSTS_N_INSNS (66), /* ddiv */ ++ 64, /* cache line size */ ++ 32, /* l1 cache */ ++ 128, /* l2 cache */ ++ 1, /* prefetch streams /*/ ++}; ++ + /* Instruction costs on AppliedMicro Titan processors. */ + static const + struct processor_costs titan_cost = { +@@ -1784,6 +1803,9 @@ static struct rs6000_ptt const processor + | MASK_ISEL}, + {"e500mc64", PROCESSOR_PPCE500MC64, POWERPC_BASE_MASK | MASK_POWERPC64 + | MASK_PPC_GFXOPT | MASK_ISEL}, ++ {"e5500", PROCESSOR_PPCE5500, POWERPC_BASE_MASK | MASK_POWERPC64 ++ | MASK_PPC_GFXOPT | MASK_ISEL | MASK_CMPB | MASK_POPCNTB ++ | MASK_POPCNTD}, + {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT}, + {"970", PROCESSOR_POWER4, + POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64}, +@@ -2741,7 +2763,8 @@ rs6000_option_override_internal (bool gl + : PROCESSOR_DEFAULT)); + + if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3 +- || rs6000_cpu == PROCESSOR_PPCE500MC || rs6000_cpu == PROCESSOR_PPCE500MC64) ++ || rs6000_cpu == PROCESSOR_PPCE500MC || rs6000_cpu == PROCESSOR_PPCE500MC64 ++ || rs6000_cpu == PROCESSOR_PPCE5500) + { + if (TARGET_ALTIVEC) + error ("AltiVec not supported in this target"); +@@ -2842,9 +2865,14 @@ rs6000_option_override_internal (bool gl + user's opinion, though. */ + if (rs6000_block_move_inline_limit == 0 + && (rs6000_cpu == PROCESSOR_PPCE500MC +- || rs6000_cpu == PROCESSOR_PPCE500MC64)) ++ || rs6000_cpu == PROCESSOR_PPCE500MC64 ++ || rs6000_cpu == PROCESSOR_PPCE5500)) + rs6000_block_move_inline_limit = 128; + ++ /* Those machines does not have fsqrt instruction */ ++ if (rs6000_cpu == PROCESSOR_PPCE5500) ++ target_flags &= ~MASK_PPC_GPOPT; ++ + /* store_one_arg depends on expand_block_move to handle at least the + size of reg_parm_stack_space. */ + if (rs6000_block_move_inline_limit < (TARGET_POWERPC64 ? 64 : 32)) +@@ -2976,7 +3004,8 @@ rs6000_option_override_internal (bool gl + #endif + + if (TARGET_E500 || rs6000_cpu == PROCESSOR_PPCE500MC +- || rs6000_cpu == PROCESSOR_PPCE500MC64) ++ || rs6000_cpu == PROCESSOR_PPCE500MC64 ++ || rs6000_cpu == PROCESSOR_PPCE5500) + { + /* The e500 and e500mc do not have string instructions, and we set + MASK_STRING above when optimizing for size. */ +@@ -3023,7 +3052,8 @@ rs6000_option_override_internal (bool gl + || rs6000_cpu == PROCESSOR_POWER6 + || rs6000_cpu == PROCESSOR_POWER7 + || rs6000_cpu == PROCESSOR_PPCE500MC +- || rs6000_cpu == PROCESSOR_PPCE500MC64); ++ || rs6000_cpu == PROCESSOR_PPCE500MC64 ++ || rs6000_cpu == PROCESSOR_PPCE5500); + + /* Allow debug switches to override the above settings. These are set to -1 + in rs6000.opt to indicate the user hasn't directly set the switch. */ +@@ -3245,6 +3275,10 @@ rs6000_option_override_internal (bool gl + rs6000_cost = &ppce500mc64_cost; + break; + ++ case PROCESSOR_PPCE5500: ++ rs6000_cost = &ppce5500_cost; ++ break; ++ + case PROCESSOR_TITAN: + rs6000_cost = &titan_cost; + break; +@@ -23227,6 +23261,7 @@ rs6000_adjust_cost (rtx insn, rtx link, + || rs6000_cpu_attr == CPU_PPC750 + || rs6000_cpu_attr == CPU_PPC7400 + || rs6000_cpu_attr == CPU_PPC7450 ++ || rs6000_cpu_attr == CPU_PPCE5500 + || rs6000_cpu_attr == CPU_POWER4 + || rs6000_cpu_attr == CPU_POWER5 + || rs6000_cpu_attr == CPU_POWER7 +@@ -23771,6 +23806,7 @@ rs6000_issue_rate (void) + case CPU_PPCE300C3: + case CPU_PPCE500MC: + case CPU_PPCE500MC64: ++ case CPU_PPCE5500: + case CPU_TITAN: + return 2; + case CPU_RIOS2: +Index: gcc-4_6-branch/gcc/config/rs6000/rs6000.h +=================================================================== +--- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000.h ++++ gcc-4_6-branch/gcc/config/rs6000/rs6000.h +@@ -168,6 +168,7 @@ + %{mcpu=e300c3: -me300} \ + %{mcpu=e500mc: -me500mc} \ + %{mcpu=e500mc64: -me500mc64} \ ++%{mcpu=e5500: -me5500} \ + %{maltivec: -maltivec} \ + %{mvsx: -mvsx %{!maltivec: -maltivec} %{!mcpu*: %(asm_cpu_power7)}} \ + -many" +@@ -477,13 +478,13 @@ extern int rs6000_vector_align[]; + + #define TARGET_FCTIDZ TARGET_FCFID + #define TARGET_STFIWX TARGET_PPC_GFXOPT +-#define TARGET_LFIWAX TARGET_CMPB +-#define TARGET_LFIWZX TARGET_POPCNTD +-#define TARGET_FCFIDS TARGET_POPCNTD +-#define TARGET_FCFIDU TARGET_POPCNTD +-#define TARGET_FCFIDUS TARGET_POPCNTD +-#define TARGET_FCTIDUZ TARGET_POPCNTD +-#define TARGET_FCTIWUZ TARGET_POPCNTD ++#define TARGET_LFIWAX (TARGET_CMPB && rs6000_cpu != PROCESSOR_PPCE5500) ++#define TARGET_LFIWZX (TARGET_POPCNTD && rs6000_cpu != PROCESSOR_PPCE5500) ++#define TARGET_FCFIDS TARGET_LFIWZX ++#define TARGET_FCFIDU TARGET_LFIWZX ++#define TARGET_FCFIDUS TARGET_LFIWZX ++#define TARGET_FCTIDUZ TARGET_LFIWZX ++#define TARGET_FCTIWUZ TARGET_LFIWZX + + /* E500 processors only support plain "sync", not lwsync. */ + #define TARGET_NO_LWSYNC TARGET_E500 +@@ -494,10 +495,12 @@ extern int rs6000_vector_align[]; + + #define TARGET_FRE (TARGET_HARD_FLOAT && TARGET_FPRS \ + && TARGET_DOUBLE_FLOAT \ +- && (TARGET_POPCNTB || VECTOR_UNIT_VSX_P (DFmode))) ++ && (TARGET_POPCNTB || VECTOR_UNIT_VSX_P (DFmode)) \ ++ && rs6000_cpu != PROCESSOR_PPCE5500) + + #define TARGET_FRSQRTES (TARGET_HARD_FLOAT && TARGET_POPCNTB \ +- && TARGET_FPRS && TARGET_SINGLE_FLOAT) ++ && TARGET_FPRS && TARGET_SINGLE_FLOAT \ ++ && rs6000_cpu != PROCESSOR_PPCE5500) + + #define TARGET_FRSQRTE (TARGET_HARD_FLOAT && TARGET_FPRS \ + && TARGET_DOUBLE_FLOAT \ +Index: gcc-4_6-branch/gcc/config/rs6000/rs6000.md +=================================================================== +--- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000.md ++++ gcc-4_6-branch/gcc/config/rs6000/rs6000.md +@@ -126,7 +126,7 @@ + \f + ;; Define an insn type attribute. This is used in function unit delay + ;; computations. +-(define_attr "type" "integer,two,three,load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u,store,store_ux,store_u,fpload,fpload_ux,fpload_u,fpstore,fpstore_ux,fpstore_u,vecload,vecstore,imul,imul2,imul3,lmul,idiv,ldiv,insert_word,branch,cmp,fast_compare,compare,var_delayed_compare,delayed_compare,imul_compare,lmul_compare,fpcompare,cr_logical,delayed_cr,mfcr,mfcrf,mtcr,mfjmpr,mtjmpr,fp,fpsimple,dmul,sdiv,ddiv,ssqrt,dsqrt,jmpreg,brinc,vecsimple,veccomplex,vecdiv,veccmp,veccmpsimple,vecperm,vecfloat,vecfdiv,isync,sync,load_l,store_c,shift,trap,insert_dword,var_shift_rotate,cntlz,exts,mffgpr,mftgpr,isel" ++(define_attr "type" "integer,two,three,load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u,store,store_ux,store_u,fpload,fpload_ux,fpload_u,fpstore,fpstore_ux,fpstore_u,vecload,vecstore,imul,imul2,imul3,lmul,idiv,ldiv,insert_word,branch,cmp,fast_compare,compare,var_delayed_compare,delayed_compare,imul_compare,lmul_compare,fpcompare,cr_logical,delayed_cr,mfcr,mfcrf,mtcr,mfjmpr,mtjmpr,fp,fpsimple,dmul,sdiv,ddiv,ssqrt,dsqrt,jmpreg,brinc,vecsimple,veccomplex,vecdiv,veccmp,veccmpsimple,vecperm,vecfloat,vecfdiv,isync,sync,load_l,store_c,shift,trap,insert_dword,var_shift_rotate,cntlz,exts,mffgpr,mftgpr,isel,popcnt" + (const_string "integer")) + + ;; Define floating point instruction sub-types for use with Xfpu.md +@@ -148,7 +148,7 @@ + ;; Processor type -- this attribute must exactly match the processor_type + ;; enumeration in rs6000.h. + +-(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc476,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,ppce500mc,ppce500mc64,power4,power5,power6,power7,cell,ppca2,titan" ++(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc476,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,ppce500mc,ppce500mc64,ppce5500,power4,power5,power6,power7,cell,ppca2,titan" + (const (symbol_ref "rs6000_cpu_attr"))) + + +@@ -176,6 +176,7 @@ + (include "e300c2c3.md") + (include "e500mc.md") + (include "e500mc64.md") ++(include "e5500.md") + (include "power4.md") + (include "power5.md") + (include "power6.md") +@@ -2302,13 +2303,17 @@ + (unspec:GPR [(match_operand:GPR 1 "gpc_reg_operand" "r")] + UNSPEC_POPCNTB))] + "TARGET_POPCNTB" +- "popcntb %0,%1") ++ "popcntb %0,%1" ++ [(set_attr "length" "4") ++ (set_attr "type" "popcnt")]) + + (define_insn "popcntd<mode>2" + [(set (match_operand:GPR 0 "gpc_reg_operand" "=r") + (popcount:GPR (match_operand:GPR 1 "gpc_reg_operand" "r")))] + "TARGET_POPCNTD" +- "popcnt<wd> %0,%1") ++ "popcnt<wd> %0,%1" ++ [(set_attr "length" "4") ++ (set_attr "type" "popcnt")]) + + (define_expand "popcount<mode>2" + [(set (match_operand:GPR 0 "gpc_reg_operand" "") +@@ -5957,10 +5962,10 @@ + && ((TARGET_PPC_GFXOPT + && !HONOR_NANS (<MODE>mode) + && !HONOR_SIGNED_ZEROS (<MODE>mode)) +- || TARGET_CMPB ++ || TARGET_LFIWAX + || VECTOR_UNIT_VSX_P (<MODE>mode))" + { +- if (TARGET_CMPB || VECTOR_UNIT_VSX_P (<MODE>mode)) ++ if (TARGET_LFIWAX || VECTOR_UNIT_VSX_P (<MODE>mode)) + { + emit_insn (gen_copysign<mode>3_fcpsgn (operands[0], operands[1], + operands[2])); +@@ -5979,7 +5984,7 @@ + (unspec:SFDF [(match_operand:SFDF 1 "gpc_reg_operand" "<rreg2>") + (match_operand:SFDF 2 "gpc_reg_operand" "<rreg2>")] + UNSPEC_COPYSIGN))] +- "TARGET_CMPB && !VECTOR_UNIT_VSX_P (<MODE>mode)" ++ "TARGET_LFIWAX && !VECTOR_UNIT_VSX_P (<MODE>mode)" + "fcpsgn %0,%2,%1" + [(set_attr "type" "fp")]) + -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 10/14] image-mklibs.bbclass: Add powerpc64 arch support 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (8 preceding siblings ...) 2011-08-05 15:27 ` [CONSOLIDATED PULL 09/14] gcc-4.6: Add support for the e5500 PowerPC core Saul Wold @ 2011-08-05 15:28 ` Saul Wold 2011-08-05 15:28 ` [CONSOLIDATED PULL 11/14] image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib Saul Wold ` (4 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:28 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> powerp64 dynamic loader is 'ld64.so.1'. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/classes/image-mklibs.bbclass | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index 9f5a4ea..d6630c4 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -19,6 +19,9 @@ mklibs_optimize_image_doit() { powerpc | mips | microblaze ) dynamic_loader="/lib/ld.so.1" ;; + powerpc64) + dynamic_loader="${base_libdir}/ld64.so.1" + ;; x86_64) dynamic_loader="/lib/ld-linux-x86-64.so.2" ;; -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 11/14] image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (9 preceding siblings ...) 2011-08-05 15:28 ` [CONSOLIDATED PULL 10/14] image-mklibs.bbclass: Add powerpc64 arch support Saul Wold @ 2011-08-05 15:28 ` Saul Wold 2011-08-05 15:28 ` [CONSOLIDATED PULL 12/14] dpkg: Update to use perlnative Saul Wold ` (3 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:28 UTC (permalink / raw) To: openembedded-core From: Kumar Gala <galak@kernel.crashing.org> We might redefine ${base_libdir} from being set to just /lib. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- meta/classes/image-mklibs.bbclass | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index d6630c4..69dac2f 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -17,19 +17,19 @@ mklibs_optimize_image_doit() { case ${TARGET_ARCH} in powerpc | mips | microblaze ) - dynamic_loader="/lib/ld.so.1" + dynamic_loader="${base_libdir}/ld.so.1" ;; powerpc64) dynamic_loader="${base_libdir}/ld64.so.1" ;; x86_64) - dynamic_loader="/lib/ld-linux-x86-64.so.2" + dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" ;; i586 ) - dynamic_loader="/lib/ld-linux.so.2" + dynamic_loader="${base_libdir}/ld-linux.so.2" ;; arm ) - dynamic_loader="/lib/ld-linux.so.3" + dynamic_loader="${base_libdir}/ld-linux.so.3" ;; * ) dynamic_loader="/unknown_dynamic_linker" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 12/14] dpkg: Update to use perlnative 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (10 preceding siblings ...) 2011-08-05 15:28 ` [CONSOLIDATED PULL 11/14] image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib Saul Wold @ 2011-08-05 15:28 ` Saul Wold 2011-08-05 15:28 ` [CONSOLIDATED PULL 13/14] linux-yocto_3.0: Fix SRC_URI to use yoctoproject.org Saul Wold ` (2 subsequent siblings) 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:28 UTC (permalink / raw) To: openembedded-core [YOCTO #1298] Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-devtools/dpkg/dpkg.inc | 4 +++- meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index c8ff182..041eda9 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -2,6 +2,8 @@ DESCRIPTION = "Package maintenance system for Debian." LICENSE = "GPL" SECTION = "base" +INC_PR = "r4" + SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \ file://ignore_extra_fields.patch;patch=1" @@ -14,7 +16,7 @@ S = "${WORKDIR}/${BPN}-${PV}" PARALLEL_MAKE = "" -inherit autotools gettext +inherit autotools gettext perlnative DPKG_INIT_POSITION = "98" diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb index 22edab8..48b6278 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb @@ -8,7 +8,7 @@ SRC_URI += "file://noman.patch;patch=1 \ SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc" SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5" -PR = "r3" +PR = "${INC_PR}.0" EXTRA_OECONF = "--without-static-progs \ --without-dselect \ -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 13/14] linux-yocto_3.0: Fix SRC_URI to use yoctoproject.org 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (11 preceding siblings ...) 2011-08-05 15:28 ` [CONSOLIDATED PULL 12/14] dpkg: Update to use perlnative Saul Wold @ 2011-08-05 15:28 ` Saul Wold 2011-08-05 15:28 ` [CONSOLIDATED PULL 14/14] libzypp: Increase the size of the arch compat table Saul Wold 2011-08-05 16:17 ` [CONSOLIDATED PULL 00/14] Richard Purdie 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:28 UTC (permalink / raw) To: openembedded-core Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb index 8f49668..ead9d7c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -26,7 +26,7 @@ PR = "r0" PV = "${LINUX_VERSION}+git${SRCPV}" SRCREV_FORMAT = "meta_machine" -SRC_URI = "git://git.pokylinux.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" +SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)" -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [CONSOLIDATED PULL 14/14] libzypp: Increase the size of the arch compat table 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (12 preceding siblings ...) 2011-08-05 15:28 ` [CONSOLIDATED PULL 13/14] linux-yocto_3.0: Fix SRC_URI to use yoctoproject.org Saul Wold @ 2011-08-05 15:28 ` Saul Wold 2011-08-05 16:17 ` [CONSOLIDATED PULL 00/14] Richard Purdie 14 siblings, 0 replies; 16+ messages in thread From: Saul Wold @ 2011-08-05 15:28 UTC (permalink / raw) To: openembedded-core From: Mark Hatle <mark.hatle@windriver.com> Fix [YOCTO #1313] Increase the size of the arch compat table to 30 entries. Also cleanup a few things related to Poky -> OE name changing. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Fixed up arm patch Signed-off-by: Saul Wold <sgw@linux.intel.com> --- .../arm-workaround-global-constructor.patch | 23 ++++--- .../libzypp/libzypp/libzypp-compatargs.patch | 54 +++++++++++++++ ...libzypp-pokyarch.patch => libzypp-oearch.patch} | 24 ++++---- meta/recipes-extended/libzypp/libzypp_git.bb | 69 ++++++++++---------- 4 files changed, 113 insertions(+), 57 deletions(-) create mode 100644 meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch rename meta/recipes-extended/libzypp/libzypp/{libzypp-pokyarch.patch => libzypp-oearch.patch} (98%) diff --git a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch b/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch index 86458d7..bfdb29b 100644 --- a/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch +++ b/meta/recipes-extended/libzypp/libzypp/arm-workaround-global-constructor.patch @@ -8,14 +8,15 @@ before the usage of _foo during the initialization of the compatibility table. The patch, along with a similar change to the recipe generation of the -poky-arch.h file, remove the DEF_BUILTIN globals and replace them with +oe-arch.h file, remove the DEF_BUILTIN globals and replace them with immediate strings wherever they are used. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc ---- git.orig/zypp/Arch.cc 2011-03-29 14:15:32.695079271 -0500 -+++ git/zypp/Arch.cc 2011-03-29 14:17:22.680910025 -0500 +Index: git/zypp/Arch.cc +=================================================================== +--- git.orig/zypp/Arch.cc 2011-08-04 21:03:31.000000000 -0700 ++++ git/zypp/Arch.cc 2011-08-04 21:04:16.635480895 -0700 @@ -152,13 +152,10 @@ // NOTE: Thake care CompatBits::IntT is able to provide one // bit for each architecture. @@ -24,13 +25,13 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc - DEF_BUILTIN( all ); - DEF_BUILTIN( any ); - DEF_BUILTIN( noarch ); - --#include "poky-arch.h" --#undef DEF_BUILTIN +/* Global constructors are not working properly on ARM, avoid the + * known bad case and merge constructors in with the usages + */ +-#include "oe-arch.h" +-#undef DEF_BUILTIN + /////////////////////////////////////////////////////////////////// // @@ -227,9 +224,9 @@ @@ -46,7 +47,7 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc /////////////////////////////////////////////////////////////////// // Define the CompatibleWith relation: // -@@ -305,9 +302,9 @@ +@@ -331,9 +328,9 @@ /////////////////////////////////////////////////////////////////// const Arch Arch_empty ( IdString::Empty ); @@ -57,9 +58,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc + const Arch Arch_any( IdString ( "any" ) ); + const Arch Arch_noarch( IdString ( "noarch" ) ); - #define POKY_PROTO 1 - #include "poky-arch.h" -@@ -316,7 +316,7 @@ + #define OE_PROTO 1 + #include "oe-arch.h" +@@ -345,7 +342,7 @@ // METHOD TYPE : Ctor // Arch::Arch() diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch new file mode 100644 index 0000000..9cd7a36 --- /dev/null +++ b/meta/recipes-extended/libzypp/libzypp/libzypp-compatargs.patch @@ -0,0 +1,54 @@ +zypp/Arch.cc: Add room for additional architecture compatibilities + +Upstream-status: Pending + +Increase the size of the compatibility table from 9 to 30. There are already +existing checks within libzypp to ensure that we don't overflow the 64-bit +architecture field, so nothing further was required. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc +--- git.orig/zypp/Arch.cc 2011-08-02 16:40:37.696662889 -0500 ++++ git/zypp/Arch.cc 2011-08-04 11:24:18.051745246 -0500 +@@ -280,13 +280,39 @@ + IdString arch6_r = IdString(), + IdString arch7_r = IdString(), + IdString arch8_r = IdString(), +- IdString arch9_r = IdString() ) ++ IdString arch9_r = IdString(), ++ IdString arch10_r = IdString(), ++ IdString arch11_r = IdString(), ++ IdString arch12_r = IdString(), ++ IdString arch13_r = IdString(), ++ IdString arch14_r = IdString(), ++ IdString arch15_r = IdString(), ++ IdString arch16_r = IdString(), ++ IdString arch17_r = IdString(), ++ IdString arch18_r = IdString(), ++ IdString arch19_r = IdString(), ++ IdString arch20_r = IdString(), ++ IdString arch21_r = IdString(), ++ IdString arch22_r = IdString(), ++ IdString arch23_r = IdString(), ++ IdString arch24_r = IdString(), ++ IdString arch25_r = IdString(), ++ IdString arch26_r = IdString(), ++ IdString arch27_r = IdString(), ++ IdString arch28_r = IdString(), ++ IdString arch29_r = IdString(), ++ IdString arch30_r = IdString() ) + { + const CompatEntry & target( assertCompatSetEntry( targetArch_r ) ); + target.addCompatBit( assertCompatSetEntry( arch0_r )._idBit ); + #define _SETARG(N) if ( arch##N##_r.empty() ) return; target.addCompatBit( assertCompatSetEntry( arch##N##_r )._idBit ) + _SETARG(1); _SETARG(2); _SETARG(3); _SETARG(4); + _SETARG(5); _SETARG(6); _SETARG(7); _SETARG(8); _SETARG(9); ++ _SETARG(10); _SETARG(11); _SETARG(12); _SETARG(13); _SETARG(14); ++ _SETARG(15); _SETARG(16); _SETARG(17); _SETARG(18); _SETARG(19); ++ _SETARG(20); _SETARG(21); _SETARG(22); _SETARG(23); _SETARG(24); ++ _SETARG(25); _SETARG(26); _SETARG(27); _SETARG(28); _SETARG(29); ++ _SETARG(30); + #undef _SETARG + } + diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-pokyarch.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch similarity index 98% rename from meta/recipes-extended/libzypp/libzypp/libzypp-pokyarch.patch rename to meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch index 1eab1e8..9a0e42b 100644 --- a/meta/recipes-extended/libzypp/libzypp/libzypp-pokyarch.patch +++ b/meta/recipes-extended/libzypp/libzypp/libzypp-oearch.patch @@ -3,7 +3,7 @@ Upstream-Status: Inappropriate [distribution] Disable all of the internal architectures We disable all of the internal architectures and replace them with ones -generated by the libzypp recipe as specified in the poky-arch.h. +generated by the libzypp recipe as specified in the oe-arch.h. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> @@ -148,7 +148,7 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc - - DEF_BUILTIN( sh4 ); - DEF_BUILTIN( sh4a ); -+#include "poky-arch.h" ++#include "oe-arch.h" #undef DEF_BUILTIN /////////////////////////////////////////////////////////////////// @@ -211,9 +211,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc - // - defCompatibleWith( _sh4, _noarch ); - defCompatibleWith( _sh4a, _noarch,_sh4 ); -+#define POKY_DEF_COMPAT 1 -+#include "poky-arch.h" -+#undef POKY_DEF_COMPAT ++#define OE_DEF_COMPAT 1 ++#include "oe-arch.h" ++#undef OE_DEF_COMPAT // /////////////////////////////////////////////////////////////////// // dumpOn( USR ) << endl; @@ -270,9 +270,9 @@ diff -ur git.orig/zypp/Arch.cc git/zypp/Arch.cc - - const Arch Arch_sh4( _sh4 ); - const Arch Arch_sh4a( _sh4a ); -+#define POKY_PROTO 1 -+#include "poky-arch.h" -+#undef POKY_PROTO ++#define OE_PROTO 1 ++#include "oe-arch.h" ++#undef OE_PROTO /////////////////////////////////////////////////////////////////// // @@ -398,9 +398,9 @@ diff -ur git.orig/zypp/Arch.h git/zypp/Arch.h - extern const Arch Arch_sh4; - /** \relates Arch */ - extern const Arch Arch_sh4a; -+#define POKY_EXTERN_PROTO 1 -+#include "poky-arch.h" -+#undef POKY_EXTERN_PROTO ++#define OE_EXTERN_PROTO 1 ++#include "oe-arch.h" ++#undef OE_EXTERN_PROTO //@} /////////////////////////////////////////////////////////////////// @@ -411,7 +411,7 @@ diff -ur git.orig/zypp/CMakeLists.txt git/zypp/CMakeLists.txt SET( zypp_HEADERS Arch.h -+ poky-arch.h ++ oe-arch.h AutoDispose.h Bit.h ByteCount.h diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb index bb36a90..1fc6809 100644 --- a/meta/recipes-extended/libzypp/libzypp_git.bb +++ b/meta/recipes-extended/libzypp/libzypp_git.bb @@ -14,16 +14,17 @@ RDEPENDS_${PN} = "sat-solver" S = "${WORKDIR}/git" SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" PV = "0.0-git${SRCPV}" -PR = "r12" +PR = "r13" SRC_URI = "git://gitorious.org/opensuse/libzypp.git;protocol=git \ file://no-doc.patch \ file://rpm5.patch \ file://rpm5-no-rpmdbinit.patch \ file://config-release.patch \ - file://libzypp-pokyarch.patch \ + file://libzypp-oearch.patch \ + file://libzypp-compatargs.patch \ file://fix_for_compile_wth_gcc-4.6.0.patch \ - file://hardcode-lib-fix.patch \ + file://hardcode-lib-fix.patch \ " SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" @@ -49,57 +50,57 @@ AVOID_CONSTRUCTOR_mips = "true" do_archgen () { # We need to dynamically generate our arch file based on the machine # configuration - echo "/* Automatically generated by the libzypp recipes */" > zypp/poky-arch.h - echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h - echo "#ifndef POKY_ARCH_H" >> zypp/poky-arch.h - echo "#define POKY_ARCH_H 1" >> zypp/poky-arch.h - echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/poky-arch.h - echo "#endif /* POKY_ARCH_H */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h + echo "/* Automatically generated by the libzypp recipes */" > zypp/oe-arch.h + echo "/* Avoid Constructor: ${AVOID_CONSTRUCTOR} */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h + echo "#ifndef OE_ARCH_H" >> zypp/oe-arch.h + echo "#define OE_ARCH_H 1" >> zypp/oe-arch.h + echo "#define Arch_machine Arch_${MACHINE_ARCH}" | tr - _ >> zypp/oe-arch.h + echo "#endif /* OE_ARCH_H */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then - echo "#ifdef DEF_BUILTIN" >> zypp/poky-arch.h - echo "/* Specify builtin types */" >> zypp/poky-arch.h + echo "#ifdef DEF_BUILTIN" >> zypp/oe-arch.h + echo "/* Specify builtin types */" >> zypp/oe-arch.h for each_arch in ${PACKAGE_ARCHS} ; do case "$each_arch" in all | any | noarch) continue;; esac - echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/poky-arch.h + echo " DEF_BUILTIN( ${each_arch} );" | tr - _ >> zypp/oe-arch.h done - echo "#endif /* DEF_BUILTIN */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h + echo "#endif /* DEF_BUILTIN */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h fi - echo "#ifdef POKY_EXTERN_PROTO" >> zypp/poky-arch.h - echo "/* Specify extern prototypes */" >> zypp/poky-arch.h + echo "#ifdef OE_EXTERN_PROTO" >> zypp/oe-arch.h + echo "/* Specify extern prototypes */" >> zypp/oe-arch.h for each_arch in ${PACKAGE_ARCHS} ; do case "$each_arch" in all | any | noarch) continue;; esac - echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/poky-arch.h + echo " extern const Arch Arch_${each_arch};" | tr - _ >> zypp/oe-arch.h done - echo "#endif /* POKY_EXTERN_PROTO */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h - echo "#ifdef POKY_PROTO" >> zypp/poky-arch.h - echo "/* Specify prototypes */" >> zypp/poky-arch.h + echo "#endif /* OE_EXTERN_PROTO */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h + echo "#ifdef OE_PROTO" >> zypp/oe-arch.h + echo "/* Specify prototypes */" >> zypp/oe-arch.h for each_arch in ${PACKAGE_ARCHS} ; do case "$each_arch" in all | any | noarch) continue;; esac if [ "${AVOID_CONSTRUCTOR}" != "true" ]; then - echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h - echo "(_${each_arch});" >> zypp/poky-arch.h + echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h + echo "(_${each_arch});" >> zypp/oe-arch.h else - echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/poky-arch.h - echo "( IdString ( \"${each_arch}\" ) );" >> zypp/poky-arch.h + echo -n " const Arch Arch_${each_arch} " | tr - _ >> zypp/oe-arch.h + echo "( IdString ( \"${each_arch}\" ) );" >> zypp/oe-arch.h fi done - echo "#endif /* POKY_PROTO */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h - echo "#ifdef POKY_DEF_COMPAT" >> zypp/poky-arch.h - echo "/* Specify compatibility information */" >> zypp/poky-arch.h + echo "#endif /* OE_PROTO */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h + echo "#ifdef OE_DEF_COMPAT" >> zypp/oe-arch.h + echo "/* Specify compatibility information */" >> zypp/oe-arch.h INSTALL_PLATFORM_ARCHS="" for each_arch in ${PACKAGE_ARCHS} ; do INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS" @@ -134,10 +135,10 @@ do_archgen () { COMPAT_WITH="${CARCH},${COMPAT} $COMPAT_WITH" done for each_compat in ${COMPAT_WITH} ; do - echo " defCompatibleWith( ${each_compat} );" >> zypp/poky-arch.h + echo " defCompatibleWith( ${each_compat} );" >> zypp/oe-arch.h done - echo "#endif /* DEF_COMPAT */" >> zypp/poky-arch.h - echo "" >> zypp/poky-arch.h + echo "#endif /* DEF_COMPAT */" >> zypp/oe-arch.h + echo "" >> zypp/oe-arch.h } addtask archgen before do_configure after do_patch -- 1.7.3.4 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [CONSOLIDATED PULL 00/14] 2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold ` (13 preceding siblings ...) 2011-08-05 15:28 ` [CONSOLIDATED PULL 14/14] libzypp: Increase the size of the arch compat table Saul Wold @ 2011-08-05 16:17 ` Richard Purdie 14 siblings, 0 replies; 16+ messages in thread From: Richard Purdie @ 2011-08-05 16:17 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Fri, 2011-08-05 at 08:27 -0700, Saul Wold wrote: > Richard, > > This Set includes changes multilib and ppc64, you may want to > review the ppc64 changes. > > Thanks > Sau! > > The following changes since commit 8a731122e7811275f20065ba27645b97fadf362d: > > eglibc: Fix patch merge breakage (2011-08-04 15:41:08 +0100) > > are available in the git repository at: > git://git.openembedded.org/openembedded-core-contrib sgw/stage > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage > > Beth Flanagan (1): > buildstats.bbclass: Adding disk io measurement > > Khem Raj (3): > autoconf: Remove patch=1 from SRC_URI > autoconf: Remove code checking for hardcoded /usr/local > coreutils: Fix build on uclibc > > Kumar Gala (7): > libmusicbrainz: utilize base_libdir when configured > libproxy: utilize libdir when configured > prelink: Add lib64 dirs to prelink.conf > tune/arch-powerpc64: include arch-powerpc.inc to keep things in sync > gcc-4.6: Add support for the e5500 PowerPC core > image-mklibs.bbclass: Add powerpc64 arch support > image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib > > Mark Hatle (1): > libzypp: Increase the size of the arch compat table > > Saul Wold (2): > dpkg: Update to use perlnative > linux-yocto_3.0: Fix SRC_URI to use yoctoproject.org Merged to master since most of these have been floating around for a while and undergone a few rounds of review. The ppc64s look good, thanks Kumar for working through the details! Cheers, Richard ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2011-08-05 16:22 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-05 15:27 [CONSOLIDATED PULL 00/14] Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 01/14] buildstats.bbclass: Adding disk io measurement Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 02/14] autoconf: Remove patch=1 from SRC_URI Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 03/14] autoconf: Remove code checking for hardcoded /usr/local Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 04/14] coreutils: Fix build on uclibc Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 05/14] libmusicbrainz: utilize base_libdir when configured Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 06/14] libproxy: utilize libdir " Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 07/14] prelink: Add lib64 dirs to prelink.conf Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 08/14] tune/arch-powerpc64: include arch-powerpc.inc to keep things in sync Saul Wold
2011-08-05 15:27 ` [CONSOLIDATED PULL 09/14] gcc-4.6: Add support for the e5500 PowerPC core Saul Wold
2011-08-05 15:28 ` [CONSOLIDATED PULL 10/14] image-mklibs.bbclass: Add powerpc64 arch support Saul Wold
2011-08-05 15:28 ` [CONSOLIDATED PULL 11/14] image-mklibs.bbclass: Utilize ${base_libdir} instead of static /lib Saul Wold
2011-08-05 15:28 ` [CONSOLIDATED PULL 12/14] dpkg: Update to use perlnative Saul Wold
2011-08-05 15:28 ` [CONSOLIDATED PULL 13/14] linux-yocto_3.0: Fix SRC_URI to use yoctoproject.org Saul Wold
2011-08-05 15:28 ` [CONSOLIDATED PULL 14/14] libzypp: Increase the size of the arch compat table Saul Wold
2011-08-05 16:17 ` [CONSOLIDATED PULL 00/14] Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.