[oe-commits] org.oe.dev merge of 'ca64733fdcd777798e0a455c06c3a4f22c39edcc'
oe commit
openembedded-commits at lists.openembedded.org
Tue Aug 14 14:43:37 UTC 2007
merge of 'ca64733fdcd777798e0a455c06c3a4f22c39edcc'
and 'f8fdacfa8f57faee589fa77524dbae4f97928b5d'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5da1612b322f56f442443b8546bbe8e7a75289f3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5da1612b322f56f442443b8546bbe8e7a75289f3
Files:
1
packages/sylpheed/claws-mail.inc
packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch
packages/linux/linux-nokia800.inc
packages/maemo/nokia770-init_1.0.bb
Diffs:
#
# mt diff -rca64733fdcd777798e0a455c06c3a4f22c39edcc -r5da1612b322f56f442443b8546bbe8e7a75289f3
#
#
#
# patch "packages/sylpheed/claws-mail.inc"
# from [70dc56c3455d2a0844a513547e62dd0a066acb6f]
# to [e5e9e5019fbe720b04bda75c8c0d5f602d636ffa]
#
============================================================
--- packages/sylpheed/claws-mail.inc 70dc56c3455d2a0844a513547e62dd0a066acb6f
+++ packages/sylpheed/claws-mail.inc e5e9e5019fbe720b04bda75c8c0d5f602d636ffa
@@ -33,19 +33,11 @@ inherit autotools pkgconfig
inherit autotools pkgconfig
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
do_install_append() {
install -d ${D}${datadir}/applications
install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
install -d ${D}${datadir}/pixmaps
install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
- mv ${D}${bindir}/${TARGET_SYS}-claws-mail ${D}${bindir}/${PN}
}
do_stage () {
#
# mt diff -rf8fdacfa8f57faee589fa77524dbae4f97928b5d -r5da1612b322f56f442443b8546bbe8e7a75289f3
#
#
#
# patch "packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch"
# from [eb6ef0f41d90a05bda1c5c5828dd17a7b6f6ca60]
# to [c56995add77d0c6266cf96e014fae27ba0b1ec1d]
#
# patch "packages/linux/linux-nokia800.inc"
# from [9c6cddb232a5b4c68ca6421351f0715a67a4a91a]
# to [c099bf50d2367d56a7a7f92d7972a909ef3f1c8b]
#
# patch "packages/maemo/nokia770-init_1.0.bb"
# from [e5a60e0b7b8720865500e60e11655879f7deab18]
# to [e3c214434e1d0078821d1182c096dd223935d40c]
#
============================================================
--- packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch eb6ef0f41d90a05bda1c5c5828dd17a7b6f6ca60
+++ packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch c56995add77d0c6266cf96e014fae27ba0b1ec1d
@@ -1,327 +1,30 @@
+---
+ arch/arm/oprofile/op_model_v6.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+Index: linux-g/arch/arm/oprofile/op_model_v6.c
+===================================================================
+--- linux-g.orig/arch/arm/oprofile/op_model_v6.c 2006-11-08 12:18:41.000000000 +0000
++++ linux-g/arch/arm/oprofile/op_model_v6.c 2007-05-23 14:11:19.000000000 +0100
+@@ -54,12 +54,6 @@
+ #define EVT_DCACHE_MISS 0x0B
+ #define EVT_DCACE_WRITE_BACK 0x0C
+ #define EVT_PC_CHANGED 0x0D
+-#define EVT_BCU_REQUEST 0x10
+-#define EVT_BCU_FULL 0x11
+-#define EVT_BCU_DRAIN 0x12
+-#define EVT_BCU_ECC_NO_ELOG 0x14
+-#define EVT_BCU_1_BIT_ERR 0x15
+-#define EVT_RMW 0x16
+ /* EVT_CCNT is not hardware defined */
+ #define EVT_CCNT 0xFE
+ #define EVT_UNUSED 0xFF
+@@ -88,7 +82,7 @@ struct pmu_type {
+ static struct pmu_type pmu_parms[] = {
+ {
+ .id = PMU_ARM11,
+- .name = "arm/arm11",
++ .name = "arm/armv6",
+ .num_counters = 3,
+ #ifdef CONFIG_ARCH_OMAP2
+ .interrupt = 3,
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/loose.dtd">
-<!-- ViewCVS - http://viewcvs.sourceforge.net/
-by Greg Stein - mailto:gstein at lyra.org -->
-<html>
-<head>
-<title>OpenedHand SVN Repository - log - poky: trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch</title>
-<meta name="generator" content="ViewCVS 1.0-dev">
-<link rel="stylesheet" href="/doc//styles.css" type="text/css">
-</head>
-<body>
-<div class="vc_navheader">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td align="left"><a href="/view/poky/?rev=1770#dirlist">[poky]</a> / <a href="/view/poky/trunk/?rev=1770#dirlist">trunk</a> / <a href="/view/poky/trunk/meta/?rev=1770#dirlist">meta</a> / <a href="/view/poky/trunk/meta/packages/?rev=1770#dirlist">packages</a> / <a href="/view/poky/trunk/meta/packages/linux/?rev=1770#dirlist">linux</a> / <a href="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/?rev=1770#dirlist">linux-nokia800-2.6.18-osso40</a> / fix_oprofile.patch</td>
-<td align="right">
-
-<form method=get action="/view/poky/">
-
-<b>Project Root:</b>
-<select name="root" onchange="submit()">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<optgroup label="Subversion Repositories"><option>clutter</option><option>contacts</option><option>dates</option><option>didiwiki</option><option>eds-dbus</option><option>gupnp</option><option>matchbox</option><option>misc</option><option>oprofileui</option><option selected>poky</option><option>sato</option><option>sync</option><option>tasks</option></optgroup>
-
-</select>
-<input type=submit value="Go">
-</form>
-
-</td>
-</tr>
-</table>
-</div>
-<div id="header">
-<h1>OpenedHand SVN Repository</h1>
-</div>
-<h1>poky: trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch</h1>
-
-<hr noshade>
-
-No default branch
-
-<br>
-
-
-
-
-
-
-
-<hr size=1 noshade>
-
-
-
-
-<a name="rev1770"></a>
-
-
-Revision <a href="/view/poky?rev=1770&view=rev"><b>1770</b></a>
- -
-(<a href="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch?rev=1770&view=markup">view</a>)
-(<a href="/view/*checkout*/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch?rev=1770">download</a>)
-
-
-
-
-
-- <a href="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch?rev=1770&r1=1770&view=log">[select for diffs]</a>
-
-
-
-
-<br>
-
-Added
-
-<i>Wed May 23 15:22:08 2007 UTC</i> (2 months, 3 weeks ago) by <i>richard</i>
-
-
-
-
-
-
-<br>File length: 994 byte(s)</b>
-
-
-
-
-
-
-
-
-
-
-<pre class="vc_log">linux-nokia800: Add oprofile mismatch workaround, update to osso40</pre>
-
-
-
-
-
-<a name="diff"></a>
-<hr noshade>
-This form allows you to request diffs between any two revisions of
-a file. You may select a symbolic revision name using the selection
-box or you may type in a numeric name using the type-in text box.
-<p>
-<form method="get" action="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch" name="diff_select">
-
-<table border="0" cellpadding="2" cellspacing="0">
-<tr>
-<td> </td>
-<td>
-Diffs between
-
-<input type="hidden" name="r1" value="text" />
-
-<input type="TEXT" size="12" name="tr1" value="1770"
->
-and
-
-<input type="hidden" name="r2" value="text" />
-
-<input type="TEXT" size="12" name="tr2" value="1770"
->
-</td>
-</tr>
-<tr>
-<td><input type="checkbox" name="makepatch" id="makepatch" value="1"></td>
-<td><label for="makepatch">Generate output suitable for use with a patch
-program</label></td>
-</tr>
-<tr>
-<td> </td>
-<td>
-Type of Diff should be a
-<select name="diff_format" onchange="submit()">
-<option value="h" selected>Colored Diff</option>
-<option value="l" >Long Colored Diff</option>
-<option value="u" >Unidiff</option>
-<option value="c" >Context Diff</option>
-<option value="s" >Side by Side</option>
-</select>
-<input type="submit" value=" Get Diffs "></form>
-</td>
-</tr>
-</table>
-
-
-
-
-<hr noshade>
-<a name=logsort></a>
-<form method=get action="/view/poky/trunk/meta/packages/linux/linux-nokia800-2.6.18-osso40/fix_oprofile.patch">
-
-Sort log by:
-<select name="logsort" onchange="submit()">
-<option value="cvs" >Not sorted</option>
-<option value="date" selected>Commit date</option>
-<option value="rev" >Revision</option>
-</select>
-<input type=submit value=" Sort ">
-</form>
-
-
-<hr noshade>
-<div id="footer">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td align="left">
-<small>© Copyright <a href="http://o-hand.com">Openedhand</a>
-</td>
-<td align="right"><p><small>Powered by <a href="http://viewcvs.sourceforge.net/">ViewCVS 1.0-dev</a></small></p></td>
-<!--
-<td align="left">
-<address><a href="mailto:admin at o-hand.com">CVS Admin</a></address><br />
-Powered by <a href="http://viewcvs.sourceforge.net/">ViewCVS 1.0-dev</a>
-</td>
-<td align="right">
-<img src="/doc/viewcvs/images/logo.png" alt="(Powered by ViewCVS)" border="0"
-width="128" height="48" /><br />
-<h5><a target="_blank" href="/doc//help_log.html">ViewCVS and CVS Help</a></h5>
-</td>
--->
-</tr>
-</table>
-</div>
-</body>
-</html>
-
============================================================
--- packages/linux/linux-nokia800.inc 9c6cddb232a5b4c68ca6421351f0715a67a4a91a
+++ packages/linux/linux-nokia800.inc c099bf50d2367d56a7a7f92d7972a909ef3f1c8b
@@ -10,6 +10,8 @@ COMPATIBLE_MACHINE = "nokia770|nokia800"
COMPATIBLE_MACHINE = "nokia770|nokia800"
+RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
+
do_configure_prepend() {
rm -f ${S}/.config || true
============================================================
--- packages/maemo/nokia770-init_1.0.bb e5a60e0b7b8720865500e60e11655879f7deab18
+++ packages/maemo/nokia770-init_1.0.bb e3c214434e1d0078821d1182c096dd223935d40c
@@ -1,19 +1,18 @@ LICENSE = "GPL"
LICENSE = "GPL"
-PR = "r3"
+PR = "r6"
DEPENDS = "base-passwd"
-RDEPENDS = "hotplug"
SRC_URI = "file://fixup-770.sh"
-FILES_${PN} = "${sysconfdir} ${libdir}"
+COMPATIBLE_MACHINE = "(nokia770|nokia800)"
inherit update-rc.d
-
INITSCRIPT_NAME = "fixup-770.sh"
INITSCRIPT_PARAMS = "defaults 01"
+FILES_${PN} = "${sysconfdir} ${libdir}"
do_install () {
install -d ${D}${sysconfdir}/init.d
@@ -33,9 +32,12 @@ fi
# set up some links to firmware and modules in initrd
mkdir -p /lib/firmware
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3825.arm /lib/firmware/3825.arm
+ ln -sf /mnt/initfs/usr/lib/hotplug/firmware/3826.arm /lib/firmware/3826.arm
+ ln -sf /mnt/initfs/usr/lib/hotplug/firmware/bc4fw.bin /lib/firmware/bc4fw.bin
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/brf6150fw.bin /lib/firmware/brf6150fw.bin
ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3825.arm /lib/firmware/mtlm3825.arm
+ ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3826.arm /lib/firmware/mtlm3826.arm
- rm -rf /lib/modules
- ln -s /mnt/initfs/lib/modules /lib/modules
+# rm -rf /lib/modules
+# ln -s /mnt/initfs/lib/modules /lib/modules
}
More information about the Openembedded-commits
mailing list