[oe-commits] org.oe.dev merge of '559b63acfed0420f839e535ffad26766df66437a'
mickeyl commit
oe at amethyst.openembedded.net
Tue Apr 8 12:11:45 UTC 2008
merge of '559b63acfed0420f839e535ffad26766df66437a'
and 'c8122b4f0e7a0350bf0208abe44a4d7fd4c8828b'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: feea3227e23d70e02158cb7ee3b896e6e4d28fe3
ViewMTN: http://monotone.openembedded.org/revision/info/feea3227e23d70e02158cb7ee3b896e6e4d28fe3
Files:
1
packages/python/python-pyrtc_svn.bb
conf/distro/chinook-compat.conf
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
packages/curl/curl-native_7.16.4.bb
packages/curl/curl-native_7.18.0.bb
packages/curl/curl_7.16.4.bb
packages/curl/curl_7.18.0.bb
packages/base-files/base-files/licenses/GFDL-1.2
packages/base-files/base-files/licenses/GPL-3
packages/base-files/base-files/licenses/LGPL-3
packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch
packages/xorg-proto/xproto-native_7.0.12.bb
packages/xorg-proto/xproto_7.0.12.bb
packages/apmd/apmd_3.2.2.bb
packages/base-files/base-files_3.0.14.bb
packages/bash/bash.inc
packages/bash/bash_3.0.bb
packages/bash/bash_3.2.bb
packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig
packages/linux/linux-nokia800_2.6.21-osso71.bb
Diffs:
#
# mt diff -r559b63acfed0420f839e535ffad26766df66437a -rfeea3227e23d70e02158cb7ee3b896e6e4d28fe3
#
#
#
# add_file "packages/python/python-pyrtc_svn.bb"
# content [bfeeeeccaeaceda2fa0fee0dfffed426bfcad026]
#
# patch "conf/distro/chinook-compat.conf"
# from [bc6984bba9a01e6ec920c499c8fbacfe7533e83e]
# to [271e8379588ab95358ace72a9bc2946e8fcca2b7]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [1474e937489b8938c1858d53c427068ce882e743]
# to [534cab07a9373e1020839557e2432ce088c550e8]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
# to [fa679c887c40501f1728c25ffd9222506ce6f366]
#
# patch "packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb"
# from [0bdc20dd566d6175fff6c13e3c54b17e8b1542b9]
# to [b75660af4d2976417371bd6521760757571bf7bd]
#
# patch "packages/s3c24xx-utils/s3c24xx-gpio_svn.bb"
# from [e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff]
# to [7cee2203504f78f69abd1d1993c7f7b8955ebb4d]
#
# patch "packages/s3c24xx-utils/sjf2410-linux-native_svn.bb"
# from [9063b21889a311b3259a27e13d933e6cb7360f5f]
# to [9a022b0f5e9ee48883d86a30efdf184681913e3a]
#
============================================================
--- packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
+++ packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
============================================================
--- conf/distro/chinook-compat.conf bc6984bba9a01e6ec920c499c8fbacfe7533e83e
+++ conf/distro/chinook-compat.conf 271e8379588ab95358ace72a9bc2946e8fcca2b7
@@ -61,8 +61,10 @@ PREFERRED_VERSION_gcc-cross = "3.4.4cs20
PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+
# Use recent enough version of the headers to let HAL build successfully.
PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -165,7 +167,7 @@ PREFERRED_PROVIDER_classpath = "classpat
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97"
+PREFERRED_VERSION_classpath = "0.97.1"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -200,3 +202,5 @@ PKG_libconic = "libconic0"
PKG_osso-ic-oss = "osso-ic"
PKG_libconic = "libconic0"
+
+PKG_libgcc = "libgcc1"
============================================================
--- conf/distro/include/sane-srcdates.inc 1474e937489b8938c1858d53c427068ce882e743
+++ conf/distro/include/sane-srcdates.inc 534cab07a9373e1020839557e2432ce088c550e8
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080330"
+EFL_SRCDATE = "20080409"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
+++ conf/distro/include/sane-srcrevs.inc fa679c887c40501f1728c25ffd9222506ce6f366
@@ -146,8 +146,9 @@ SRCREV_pn-python-formencode = "3148"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-python-pyrtc = "152"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
============================================================
--- packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb 0bdc20dd566d6175fff6c13e3c54b17e8b1542b9
+++ packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b75660af4d2976417371bd6521760757571bf7bd
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "devel"
AUTHOR = "Harald Welte"
LICENSE = "GPL"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
============================================================
--- packages/s3c24xx-utils/s3c24xx-gpio_svn.bb e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff
+++ packages/s3c24xx-utils/s3c24xx-gpio_svn.bb 7cee2203504f78f69abd1d1993c7f7b8955ebb4d
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
SECTION = "console/utils"
LICENSE = "GPL"
-PV = "1.0+svn${SRCDATE}"
-PR = "r0"
+PV = "1.0+svn${SRCREV}"
+PR = "r1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
S = "${WORKDIR}/gpio"
============================================================
--- packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9063b21889a311b3259a27e13d933e6cb7360f5f
+++ packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9a022b0f5e9ee48883d86a30efdf184681913e3a
@@ -2,7 +2,7 @@ LICENSE = "GPL"
SECTION = "devel"
AUTHOR = "Harald Welte"
LICENSE = "GPL"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1+svn${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
#
# mt diff -rc8122b4f0e7a0350bf0208abe44a4d7fd4c8828b -rfeea3227e23d70e02158cb7ee3b896e6e4d28fe3
#
#
#
# rename "packages/curl/curl-native_7.16.4.bb"
# to "packages/curl/curl-native_7.18.0.bb"
#
# rename "packages/curl/curl_7.16.4.bb"
# to "packages/curl/curl_7.18.0.bb"
#
# add_file "packages/base-files/base-files/licenses/GFDL-1.2"
# content [bd75d59f9d7d9731bfabdc48ecd19e704d218e38]
#
# add_file "packages/base-files/base-files/licenses/GPL-3"
# content [842745cb706f8f2126506f544492f7a80dbe29b3]
#
# add_file "packages/base-files/base-files/licenses/LGPL-3"
# content [e7d563f52bf5295e6dba1d67ac23e9f6a160fab9]
#
# add_file "packages/linux/linux-nokia800-2.6.21-osso71/suspend-button.patch"
# content [5e4f8eb37e203c0182d461588183b2bc98fd57c9]
#
# add_file "packages/xorg-proto/xproto-native_7.0.12.bb"
# content [58ee303e78781ac52e8281aea7b27a1764654ea8]
#
# add_file "packages/xorg-proto/xproto_7.0.12.bb"
# content [d72fceeade15910ecfb539b2d9f82971082d92c0]
#
# patch "packages/apmd/apmd_3.2.2.bb"
# from [802998c3cb348e128c51dbb572c513ce08435bae]
# to [645f4a362b86e8f75b8677f1ea87eadeb8ede97f]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [84c4bfebec482227b218da8fc6f8b9574c27c3cf]
# to [a35cae8a2aa502d9f36ce35fcd2dddd9a86ce2c4]
#
# patch "packages/bash/bash.inc"
# from [bf00237c2f502119d09ac1aef2d72c87b26adae2]
# to [c7397201014de3cb47c54cc11eab2fb64058dc02]
#
# patch "packages/bash/bash_3.0.bb"
# from [a144ffb9fe330926ad4418e417a6c166ca2d26d2]
# to [a8cbd9f528543fa43f70dbc8e2f010addf0dce4c]
#
# patch "packages/bash/bash_3.2.bb"
# from [b786439963d9345c6f91c3e915166fb710c7dce9]
# to [d81916136f2b12a18f2b0d1de7cb3ad834c70471]
#
# patch "packages/curl/curl_7.18.0.bb"
# from [999b37738aa996d0f389cc134ae6c6804eb998fb]
# to [d2886ee3d17d4946cdb7db0f1b53e3a1fbc1e5de]
#
# patch "packages/linux/linux-nokia800-2.6.21-osso71/nokia800/defconfig"
# from [66c09cece2a2f5525a97462e4681165fd177c907]
# to [4f12aa7a9c10ac1af57c4f6507471aba01e082ea]
#
# patch "packages/linux/linux-nokia800_2.6.21-osso71.bb"
# from [d916e1fa01363ad40c9e879c94bb43c9e92ed90c]
# to [4fa2da75e345b950c2fa9f4e78de9ae891561471]
#
============================================================
--- packages/base-files/base-files/licenses/GFDL-1.2 bd75d59f9d7d9731bfabdc48ecd19e704d218e38
+++ packages/base-files/base-files/licenses/GFDL-1.2 bd75d59f9d7d9731bfabdc48ecd19e704d218e38
@@ -0,0 +1,397 @@
+ GNU Free Documentation License
+ Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The "Document", below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as "you". You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject. (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification. Examples of
+transparent image formats include PNG, XCF and JPG. Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".) To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list