[oe] [PATCH 1/1] netcf: fix offline rebuilding failed
The netcf downloaded gnulib source to ${S} at the configure time,
while the network disconnected, if sstate cache was cleaned, the
netcf rebuilding failed.
Added a new recipe named 'gnulib' to download gnulib source to
${GITDIR} and populate it to the staging data dir.
So netcf could specify this local directory where gnulib sources
reside to save the bandwidth downloading.
Signed-off-by: Hongxu Jia
---
.../recipes-support/netcf/gnulib_git.bb| 35 ++
meta-networking/recipes-support/netcf/netcf_git.bb | 5 ++--
2 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 meta-networking/recipes-support/netcf/gnulib_git.bb
diff --git a/meta-networking/recipes-support/netcf/gnulib_git.bb
b/meta-networking/recipes-support/netcf/gnulib_git.bb
new file mode 100644
index 000..730f5cd
--- /dev/null
+++ b/meta-networking/recipes-support/netcf/gnulib_git.bb
@@ -0,0 +1,35 @@
+SUMMARY = "The GNU portability library"
+DESCRIPTION = "A collection of software subroutines which are designed to \
+be usable on many operating systems. The goal of the project \
+is to make it easy for free software authors to make their \
+software run on many operating systems. Since source is designed \
+to be copied from gnulib, it is not a library per-se, as much \
+as a collection of portable idioms to be used in other projects."
+
+HOMEPAGE = "http://www.gnu.org/software/gnulib/";
+SECTION = "libs"
+LICENSE = "LGPLv2+"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=e4cf3810f33a067ea7ccd2cd889fed21"
+SRCREV = "24379a9217fa4bd62685795010fd90ced9e3"
+SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \
+"
+S = "${WORKDIR}/git"
+
+# Git clone a copy of gnulib source to the staging data dir
+sysroot_stage_all () {
+[ -d ${STAGING_DATADIR}/gnulib/ ] && rm -rf ${STAGING_DATADIR}/gnulib/
+cd ${S}
+git checkout master
+git clone ${S} ${STAGING_DATADIR}/gnulib
+}
+
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_package[noexec] = "1"
+do_packagedata[noexec] = "1"
+do_package_write_ipk[noexec] = "1"
+do_package_write_deb[noexec] = "1"
+do_package_write_rpm[noexec] = "1"
diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb
b/meta-networking/recipes-support/netcf/netcf_git.bb
index 93f8c70..6c36ce8 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -12,7 +12,7 @@ PV = "0.2.3+git${SRCPV}"
SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
"
-DEPENDS += "augeas libnl libxslt libxml2"
+DEPENDS += "augeas libnl libxslt libxml2 gnulib"
S = "${WORKDIR}/git"
@@ -21,6 +21,7 @@ inherit gettext autotools
EXTRA_OECONF_append_class-target = " --with-driver=redhat"
do_configure_prepend() {
cd ${S}
- ./bootstrap
+ rm -f .gitmodules
+ ./bootstrap --gnulib-srcdir=${STAGING_DATADIR}/gnulib
}
--
1.8.1.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 0/1]netcf: fix offline rebuilding failed
Test Step: 1. bitbake netcf 2. disconnect network 3. bitbake netcf -ccleansstate && bitbake netcf //Hongxu The following changes since commit 3cb58d800c5131bd0519a676a45c26f47b69745f: fbgrab: fix installed but not shipped warnings (2014-03-11 14:58:51 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib hongxu/fix-netcf http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-netcf Hongxu Jia (1): netcf: fix offline rebuilding failed .../recipes-support/netcf/gnulib_git.bb| 35 ++ meta-networking/recipes-support/netcf/netcf_git.bb | 5 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/netcf/gnulib_git.bb -- 1.8.1.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
Provide the license text and instructions on how to include
it when using meta-qt5 layer
Signed-off-by: Khem Raj
---
README |5 +
files/additional-licenses/PREVIEW.COMMERCIAL | 629 ++
2 files changed, 634 insertions(+)
create mode 100644 files/additional-licenses/PREVIEW.COMMERCIAL
diff --git a/README b/README
index a5a5812..0e9d182 100644
--- a/README
+++ b/README
@@ -20,6 +20,11 @@ When sending single patches, please using something like:
You are encouraged to fork the mirror on github
https://github.com/meta-qt5/meta-qt5/ to share your patches, this is preferred
for patch sets consisting of more than one patch. Other services like
gitorious, repo.or.cz or self hosted setups are of course accepted as well,
'git fetch ' works the same on all of them. We recommend github because
it is free, easy to use, has been proven to be reliable and has a really good
web GUI.
+Some recipes use licenses that are not commonly defined in OE-Core, those are
added in files/additional-licenses, please add this path to bitbake license
search path by adding
+
+LICENSE_PATH += "/files/additional-licenses"
+To local.conf or any other configuration metadata file
+
Main layer maintainers:
Martin 'JaMa' Jansa
Otavio Salvador
diff --git a/files/additional-licenses/PREVIEW.COMMERCIAL
b/files/additional-licenses/PREVIEW.COMMERCIAL
new file mode 100644
index 000..45740cb
--- /dev/null
+++ b/files/additional-licenses/PREVIEW.COMMERCIAL
@@ -0,0 +1,629 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
+For individuals and/or legal entities resident in the Americas (North
+America, Central America and South America), the applicable licensing
+terms are specified under the heading "Technology Preview License
+Agreement: The Americas".
+
+For individuals and/or legal entities not resident in The Americas, the
+applicable licensing terms are specified under the heading "Technology
+Preview License Agreement: Rest of the World".
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
+Agreement version 2.4
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Inc. ("Nokia"), with its registered office at
+102 Corporate Park Drive, White Plains, N.Y., U.S.A. 10604 and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software (as
+defined below).
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in such
+entity, is able to direct its affairs and/or to control the composition
+of its board of directors or equivalent body.
+
+"Applications" shall mean Licensee's software products created using the
+Licensed Software which may include portions of the Licensed Software.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective Date
+is set forth in the Agreement, the Effective Date shall be deemed to be
+the date the Licensed Software was initially delivered to Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any existing
+patent rights of Licensee. To the extent Licensee owns or controls any
+patents for such Feedback Licensee hereby grants to Nokia and its
+Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
+royalty-free license to (i) use, copy and modify Feedback and to create
+derivative works thereof, (ii) to make (and have made), use, import,
+sell, offer for sale, lease, dispose, offer for disposal or otherwise
+exploit any products or services of Nokia containing Feedback,, and
+(iii) sublicense all the foregoing rights to third party licensees and
+customers of Nokia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using
[oe] OpenEmbedded Developers meeting after ELC May 2-3
Please read: http://openembedded.org/wiki/OEDAM We'd like to get a good idea of the number of people attending. If you are waiting for approvals to travel, you could add yourself as tentative so we have some idea of total attendance for planning. If you are having trouble adding yourself on the wiki, send the info to me and I can add it for you. Thanks, Philip -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Correct versioning of unversioned source in git
On 03/13/2014 12:54 PM, Paul Eggleton wrote:
On Thursday 13 March 2014 12:17:40 Koen Kooi wrote:
Op 13 mrt. 2014, om 12:14 heeft Paul Eggleton
het volgende geschreven:
On Thursday 13 March 2014 12:09:21 Koen Kooi wrote:
Op 13 mrt. 2014, om 11:45 heeft Paul Eggleton
het volgende geschreven:
On Thursday 13 March 2014 10:59:38 Koen Kooi wrote:
Tomas Novotny schreef op 13-03-14 10:08:
there is a recipe sunxi-board-fex in meta-sunxi layer. That recipe
fetches sources from unversioned git which contains definitions of
some
boards (in fact it is something like a store). I'm not sure with
correct
versioning in OE. Is that: PV = "1.0+git${SRCPV}" SRCREV =
"" correct? Will be change of SRCREV (only)
catched
by build system (I'm curious how OE handles age of the rev in git)? Or
do
I need to raise PV to 1.1 and so on with every change to SRCREV?
The answer changes if you have more than one buildhost. If you have
only
one buildhost and don't care about other people rebuilding the exact
same versions, 1.0+git${SRCPV} will work.
If you have more than one buildhost and/or care about other people
rebuilding the exact same, you'll need to increase PR (or PV) everytime
SRCREV changes. That will still cause some discrepancies if someone
rebuilds after >1 SRCREV change, but upgrade paths should work when
increasing PV (not with PR!).
Why not with PR?
because SRCPV in in PV, not PR
Right, but if you're using the PR server, that also stores the
incrementing
number at the start of SRCPV; PR may also increment when SRCREV changes as
well (not sure on the latter). The PR server ought to be used if you care
about this sort of thing.
Only if your PR server is publicly available *and* you have network access
during the build. There is currently no workable way to get versioning info
to users trying to rebuild something. The closest I've been to a solution
is to ship prserv-tool exports in git.
If you're saying you want something that doesn't require network access, gets
the right answer for all users *and* automatically increments when something
changes - those are conflicting requirements...
"gitpkgv" from mete-openembedded has been doing a good job at that for me in
several projects. It just counts the number of git commits and uses that as
counter. Everybody thus sees the same number, versions are incremental, and no
server access needed during build.
My only wish would be that this were in oe-core.
Met vriendelijke groet / kind regards,
Mike Looijmans
TOPIC Embedded Systems
Eindhovenseweg 32-C, NL-5683 KH Best
Postbus 440, NL-5680 AK Best
Telefoon: (+31) (0) 499 33 69 79
Telefax: (+31) (0) 499 33 69 70
E-mail: mike.looijm...@topic.nl
Website: www.topic.nl
Please consider the environment before printing this e-mail
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-devel] [PATCH] ntp: Resolve some abnormal behaviors
[Re: [oe] [OE-devel] [PATCH] ntp: Resolve some abnormal behaviors] On 14.03.01 (Sat 14:57) Khem Raj wrote: > > On Mar 1, 2014, at 2:48 PM, Paul Eggleton > wrote: > > > On Saturday 01 March 2014 20:18:44 Burton, Ross wrote: > >> On 1 March 2014 09:59, Paul Eggleton wrote: > >>> That would be nice, but since you can't actually distribute a product that > >>> connects to the main pool.ntp.org server (you need to register your own > >>> NTP > >>> pool [1]) we've elected not to set any default so that you are encouraged > >>> to do the right thing and explicitly set your own. > >> > >> We should probably put this in the documentation. I'll file a bug. > > > > Whose documentation though? ntp is part of meta-networking rather than OE- > > Core. > > > > README for meta-networking is best place. I agree. I'm working through my backlog of merges right now but I've not seen a readme patch. If I missed it, please let me know, otherwise when I get a chance I'll propose a readme documenting this myself. -J. > > > Cheers, > > Paul > > > > -- > > > > Paul Eggleton > > Intel Open Source Technology Centre > > ___ > > Openembedded-devel mailing list > > Openembedded-devel@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] vsftpd: install volatiles file based on init system
[Re: [oe] [meta-networking][PATCH] vsftpd: install volatiles file based on init
system] On 14.03.11 (Tue 18:40) Javier Viguera wrote:
> Hi Joe,
>
> On 11/03/14 18:05, Joe MacDonald wrote:
> >Sorry, no, not yet. At the end of the thread I think I had a workable
> >solution but I've not merged the result. If you have an updated patch
> >that addresses all of the systemd/sysvinit/systemd+sysvinit
> >combinations, I'll be happy to merge it instead of my work.
>
> Unfortunately I have never played with *systemd*, so i don't have a patch
> handy.
>
> At the moment in my custom BSP layer i have workarounded it creating a
> bbappend with just:
>
> INSANE_SKIP_${PN} = "installed-vs-shipped"
>
> I know this is not the proper fix but at least it allows me to complete the
> build. Otherwise it fails.
Understood. I'll finish up my version that is intended to address the
other combinations as soon as I can and I'll follow up so you know the
status.
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 7:23 AM, Khem Raj wrote: > Provide the license text and instructions on how to include > it when using meta-qt5 layer > > Signed-off-by: Khem Raj This could be added to the layer.conf so user does not need to do it manually. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Friday 14 March 2014 03:23:47 Khem Raj wrote: > PREVIEW.COMMERCIAL Surely the license name should be something a bit more obviously related to Nokia / Digia / Qt ? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking] crda: fix udev rule
Merged, thanks.
-J.
[[meta-networking] crda: fix udev rule] On 14.03.12 (Wed 16:27) Javier Viguera
wrote:
> The SBINDIR variable in makefile's install rule needs to have a trailing
> slash so the path to the 'crda' binary in the udev rule is correct.
>
> Otherwise the udev rule has a wrong path:
>
> KERNEL=="regulatory*", ACTION=="change", SUBSYSTEM=="platform",
> RUN+="/usr/sbincrda"
>
> and at runtime udev complains:
>
> failed to execute '/usr/sbincrda'
>
> when a regulatory domain event is triggered.
>
> Signed-off-by: Javier Viguera
> Acked-by: Koen Kooi
>
> ---
> meta-networking/recipes-connectivity/crda/crda_1.1.3.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
> b/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
> index bee3e826d9a8..0bb899860bc4 100644
> --- a/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
> +++ b/meta-networking/recipes-connectivity/crda/crda_1.1.3.bb
> @@ -24,7 +24,7 @@ do_compile() {
> }
>
> do_install() {
> -oe_runmake SBINDIR=${sbindir} install
> +oe_runmake SBINDIR=${sbindir}/ install
>
> install -d ${D}${libdir}/crda/
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/1] netcf: fix offline rebuilding failed
Merged, thanks.
-J.
[[oe] [PATCH 1/1] netcf: fix offline rebuilding failed] On 14.03.14 (Fri 16:36)
Hongxu Jia wrote:
> The netcf downloaded gnulib source to ${S} at the configure time,
> while the network disconnected, if sstate cache was cleaned, the
> netcf rebuilding failed.
>
> Added a new recipe named 'gnulib' to download gnulib source to
> ${GITDIR} and populate it to the staging data dir.
>
> So netcf could specify this local directory where gnulib sources
> reside to save the bandwidth downloading.
>
> Signed-off-by: Hongxu Jia
> ---
> .../recipes-support/netcf/gnulib_git.bb| 35
> ++
> meta-networking/recipes-support/netcf/netcf_git.bb | 5 ++--
> 2 files changed, 38 insertions(+), 2 deletions(-)
> create mode 100644 meta-networking/recipes-support/netcf/gnulib_git.bb
>
> diff --git a/meta-networking/recipes-support/netcf/gnulib_git.bb
> b/meta-networking/recipes-support/netcf/gnulib_git.bb
> new file mode 100644
> index 000..730f5cd
> --- /dev/null
> +++ b/meta-networking/recipes-support/netcf/gnulib_git.bb
> @@ -0,0 +1,35 @@
> +SUMMARY = "The GNU portability library"
> +DESCRIPTION = "A collection of software subroutines which are designed to \
> +be usable on many operating systems. The goal of the project \
> +is to make it easy for free software authors to make their \
> +software run on many operating systems. Since source is designed \
> +to be copied from gnulib, it is not a library per-se, as much \
> +as a collection of portable idioms to be used in other projects."
> +
> +HOMEPAGE = "http://www.gnu.org/software/gnulib/";
> +SECTION = "libs"
> +LICENSE = "LGPLv2+"
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=e4cf3810f33a067ea7ccd2cd889fed21"
> +SRCREV = "24379a9217fa4bd62685795010fd90ced9e3"
> +SRC_URI = "git://git.sv.gnu.org/gnulib;protocol=git \
> +"
> +S = "${WORKDIR}/git"
> +
> +# Git clone a copy of gnulib source to the staging data dir
> +sysroot_stage_all () {
> +[ -d ${STAGING_DATADIR}/gnulib/ ] && rm -rf ${STAGING_DATADIR}/gnulib/
> +cd ${S}
> +git checkout master
> +git clone ${S} ${STAGING_DATADIR}/gnulib
> +}
> +
> +do_patch[noexec] = "1"
> +do_configure[noexec] = "1"
> +do_compile[noexec] = "1"
> +do_install[noexec] = "1"
> +do_package[noexec] = "1"
> +do_packagedata[noexec] = "1"
> +do_package_write_ipk[noexec] = "1"
> +do_package_write_deb[noexec] = "1"
> +do_package_write_rpm[noexec] = "1"
> diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb
> b/meta-networking/recipes-support/netcf/netcf_git.bb
> index 93f8c70..6c36ce8 100644
> --- a/meta-networking/recipes-support/netcf/netcf_git.bb
> +++ b/meta-networking/recipes-support/netcf/netcf_git.bb
> @@ -12,7 +12,7 @@ PV = "0.2.3+git${SRCPV}"
> SRC_URI = "git://git.fedorahosted.org/netcf.git;protocol=git \
> "
>
> -DEPENDS += "augeas libnl libxslt libxml2"
> +DEPENDS += "augeas libnl libxslt libxml2 gnulib"
>
> S = "${WORKDIR}/git"
>
> @@ -21,6 +21,7 @@ inherit gettext autotools
> EXTRA_OECONF_append_class-target = " --with-driver=redhat"
> do_configure_prepend() {
> cd ${S}
> - ./bootstrap
> + rm -f .gitmodules
> + ./bootstrap --gnulib-srcdir=${STAGING_DATADIR}/gnulib
> }
>
> --
> 1.8.1.2
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking] radvd: eliminate confusing warnings when stop service
Merged, thanks. -J. [[meta-networking] radvd: eliminate confusing warnings when stop service] On 14.03.12 (Wed 12:29) Liang Li wrote: > When run 'service radvd stop' in case radvd is not started/running, > we'll get warnings like this: > > Stopping radvd: no /usr/sbin/radvd found; none killed > /etc/init.d/radvd: warning: cannot restore settings > radvd. > > We could by pass these OPs by just check if the service is running > or not so eliminate possible warnings. > > Signed-off-by: Liang Li > > --- > recipes-daemons/radvd/files/radvd.init | 4 > 1 ? 4 ?(+) > > diff --git a/meta-networking/recipes-daemons/radvd/files/radvd.init > b/meta-networking/recipes-daemons/radvd/files/radvd.init > index 921384c..5295292 100755 > --- a/meta-networking/recipes-daemons/radvd/files/radvd.init > +++ b/meta-networking/recipes-daemons/radvd/files/radvd.init > @@ -92,6 +92,10 @@ case "$1" in > ;; >stop) > echo -n "Stopping $DESC: " > + if ! [ -f $PIDFILE ] ; then > + echo "not running." > + exit 0 > + fi > start-stop-daemon --oknodo --stop --pidfile $PIDFILE \ > --exec $DAEMON > restore_settings $SAVED_SETTINGS -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/2] ntp: Running ntpd daemon as ntp:ntp
Merged both of these. Thanks.
-J.
[[oe] [PATCH 1/2] ntp: Running ntpd daemon as ntp:ntp] On 14.03.11 (Tue 13:54)
Xufeng Zhang wrote:
> Adding ntp:ntp(user:group) to system and running
> ntpd dameon as ntp:ntp.
>
> Signed-off-by: Xufeng Zhang
> ---
> meta-networking/recipes-support/ntp/files/ntpd |2 +-
> meta-networking/recipes-support/ntp/ntp.inc|6 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/meta-networking/recipes-support/ntp/files/ntpd
> b/meta-networking/recipes-support/ntp/files/ntpd
> index 53fa2d1..f1e78aa 100755
> --- a/meta-networking/recipes-support/ntp/files/ntpd
> +++ b/meta-networking/recipes-support/ntp/files/ntpd
> @@ -23,7 +23,7 @@ startdaemon(){
> # this. If ntpd seems to disappear after a while assume TICKADJ
> # above is set to a totally incorrect value.
> echo -n "Starting ntpd: "
> - start-stop-daemon --start -x /usr/bin/ntpd -- -p /var/run/ntp.pid "$@"
> + start-stop-daemon --start -x /usr/bin/ntpd -- -u ntp:ntp -p
> /var/run/ntp.pid "$@"
> echo "done"
> }
> stopdaemon(){
> diff --git a/meta-networking/recipes-support/ntp/ntp.inc
> b/meta-networking/recipes-support/ntp/ntp.inc
> index 8381b9e..7876c0b 100644
> --- a/meta-networking/recipes-support/ntp/ntp.inc
> +++ b/meta-networking/recipes-support/ntp/ntp.inc
> @@ -25,13 +25,17 @@ SRC_URI =
> "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g
> file://ntpd.list \
> "
>
> -inherit autotools update-rc.d systemd
> +inherit autotools update-rc.d useradd systemd
>
> # The ac_cv_header_readline_history is to stop ntpdc depending on either
> # readline or curses
> EXTRA_OECONF += "--with-net-snmp-config=no --without-ntpsnmpd
> ac_cv_header_readline_history_h=no"
> CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
>
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ntp \
> + --shell /bin/false --user-group ntp"
> +
> PACKAGECONFIG ??= ""
> PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \
>--with-openssl-incdir=${STAGING_INCDIR} \
> --
> 1.7.0.2
>
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH v2] strongswan: update verion to 5.1.1
I think this is what we were looking for. Merged, thanks.
-J.
[[oe] [meta-networking][PATCH v2] strongswan: update verion to 5.1.1] On
14.03.04 (Tue 14:38) jackie.hu...@windriver.com wrote:
> From: Jackie Huang
>
> * Add a patch to fix the function parameter.
> * Add PACKAGECONFIG for optional packages instead of explicitly
> disable, and set sqlite and curl as default.
> * Remove the split package strongswan-plugins.
> * Add configure option --without-lib-prefix so it doesn't
> search for libraries in includedir and libdir to avoid QA error.
>
> Signed-off-by: Jackie Huang
> ---
> .../strongswan/files/fix-funtion-parameter.patch | 98
>
> .../recipes-support/strongswan/strongswan_5.0.0.bb | 36 ---
> .../recipes-support/strongswan/strongswan_5.1.1.bb | 45 +
> 3 files changed, 143 insertions(+), 36 deletions(-)
> create mode 100644
> meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
> delete mode 100644
> meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb
> create mode 100644
> meta-networking/recipes-support/strongswan/strongswan_5.1.1.bb
>
> diff --git
> a/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
>
> b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
> new file mode 100644
> index 000..da96983
> --- /dev/null
> +++
> b/meta-networking/recipes-support/strongswan/files/fix-funtion-parameter.patch
> @@ -0,0 +1,98 @@
> +fix the function parameter
> +
> +Upstream-Status: pending
> +
> +Original openssl_diffie_hellman_create has three parameters, but
> +it is reassigned a function pointer which has one parameter, and
> +is called with one parameter, which will lead to segment fault
> +on PPC, Now we simply correct the number of parameters.
> +
> +#0 0x484d4aa0 in __GI_raise (sig=6)
> + at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
> +#1 0x484d9930 in __GI_abort () at abort.c:91
> +#2 0x10002064 in segv_handler (signal=11) at charon.c:224
> +#3
> +#4 0x48d89630 in openssl_diffie_hellman_create (group=MODP_1024_BIT,
> g=...,
> + p=)
> + at openssl_diffie_hellman.c:143
> +#5 0x482c54f8 in create_dh (this=0x11ac6e68, group=MODP_1024_BIT)
> + at crypto/crypto_factory.c:358
> +#6 0x48375884 in create_dh (this=, group=)
> + at sa/keymat.c:132
> +#7 0x483843b8 in process_payloads (this=0x51400a78, message= +out>)
> + at sa/tasks/ike_init.c:200
> +#8 0x483844d0 in process_r (this=0x51400a78, message=0x51500778)
> + at sa/tasks/ike_init.c:319
> +#9 0x48374c9c in process_request (message=0x51500778, this=0x51400d20)
> + at sa/task_manager.c:870
> +#10 process_message (this=0x51400d20, msg=0x51500778) at
> +sa/task_manager.c:925
> +#11 0x4836c378 in process_message (this=0x514005f0, message=0x51500778)
> + at sa/ike_sa.c:1317
> +#12 0x48362270 in execute (this=0x515008d0)
> + at processing/jobs/process_message_job.c:74
> +
> +Signed-off-by: Roy.Li
> +---
> + src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c | 8 +++-
> + src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h | 4 +++-
> + src/libstrongswan/plugins/openssl/openssl_plugin.c | 1 +
> + 3 files changed, 11 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
> b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
> +index ff33824..bd21446 100644
> +--- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
> b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.c
> +@@ -142,7 +142,7 @@ METHOD(diffie_hellman_t, destroy, void,
> + /*
> + * Described in header.
> + */
> +-openssl_diffie_hellman_t *openssl_diffie_hellman_create(
> ++openssl_diffie_hellman_t *openssl_diffie_hellman_create_custom(
> + diffie_hellman_group_t
> group, chunk_t g, chunk_t p)
> + {
> + private_openssl_diffie_hellman_t *this;
> +@@ -197,5 +197,11 @@ openssl_diffie_hellman_t *openssl_diffie_hellman_create(
> +
> + return &this->public;
> + }
> ++openssl_diffie_hellman_t *openssl_diffie_hellman_create(
> diffie_hellman_group_t group)
> ++{
> ++chunk_t g;
> ++chunk_t p;
> ++openssl_diffie_hellman_create_custom(group, g, p);
> ++}
> +
> + #endif /* OPENSSL_NO_DH */
> +diff --git a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
> b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
> +index 53dc59c..eb69eaa 100644
> +--- a/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
> b/src/libstrongswan/plugins/openssl/openssl_diffie_hellman.h
> +@@ -44,8 +44,10 @@ struct openssl_diffie_hellman_t {
> + * @param p custom prime, if MODP_CUSTOM
> + * @return openssl_diffie_hellman_t object, NULL
> if not supported
> + *
Re: [oe] [meta-networking][PATCH] ipsec-tools: Don't link against libfl
Merged, thanks. -J. [[oe] [meta-networking][PATCH] ipsec-tools: Don't link against libfl] On 14.03.07 (Fri 01:02) Paul Barker wrote: > We can remove all references to yywrap by adding "%option noyywrap" statements > to each flex source file which doesn't override yywrap. After this, we no > longer > need to link against libfl and so no longer get errors about undefined > references to yylex. > > Also change the dependency on flex to flex-native as we no longer need libfl > compiled for the target - the lexer is now self-contained. > > Signed-off-by: Paul Barker > --- > .../0002-Don-t-link-against-libfl.patch| 86 > ++ > .../ipsec-tools/ipsec-tools_0.8.1.bb | 3 +- > 2 files changed, 88 insertions(+), 1 deletion(-) > create mode 100644 > meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch > > diff --git > a/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch > > b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch > new file mode 100644 > index 000..674331d > --- /dev/null > +++ > b/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch > @@ -0,0 +1,86 @@ > +From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001 > +From: Paul Barker > +Date: Wed, 5 Mar 2014 13:39:14 + > +Subject: [PATCH] Don't link against libfl > + > +We can remove all references to yywrap by adding "%option noyywrap" > statements > +to each flex source file that doesn't override yywrap. After this, we no > longer > +need to link against libfl and so no longer get errors about undefined > +references to yylex. > + > +Signed-off-by: Paul Barker > +Upstream-status: Pending > +--- > + src/libipsec/Makefile.am | 1 - > + src/racoon/Makefile.am | 2 +- > + src/racoon/cftoken.l | 2 ++ > + src/setkey/Makefile.am | 1 - > + src/setkey/token.l | 2 ++ > + 5 files changed, 5 insertions(+), 3 deletions(-) > + > +diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am > +index 6a4e3b3..df1e106 100644 > +--- a/src/libipsec/Makefile.am > b/src/libipsec/Makefile.am > +@@ -26,7 +26,6 @@ libipsec_la_SOURCES = \ > + # version is current:revision:age. > + # See: > http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32 > + libipsec_la_LDFLAGS = -version-info 0:1:0 > +-libipsec_la_LIBADD = $(LEXLIB) > + > + noinst_HEADERS = ipsec_strerror.h > + > +diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am > +index dbaded9..0662957 100644 > +--- a/src/racoon/Makefile.am > b/src/racoon/Makefile.am > +@@ -38,7 +38,7 @@ racoon_SOURCES = \ > + cftoken.l cfparse.y prsa_tok.l prsa_par.y > + EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c > throttle.c \ > + isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS) > +-racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) > $(LEXLIB) \ > ++racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \ > + $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la > + racoon_DEPENDENCIES = \ > + $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \ > +diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l > +index 490242c..1701922 100644 > +--- a/src/racoon/cftoken.l > b/src/racoon/cftoken.l > +@@ -106,6 +106,8 @@ static int incstackp = 0; > + static int yy_first_time = 1; > + %} > + > ++%option noyywrap > ++ > + /* common seciton */ > + nl \n > + ws [ \t]+ > +diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am > +index 746c1f1..389e6cf 100644 > +--- a/src/setkey/Makefile.am > b/src/setkey/Makefile.am > +@@ -13,7 +13,6 @@ setkey_SOURCES = \ > + > + setkey_LDFLAGS = ../libipsec/libipsec.la > + setkey_DEPENDENCIES = ../libipsec/libipsec.la > +-setkey_LDADD = $(LEXLIB) > + > + noinst_HEADERS = vchar.h extern.h > + man8_MANS = setkey.8 > +diff --git a/src/setkey/token.l b/src/setkey/token.l > +index ad3d843..eb23b76 100644 > +--- a/src/setkey/token.l > b/src/setkey/token.l > +@@ -88,6 +88,8 @@ > + #endif > + %} > + > ++%option noyywrap > ++ > + /* common section */ > + nl \n > + ws [ \t]+ > +-- > +1.9.0 > + > diff --git a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb > b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb > index e931745..fcf329c 100644 > --- a/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb > +++ b/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.1.bb > @@ -5,10 +5,11 @@ SECTION = "console/network" > LICENSE = "BSD" > LIC_FILES_CHKSUM = > "file://src/libipsec/pfkey.c;beginline=6;endline=31;md5=bc9b7ff40beff19fe6bc6aef26bd2b24" > > -DEPENDS = "virtual/kernel openssl readline flex bison-native" > +DEPENDS = "virtual/kernel openssl readline flex-native bison-native" > > SRC_URI = > "ftp://ftp.netb
[oe] [meta-qt5][PATCH V2] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
Provide the license text and instructions on how to include
it when using meta-qt5 layer
Signed-off-by: Khem Raj
---
conf/layer.conf |2 +
files/additional-licenses/NOKIA-TPLA-2.4 | 629 ++
recipes-qt/qt5/qt3d.inc |2 +-
3 files changed, 632 insertions(+), 1 deletion(-)
create mode 100644 files/additional-licenses/NOKIA-TPLA-2.4
diff --git a/conf/layer.conf b/conf/layer.conf
index 3b47b7f..585e347 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -22,3 +22,5 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
# other layers.
BBFILE_PRIORITY_qt5-layer = "7"
+
+LICENSE_PATH += "${LAYERDIR}/files/additional-licenses"
diff --git a/files/additional-licenses/NOKIA-TPLA-2.4
b/files/additional-licenses/NOKIA-TPLA-2.4
new file mode 100644
index 000..45740cb
--- /dev/null
+++ b/files/additional-licenses/NOKIA-TPLA-2.4
@@ -0,0 +1,629 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
+For individuals and/or legal entities resident in the Americas (North
+America, Central America and South America), the applicable licensing
+terms are specified under the heading "Technology Preview License
+Agreement: The Americas".
+
+For individuals and/or legal entities not resident in The Americas, the
+applicable licensing terms are specified under the heading "Technology
+Preview License Agreement: Rest of the World".
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
+Agreement version 2.4
+
+This Technology Preview License Agreement ("Agreement") is a legal
+agreement between Nokia Inc. ("Nokia"), with its registered office at
+102 Corporate Park Drive, White Plains, N.Y., U.S.A. 10604 and you (either an
+individual or a legal entity) ("Licensee") for the Licensed Software (as
+defined below).
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in such
+entity, is able to direct its affairs and/or to control the composition
+of its board of directors or equivalent body.
+
+"Applications" shall mean Licensee's software products created using the
+Licensed Software which may include portions of the Licensed Software.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Nokia. If no specific Effective Date
+is set forth in the Agreement, the Effective Date shall be deemed to be
+the date the Licensed Software was initially delivered to Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Nokia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Nokia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any existing
+patent rights of Licensee. To the extent Licensee owns or controls any
+patents for such Feedback Licensee hereby grants to Nokia and its
+Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
+royalty-free license to (i) use, copy and modify Feedback and to create
+derivative works thereof, (ii) to make (and have made), use, import,
+sell, offer for sale, lease, dispose, offer for disposal or otherwise
+exploit any products or services of Nokia containing Feedback,, and
+(iii) sublicense all the foregoing rights to third party licensees and
+customers of Nokia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If Licensee
+does not agree to the terms of this Agreement, Licensee may not install,
+copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
+of the terms and conditions of this Agreement, Nokia grants Licensee the
+right to use the Licensed Software in the manner provided below.
+
+
+4. LICENSES
+
+4.1. Using and Copying
+
+Nokia grants to Licensee a non-exclusive, non-transferable, time-limited
+license to use and copy the Licensed Software for sole purpose of
+designing, developing and testing Applications
Re: [oe] [meta-qt5][PATCH] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 02:10:04PM +, Paul Eggleton wrote: > On Friday 14 March 2014 03:23:47 Khem Raj wrote: > > PREVIEW.COMMERCIAL > > Surely the license name should be something a bit more obviously related to > Nokia / Digia / Qt ? Agreed, I've used this because that's the name of the file in qt3d repo which defines it and I haven't found "official" name, but if we're going to include it by default in layer.conf, then we should rename it to something better. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 8:27 AM, Martin Jansa wrote: > On Fri, Mar 14, 2014 at 02:10:04PM +, Paul Eggleton wrote: >> On Friday 14 March 2014 03:23:47 Khem Raj wrote: >> > PREVIEW.COMMERCIAL >> >> Surely the license name should be something a bit more obviously related to >> Nokia / Digia / Qt ? > > Agreed, I've used this because that's the name of the file in qt3d repo > which defines it and I haven't found "official" name, but if we're > going to include it by default in layer.conf, then we should rename it > to something better. > sent a v2,renamed to NOKIA-TPLA-2.4 which should be sufficient to denote the name of license and version > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] Meta java
>>Hi, >> >>okay seems I have to add libffi native to the depends of jamvm and "inherit >>pkgconfig". >>For now try to bitbake libffi-native before your bitbake command. >> >>Bye Henning > >Hi, > >Starting from zero >bitbake libffi-native ok. > >New (error) results joined. > >Thanks, >Bye >Daniel. - Hi, Is there any git repository (or configuration) to add ? I've just do: git clone git://git.openembedded.org/openembedded-core oe-core cd oe-core git clone git://git.openembedded.org/bitbake bitbake git clone git://git.openembedded.org/meta-openembedded git clone https://github.com/woglinde/meta-java.git Following meta-java ReadMe Instructions: conf/local.conf: PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12" PREFERRED_VERSION_icedtea7-native = "2.1.3" # option PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre" conf/bblayers.conf: BBLAYERS ?= " \ path_to_source /oe-core/meta \ path_to_source /oe-core/meta-openembedded/meta-oe \ path_to_source /oe-core/meta-java \ " Thanks, Good weekend Daniel. ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH V2] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 07:47:26AM -0700, Khem Raj wrote:
> Provide the license text and instructions on how to include
> it when using meta-qt5 layer
I'll drop "and instructions ..." when applying this to master-next (no
need to resend).
> Signed-off-by: Khem Raj
> ---
> conf/layer.conf |2 +
> files/additional-licenses/NOKIA-TPLA-2.4 | 629
> ++
> recipes-qt/qt5/qt3d.inc |2 +-
> 3 files changed, 632 insertions(+), 1 deletion(-)
> create mode 100644 files/additional-licenses/NOKIA-TPLA-2.4
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 3b47b7f..585e347 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -22,3 +22,5 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
> # other layers.
>
> BBFILE_PRIORITY_qt5-layer = "7"
> +
> +LICENSE_PATH += "${LAYERDIR}/files/additional-licenses"
> diff --git a/files/additional-licenses/NOKIA-TPLA-2.4
> b/files/additional-licenses/NOKIA-TPLA-2.4
> new file mode 100644
> index 000..45740cb
> --- /dev/null
> +++ b/files/additional-licenses/NOKIA-TPLA-2.4
> @@ -0,0 +1,629 @@
> +TECHNOLOGY PREVIEW LICENSE AGREEMENT
> +
> +For individuals and/or legal entities resident in the Americas (North
> +America, Central America and South America), the applicable licensing
> +terms are specified under the heading "Technology Preview License
> +Agreement: The Americas".
> +
> +For individuals and/or legal entities not resident in The Americas, the
> +applicable licensing terms are specified under the heading "Technology
> +Preview License Agreement: Rest of the World".
> +
> +
> +TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
> +Agreement version 2.4
> +
> +This Technology Preview License Agreement ("Agreement") is a legal
> +agreement between Nokia Inc. ("Nokia"), with its registered office at
> +102 Corporate Park Drive, White Plains, N.Y., U.S.A. 10604 and you (either an
> +individual or a legal entity) ("Licensee") for the Licensed Software (as
> +defined below).
> +
> +1. DEFINITIONS
> +
> +"Affiliate" of a Party shall mean an entity (i) which is directly or
> +indirectly controlling such Party; (ii) which is under the same direct
> +or indirect ownership or control as such Party; or (iii) which is
> +directly or indirectly owned or controlled by such Party. For these
> +purposes, an entity shall be treated as being controlled by another if
> +that other entity has fifty percent (50 %) or more of the votes in such
> +entity, is able to direct its affairs and/or to control the composition
> +of its board of directors or equivalent body.
> +
> +"Applications" shall mean Licensee's software products created using the
> +Licensed Software which may include portions of the Licensed Software.
> +
> +"Term" shall mean the period of time six (6) months from the later of
> +(a) the Effective Date; or (b) the date the Licensed Software was
> +initially delivered to Licensee by Nokia. If no specific Effective Date
> +is set forth in the Agreement, the Effective Date shall be deemed to be
> +the date the Licensed Software was initially delivered to Licensee.
> +
> +"Licensed Software" shall mean the computer software, "online" or
> +electronic documentation, associated media and printed materials,
> +including the source code, example programs and the documentation
> +delivered by Nokia to Licensee in conjunction with this Agreement.
> +
> +"Party" or "Parties" shall mean Licensee and/or Nokia.
> +
> +
> +2. OWNERSHIP
> +
> +The Licensed Software is protected by copyright laws and international
> +copyright treaties, as well as other intellectual property laws and
> +treaties. The Licensed Software is licensed, not sold.
> +
> +If Licensee provides any findings, proposals, suggestions or other
> +feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
> +shall own all right, title and interest including the intellectual
> +property rights in and to such Feedback, excluding however any existing
> +patent rights of Licensee. To the extent Licensee owns or controls any
> +patents for such Feedback Licensee hereby grants to Nokia and its
> +Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
> +royalty-free license to (i) use, copy and modify Feedback and to create
> +derivative works thereof, (ii) to make (and have made), use, import,
> +sell, offer for sale, lease, dispose, offer for disposal or otherwise
> +exploit any products or services of Nokia containing Feedback,, and
> +(iii) sublicense all the foregoing rights to third party licensees and
> +customers of Nokia and/or its Affiliates.
> +
> +
> +3. VALIDITY OF THE AGREEMENT
> +
> +By installing, copying, or otherwise using the Licensed Software,
> +Licensee agrees to be bound by the terms of this Agreement. If Licensee
> +does not agree to the terms of this Agreement, Licensee may not install,
> +copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
> +of the terms an
Re: [oe] [meta-browser][RFT][PATCH] chromium: Upgrade 29 -> 35
On 2014-03-13 05:12, Gary Thomas wrote:
> On 2014-03-11 22:46, Khem Raj wrote:
>> Removed already applied patches
>>
>> License year changed thats why there is change in checksum
>>
>> -// Copyright 2014 The Chromium Authors. All rights reserved.
>> +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
>>
>> we see
>>
>> rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
>>
>> so we add PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>>
>> Signed-off-by: Khem Raj
>> ---
>> ..._focus_tracker_notify_deprecated_since_ATK_2_9_4.patch | 0
>> .../{chromium-29.0.1518.2 => chromium}/armv6/include.gypi | 0
>> .../armv6/oe-defaults.gypi| 0
>> .../armv7a/include.gypi | 0
>> .../armv7a/oe-defaults.gypi | 0
>> .../{chromium-29.0.1518.2 => chromium}/google-chrome | 0
>> .../google-chrome.desktop | 0
>> .../{chromium-29.0.1518.2 => chromium}/i586/include.gypi | 0
>> .../i586/oe-defaults.gypi | 0
>> .../secitem_array.patch | 0
>> .../uninitialised-warning.patch | 6 +++---
>> .../{chromium-29.0.1518.2 => chromium}/unistd-2.patch | 0
>> .../x86-64/include.gypi | 0
>> .../x86-64/oe-defaults.gypi | 0
>> .../{chromium_29.0.1518.2.bb => chromium_35.0.1883.0.bb} | 15
>> ---
>> 15 files changed, 11 insertions(+), 10 deletions(-)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>> (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/armv6/include.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/armv6/oe-defaults.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/armv7a/include.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/armv7a/oe-defaults.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/google-chrome (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/google-chrome.desktop (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/i586/include.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/i586/oe-defaults.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/secitem_array.patch (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/uninitialised-warning.patch (96%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/unistd-2.patch (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/x86-64/include.gypi (100%)
>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>> chromium}/x86-64/oe-defaults.gypi (100%)
>> rename recipes-browser/chromium/{chromium_29.0.1518.2.bb =>
>> chromium_35.0.1883.0.bb} (84%)
>>
>> diff --git
>> a/recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>
>> b/recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>> similarity index 100%
>> rename from
>> recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>> rename to
>> recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>> diff --git
>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>> b/recipes-browser/chromium/chromium/armv6/include.gypi
>> similarity index 100%
>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>> rename to recipes-browser/chromium/chromium/armv6/include.gypi
>> diff --git
>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>> b/recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>> similarity index 100%
>> rename from
>> recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>> rename to recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>> diff --git
>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>> b/recipes-browser/chromium/chromium/armv7a/include.gypi
>> similarity index 100%
>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>> rename to recipes-browser/chromium/chromium/armv7a/include.gypi
>> diff --git
>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
>> b/recipes-browser/chromium/chromium/armv7a/oe-defaults.gypi
>> similarity index 100%
>> rename from
>> recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
>> rename to recipes-browser/chromium/chromium/armv7a/oe-defaults.gypi
>> diff --
Re: [oe] [meta-browser][RFT][PATCH] chromium: Upgrade 29 -> 35
Thanks for patches, will do
-Khem
On Fri, Mar 14, 2014 at 9:57 AM, Gary Thomas wrote:
> On 2014-03-13 05:12, Gary Thomas wrote:
>> On 2014-03-11 22:46, Khem Raj wrote:
>>> Removed already applied patches
>>>
>>> License year changed thats why there is change in checksum
>>>
>>> -// Copyright 2014 The Chromium Authors. All rights reserved.
>>> +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
>>>
>>> we see
>>>
>>> rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
>>>
>>> so we add PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>>>
>>> Signed-off-by: Khem Raj
>>> ---
>>> ..._focus_tracker_notify_deprecated_since_ATK_2_9_4.patch | 0
>>> .../{chromium-29.0.1518.2 => chromium}/armv6/include.gypi | 0
>>> .../armv6/oe-defaults.gypi| 0
>>> .../armv7a/include.gypi | 0
>>> .../armv7a/oe-defaults.gypi | 0
>>> .../{chromium-29.0.1518.2 => chromium}/google-chrome | 0
>>> .../google-chrome.desktop | 0
>>> .../{chromium-29.0.1518.2 => chromium}/i586/include.gypi | 0
>>> .../i586/oe-defaults.gypi | 0
>>> .../secitem_array.patch | 0
>>> .../uninitialised-warning.patch | 6 +++---
>>> .../{chromium-29.0.1518.2 => chromium}/unistd-2.patch | 0
>>> .../x86-64/include.gypi | 0
>>> .../x86-64/oe-defaults.gypi | 0
>>> .../{chromium_29.0.1518.2.bb => chromium_35.0.1883.0.bb} | 15
>>> ---
>>> 15 files changed, 11 insertions(+), 10 deletions(-)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv6/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv6/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv7a/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv7a/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/google-chrome (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/google-chrome.desktop (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/i586/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/i586/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/secitem_array.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/uninitialised-warning.patch (96%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/unistd-2.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/x86-64/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/x86-64/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium_29.0.1518.2.bb =>
>>> chromium_35.0.1883.0.bb} (84%)
>>>
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>>
>>> b/recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> similarity index 100%
>>> rename from
>>> recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> rename to
>>> recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>>> b/recipes-browser/chromium/chromium/armv6/include.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>>> rename to recipes-browser/chromium/chromium/armv6/include.gypi
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>>> b/recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>>> similarity index 100%
>>> rename from
>>> recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>>> rename to recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>>> b/recipes-browser/chromium/chromium/armv7a/include.gypi
>>> similarity index 100%
>>> rename from
>>> recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>>> rename to recipes-browser/chromium/chromium/armv7a/include.gypi
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
>>> b/recipes-browser/chromium/chromium/armv7a/oe-defaults.gypi
>>>
Re: [oe] [meta-qt5][PATCH V2] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 07:47:26AM -0700, Khem Raj wrote:
> Provide the license text and instructions on how to include
> it when using meta-qt5 layer
I would like to move it to
licenses/NOKIA-TPLA-2.4
to match path used in meta-oe and meta-networking.
I've also noticed that the text in this commit has couple of trailing
whitespaces while the file in qt3d repo does not, so I've used that one.
I'll send v3 from master-next with these modifications..
>
> Signed-off-by: Khem Raj
> ---
> conf/layer.conf |2 +
> files/additional-licenses/NOKIA-TPLA-2.4 | 629
> ++
> recipes-qt/qt5/qt3d.inc |2 +-
> 3 files changed, 632 insertions(+), 1 deletion(-)
> create mode 100644 files/additional-licenses/NOKIA-TPLA-2.4
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 3b47b7f..585e347 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -22,3 +22,5 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
> # other layers.
>
> BBFILE_PRIORITY_qt5-layer = "7"
> +
> +LICENSE_PATH += "${LAYERDIR}/files/additional-licenses"
> diff --git a/files/additional-licenses/NOKIA-TPLA-2.4
> b/files/additional-licenses/NOKIA-TPLA-2.4
> new file mode 100644
> index 000..45740cb
> --- /dev/null
> +++ b/files/additional-licenses/NOKIA-TPLA-2.4
> @@ -0,0 +1,629 @@
> +TECHNOLOGY PREVIEW LICENSE AGREEMENT
> +
> +For individuals and/or legal entities resident in the Americas (North
> +America, Central America and South America), the applicable licensing
> +terms are specified under the heading "Technology Preview License
> +Agreement: The Americas".
> +
> +For individuals and/or legal entities not resident in The Americas, the
> +applicable licensing terms are specified under the heading "Technology
> +Preview License Agreement: Rest of the World".
> +
> +
> +TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
> +Agreement version 2.4
> +
> +This Technology Preview License Agreement ("Agreement") is a legal
> +agreement between Nokia Inc. ("Nokia"), with its registered office at
> +102 Corporate Park Drive, White Plains, N.Y., U.S.A. 10604 and you (either an
> +individual or a legal entity) ("Licensee") for the Licensed Software (as
> +defined below).
> +
> +1. DEFINITIONS
> +
> +"Affiliate" of a Party shall mean an entity (i) which is directly or
> +indirectly controlling such Party; (ii) which is under the same direct
> +or indirect ownership or control as such Party; or (iii) which is
> +directly or indirectly owned or controlled by such Party. For these
> +purposes, an entity shall be treated as being controlled by another if
> +that other entity has fifty percent (50 %) or more of the votes in such
> +entity, is able to direct its affairs and/or to control the composition
> +of its board of directors or equivalent body.
> +
> +"Applications" shall mean Licensee's software products created using the
> +Licensed Software which may include portions of the Licensed Software.
> +
> +"Term" shall mean the period of time six (6) months from the later of
> +(a) the Effective Date; or (b) the date the Licensed Software was
> +initially delivered to Licensee by Nokia. If no specific Effective Date
> +is set forth in the Agreement, the Effective Date shall be deemed to be
> +the date the Licensed Software was initially delivered to Licensee.
> +
> +"Licensed Software" shall mean the computer software, "online" or
> +electronic documentation, associated media and printed materials,
> +including the source code, example programs and the documentation
> +delivered by Nokia to Licensee in conjunction with this Agreement.
> +
> +"Party" or "Parties" shall mean Licensee and/or Nokia.
> +
> +
> +2. OWNERSHIP
> +
> +The Licensed Software is protected by copyright laws and international
> +copyright treaties, as well as other intellectual property laws and
> +treaties. The Licensed Software is licensed, not sold.
> +
> +If Licensee provides any findings, proposals, suggestions or other
> +feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
> +shall own all right, title and interest including the intellectual
> +property rights in and to such Feedback, excluding however any existing
> +patent rights of Licensee. To the extent Licensee owns or controls any
> +patents for such Feedback Licensee hereby grants to Nokia and its
> +Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
> +royalty-free license to (i) use, copy and modify Feedback and to create
> +derivative works thereof, (ii) to make (and have made), use, import,
> +sell, offer for sale, lease, dispose, offer for disposal or otherwise
> +exploit any products or services of Nokia containing Feedback,, and
> +(iii) sublicense all the foregoing rights to third party licensees and
> +customers of Nokia and/or its Affiliates.
> +
> +
> +3. VALIDITY OF THE AGREEMENT
> +
> +By installing, copying, or otherwise using the Licensed Software,
> +Licensee agrees to be
[oe] [meta-qt5][PATCHv3] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
From: Khem Raj
* Provide the license text
Signed-off-by: Khem Raj
Signed-off-by: Martin Jansa
---
conf/layer.conf | 2 +
licenses/NOKIA-TPLA-2.4 | 628
recipes-qt/qt5/qt3d.inc | 2 +-
3 files changed, 631 insertions(+), 1 deletion(-)
create mode 100644 licenses/NOKIA-TPLA-2.4
diff --git a/conf/layer.conf b/conf/layer.conf
index 75d13a4..aacfd78 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -23,4 +23,6 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_qt5-layer = "7"
+LICENSE_PATH += "${LAYERDIR}/licenses"
+
IMAGE_FEATURES[validitems] += "qtcreator-debug"
diff --git a/licenses/NOKIA-TPLA-2.4 b/licenses/NOKIA-TPLA-2.4
new file mode 100644
index 000..c71a330
--- /dev/null
+++ b/licenses/NOKIA-TPLA-2.4
@@ -0,0 +1,628 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
+For individuals and/or legal entities resident in the Americas (North
+America, Central America and South America), the applicable licensing
+terms are specified under the heading "Technology Preview License
+Agreement: The Americas".
+
+For individuals and/or legal entities not resident in The Americas, the
+applicable licensing terms are specified under the heading "Technology
+Preview License Agreement: Rest of the World".
+
+
+TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
+Agreement version 2.4
+
+This Technology Preview License Agreement ("Agreement")is a legal agreement
+between Digia USA, Inc. ("Digia"), with its registered office at 32 W.
+Loockerman Street, Suite 201, City of Dover, County of Kent, Delaware 19904,
+U.S.A. and you (either an individual or a legal entity) ("Licensee")
+for the Licensed Software (as defined below).
+
+1. DEFINITIONS
+
+"Affiliate" of a Party shall mean an entity (i) which is directly or
+indirectly controlling such Party; (ii) which is under the same direct
+or indirect ownership or control as such Party; or (iii) which is
+directly or indirectly owned or controlled by such Party. For these
+purposes, an entity shall be treated as being controlled by another if
+that other entity has fifty percent (50 %) or more of the votes in such
+entity, is able to direct its affairs and/or to control the composition
+of its board of directors or equivalent body.
+
+"Applications" shall mean Licensee's software products created using the
+Licensed Software which may include portions of the Licensed Software.
+
+"Term" shall mean the period of time six (6) months from the later of
+(a) the Effective Date; or (b) the date the Licensed Software was
+initially delivered to Licensee by Digia. If no specific Effective Date
+is set forth in the Agreement, the Effective Date shall be deemed to be
+the date the Licensed Software was initially delivered to Licensee.
+
+"Licensed Software" shall mean the computer software, "online" or
+electronic documentation, associated media and printed materials,
+including the source code, example programs and the documentation
+delivered by Digia to Licensee in conjunction with this Agreement.
+
+"Party" or "Parties" shall mean Licensee and/or Digia.
+
+
+2. OWNERSHIP
+
+The Licensed Software is protected by copyright laws and international
+copyright treaties, as well as other intellectual property laws and
+treaties. The Licensed Software is licensed, not sold.
+
+If Licensee provides any findings, proposals, suggestions or other
+feedback ("Feedback") to Digia regarding the Licensed Software, Digia
+shall own all right, title and interest including the intellectual
+property rights in and to such Feedback, excluding however any existing
+patent rights of Licensee. To the extent Licensee owns or controls any
+patents for such Feedback Licensee hereby grants to Digia and its
+Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
+royalty-free license to (i) use, copy and modify Feedback and to create
+derivative works thereof, (ii) to make (and have made), use, import,
+sell, offer for sale, lease, dispose, offer for disposal or otherwise
+exploit any products or services of Digia containing Feedback, and
+(iii) sublicense all the foregoing rights to third party licensees and
+customers of Digia and/or its Affiliates.
+
+
+3. VALIDITY OF THE AGREEMENT
+
+By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If Licensee
+does not agree to the terms of this Agreement, Licensee may not install,
+copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
+of the terms and conditions of this Agreement, Digia grants Licensee the
+right to use the Licensed Software in the manner provided below.
+
+
+4. LICENSES
+
+4.1. Using and Copying
+
+Digia grants to Licensee a non-exclusive, non-transferable, time-limited
+license to use and copy the Licensed Software for sole purpose of
+designing, developing and testing Applications, and evaluating and the
+Licensed Software during the Term.
+
+Licensee may ins
Re: [oe] [meta-qt5][PATCH V2] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 10:06 AM, Martin Jansa wrote:
> On Fri, Mar 14, 2014 at 07:47:26AM -0700, Khem Raj wrote:
>> Provide the license text and instructions on how to include
>> it when using meta-qt5 layer
>
> I would like to move it to
> licenses/NOKIA-TPLA-2.4
>
> to match path used in meta-oe and meta-networking.
>
OK
> I've also noticed that the text in this commit has couple of trailing
> whitespaces while the file in qt3d repo does not, so I've used that one.
>
I wget'ed the raw file, feel free to sync up
if I picked an older version
> I'll send v3 from master-next with these modifications..
OK
>
>>
>> Signed-off-by: Khem Raj
>> ---
>> conf/layer.conf |2 +
>> files/additional-licenses/NOKIA-TPLA-2.4 | 629
>> ++
>> recipes-qt/qt5/qt3d.inc |2 +-
>> 3 files changed, 632 insertions(+), 1 deletion(-)
>> create mode 100644 files/additional-licenses/NOKIA-TPLA-2.4
>>
>> diff --git a/conf/layer.conf b/conf/layer.conf
>> index 3b47b7f..585e347 100644
>> --- a/conf/layer.conf
>> +++ b/conf/layer.conf
>> @@ -22,3 +22,5 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
>> # other layers.
>>
>> BBFILE_PRIORITY_qt5-layer = "7"
>> +
>> +LICENSE_PATH += "${LAYERDIR}/files/additional-licenses"
>> diff --git a/files/additional-licenses/NOKIA-TPLA-2.4
>> b/files/additional-licenses/NOKIA-TPLA-2.4
>> new file mode 100644
>> index 000..45740cb
>> --- /dev/null
>> +++ b/files/additional-licenses/NOKIA-TPLA-2.4
>> @@ -0,0 +1,629 @@
>> +TECHNOLOGY PREVIEW LICENSE AGREEMENT
>> +
>> +For individuals and/or legal entities resident in the Americas (North
>> +America, Central America and South America), the applicable licensing
>> +terms are specified under the heading "Technology Preview License
>> +Agreement: The Americas".
>> +
>> +For individuals and/or legal entities not resident in The Americas, the
>> +applicable licensing terms are specified under the heading "Technology
>> +Preview License Agreement: Rest of the World".
>> +
>> +
>> +TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
>> +Agreement version 2.4
>> +
>> +This Technology Preview License Agreement ("Agreement") is a legal
>> +agreement between Nokia Inc. ("Nokia"), with its registered office at
>> +102 Corporate Park Drive, White Plains, N.Y., U.S.A. 10604 and you (either
>> an
>> +individual or a legal entity) ("Licensee") for the Licensed Software (as
>> +defined below).
>> +
>> +1. DEFINITIONS
>> +
>> +"Affiliate" of a Party shall mean an entity (i) which is directly or
>> +indirectly controlling such Party; (ii) which is under the same direct
>> +or indirect ownership or control as such Party; or (iii) which is
>> +directly or indirectly owned or controlled by such Party. For these
>> +purposes, an entity shall be treated as being controlled by another if
>> +that other entity has fifty percent (50 %) or more of the votes in such
>> +entity, is able to direct its affairs and/or to control the composition
>> +of its board of directors or equivalent body.
>> +
>> +"Applications" shall mean Licensee's software products created using the
>> +Licensed Software which may include portions of the Licensed Software.
>> +
>> +"Term" shall mean the period of time six (6) months from the later of
>> +(a) the Effective Date; or (b) the date the Licensed Software was
>> +initially delivered to Licensee by Nokia. If no specific Effective Date
>> +is set forth in the Agreement, the Effective Date shall be deemed to be
>> +the date the Licensed Software was initially delivered to Licensee.
>> +
>> +"Licensed Software" shall mean the computer software, "online" or
>> +electronic documentation, associated media and printed materials,
>> +including the source code, example programs and the documentation
>> +delivered by Nokia to Licensee in conjunction with this Agreement.
>> +
>> +"Party" or "Parties" shall mean Licensee and/or Nokia.
>> +
>> +
>> +2. OWNERSHIP
>> +
>> +The Licensed Software is protected by copyright laws and international
>> +copyright treaties, as well as other intellectual property laws and
>> +treaties. The Licensed Software is licensed, not sold.
>> +
>> +If Licensee provides any findings, proposals, suggestions or other
>> +feedback ("Feedback") to Nokia regarding the Licensed Software, Nokia
>> +shall own all right, title and interest including the intellectual
>> +property rights in and to such Feedback, excluding however any existing
>> +patent rights of Licensee. To the extent Licensee owns or controls any
>> +patents for such Feedback Licensee hereby grants to Nokia and its
>> +Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
>> +royalty-free license to (i) use, copy and modify Feedback and to create
>> +derivative works thereof, (ii) to make (and have made), use, import,
>> +sell, offer for sale, lease, dispose, offer for disposal or otherwise
>> +exploit any products or services of Nokia containing Feedback,, and
>> +(iii) s
Re: [oe] [meta-qt5][PATCHv3] licenses: Fix WARNING: qt3d: No generic license file exists for: PREVIEW.COMMERCIAL in any provider
On Fri, Mar 14, 2014 at 10:09 AM, Martin Jansa wrote:
> From: Khem Raj
>
> * Provide the license text
Seems good.
>
> Signed-off-by: Khem Raj
> Signed-off-by: Martin Jansa
> ---
> conf/layer.conf | 2 +
> licenses/NOKIA-TPLA-2.4 | 628
>
> recipes-qt/qt5/qt3d.inc | 2 +-
> 3 files changed, 631 insertions(+), 1 deletion(-)
> create mode 100644 licenses/NOKIA-TPLA-2.4
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index 75d13a4..aacfd78 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -23,4 +23,6 @@ BBFILE_PATTERN_qt5-layer := "^${LAYERDIR}/"
>
> BBFILE_PRIORITY_qt5-layer = "7"
>
> +LICENSE_PATH += "${LAYERDIR}/licenses"
> +
> IMAGE_FEATURES[validitems] += "qtcreator-debug"
> diff --git a/licenses/NOKIA-TPLA-2.4 b/licenses/NOKIA-TPLA-2.4
> new file mode 100644
> index 000..c71a330
> --- /dev/null
> +++ b/licenses/NOKIA-TPLA-2.4
> @@ -0,0 +1,628 @@
> +TECHNOLOGY PREVIEW LICENSE AGREEMENT
> +
> +For individuals and/or legal entities resident in the Americas (North
> +America, Central America and South America), the applicable licensing
> +terms are specified under the heading "Technology Preview License
> +Agreement: The Americas".
> +
> +For individuals and/or legal entities not resident in The Americas, the
> +applicable licensing terms are specified under the heading "Technology
> +Preview License Agreement: Rest of the World".
> +
> +
> +TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
> +Agreement version 2.4
> +
> +This Technology Preview License Agreement ("Agreement")is a legal agreement
> +between Digia USA, Inc. ("Digia"), with its registered office at 32 W.
> +Loockerman Street, Suite 201, City of Dover, County of Kent, Delaware 19904,
> +U.S.A. and you (either an individual or a legal entity) ("Licensee")
> +for the Licensed Software (as defined below).
> +
> +1. DEFINITIONS
> +
> +"Affiliate" of a Party shall mean an entity (i) which is directly or
> +indirectly controlling such Party; (ii) which is under the same direct
> +or indirect ownership or control as such Party; or (iii) which is
> +directly or indirectly owned or controlled by such Party. For these
> +purposes, an entity shall be treated as being controlled by another if
> +that other entity has fifty percent (50 %) or more of the votes in such
> +entity, is able to direct its affairs and/or to control the composition
> +of its board of directors or equivalent body.
> +
> +"Applications" shall mean Licensee's software products created using the
> +Licensed Software which may include portions of the Licensed Software.
> +
> +"Term" shall mean the period of time six (6) months from the later of
> +(a) the Effective Date; or (b) the date the Licensed Software was
> +initially delivered to Licensee by Digia. If no specific Effective Date
> +is set forth in the Agreement, the Effective Date shall be deemed to be
> +the date the Licensed Software was initially delivered to Licensee.
> +
> +"Licensed Software" shall mean the computer software, "online" or
> +electronic documentation, associated media and printed materials,
> +including the source code, example programs and the documentation
> +delivered by Digia to Licensee in conjunction with this Agreement.
> +
> +"Party" or "Parties" shall mean Licensee and/or Digia.
> +
> +
> +2. OWNERSHIP
> +
> +The Licensed Software is protected by copyright laws and international
> +copyright treaties, as well as other intellectual property laws and
> +treaties. The Licensed Software is licensed, not sold.
> +
> +If Licensee provides any findings, proposals, suggestions or other
> +feedback ("Feedback") to Digia regarding the Licensed Software, Digia
> +shall own all right, title and interest including the intellectual
> +property rights in and to such Feedback, excluding however any existing
> +patent rights of Licensee. To the extent Licensee owns or controls any
> +patents for such Feedback Licensee hereby grants to Digia and its
> +Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
> +royalty-free license to (i) use, copy and modify Feedback and to create
> +derivative works thereof, (ii) to make (and have made), use, import,
> +sell, offer for sale, lease, dispose, offer for disposal or otherwise
> +exploit any products or services of Digia containing Feedback, and
> +(iii) sublicense all the foregoing rights to third party licensees and
> +customers of Digia and/or its Affiliates.
> +
> +
> +3. VALIDITY OF THE AGREEMENT
> +
> +By installing, copying, or otherwise using the Licensed Software,
> +Licensee agrees to be bound by the terms of this Agreement. If Licensee
> +does not agree to the terms of this Agreement, Licensee may not install,
> +copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
> +of the terms and conditions of this Agreement, Digia grants Licensee the
> +right to use the Licensed Software in the manner provided below.
> +
> +
> +4. LICENSES
> +
> +4.
[oe] [meta-qt5][PATCH] qtbase-5.0.2: Fix build without -fpermissive
* commit in newer qt is using GLint and casting to GLuint
later so it doesn't have this issue:
commit 1d8ec5fae2fa4bf694b93bb6bf14a7c42c84a9b6
Author: Valery Volgutov
Date: Tue May 21 14:18:17 2013 -0700
Fix FBO restoring in QOpenGLTextureGlyphCache
* but backport to 5.0.2 is using GLuint:
and causes build failure without -fpermissive:
|
qtbase/5.0.2-r3/qtbase-opensource-src-5.0.2/src/gui/opengl/qopengltextureglyphcache.cpp:151:51:
error: invalid conversion from 'GLuint* {aka unsigned int*}' to 'GLint* {aka
int*}' [-fpermissive]
| glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
|^
| /usr/include/GLES2/gl2.h:536:37: error: initializing argument 2 of 'void
glGetIntegerv(GLenum, GLint*)' [-fpermissive]
| GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint*
params);
| ^
* resync with version from 5.1.1 to fix this
Signed-off-by: Martin Jansa
---
.../0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
index e47c7b6..e8169b5 100644
---
a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
+++
b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
@@ -27,8 +27,8 @@ index 8822faf..022356a 100644
return;
}
-+GLuint saveFbo;
-+glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
++GLint oldFbo;
++glGetIntegerv(GL_FRAMEBUFFER_BINDING, &oldFbo);
+
int oldWidth = m_textureResource->m_width;
int oldHeight = m_textureResource->m_height;
@@ -38,7 +38,7 @@ index 8822faf..022356a 100644
glDeleteTextures(1, &oldTexture);
-funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo);
-+funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo);
++funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
if (pex != 0) {
glViewport(pex->x, pex->y, pex->width, pex->height);
--
1.9.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-systemd][PATCH 1/2] dhcp: Rename .bbappend to match any version from oe-core
Signed-off-by: Martin Jansa
---
.../recipes-connectivity/dhcp/{dhcp_4.2.5-P1.bbappend => dhcp_%.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-systemd/oe-core/recipes-connectivity/dhcp/{dhcp_4.2.5-P1.bbappend
=> dhcp_%.bbappend} (100%)
diff --git
a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend
b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
similarity index 100%
rename from
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
--
1.9.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-systemd][PATCH 2/2] util-linux: Rename .bbappend to match any version from oe-core and remove uuidd.socket
* oe-core recipe has uuidd.service in ${PN}-uuidd
SYSTEMD_PACKAGES = "${PN}-uuidd"
SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service"
Signed-off-by: Martin Jansa
---
.../oe-core/recipes-core/util-linux/util-linux_%.bbappend | 3 +++
.../oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend | 10 --
2 files changed, 3 insertions(+), 10 deletions(-)
create mode 100644
meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
delete mode 100644
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
diff --git a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
new file mode 100644
index 000..f006b3f
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
@@ -0,0 +1,3 @@
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
diff --git
a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
b/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
deleted file mode 100644
index c6a97ca..000
--- a/meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit systemd
-
-SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-EXTRA_OECONF += "--enable-socket-activation
--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-
-SYSTEMD_SERVICE_${PN} = "uuidd.socket"
--
1.9.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-browser][RFT][PATCH] chromium: Upgrade 29 -> 35
On Fri, Mar 14, 2014 at 1:57 PM, Gary Thomas wrote:
> On 2014-03-13 05:12, Gary Thomas wrote:
>> On 2014-03-11 22:46, Khem Raj wrote:
>>> Removed already applied patches
>>>
>>> License year changed thats why there is change in checksum
>>>
>>> -// Copyright 2014 The Chromium Authors. All rights reserved.
>>> +// Copyright (c) 2013 The Chromium Authors. All rights reserved.
>>>
>>> we see
>>>
>>> rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
>>>
>>> so we add PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
>>>
>>> Signed-off-by: Khem Raj
>>> ---
>>> ..._focus_tracker_notify_deprecated_since_ATK_2_9_4.patch | 0
>>> .../{chromium-29.0.1518.2 => chromium}/armv6/include.gypi | 0
>>> .../armv6/oe-defaults.gypi| 0
>>> .../armv7a/include.gypi | 0
>>> .../armv7a/oe-defaults.gypi | 0
>>> .../{chromium-29.0.1518.2 => chromium}/google-chrome | 0
>>> .../google-chrome.desktop | 0
>>> .../{chromium-29.0.1518.2 => chromium}/i586/include.gypi | 0
>>> .../i586/oe-defaults.gypi | 0
>>> .../secitem_array.patch | 0
>>> .../uninitialised-warning.patch | 6 +++---
>>> .../{chromium-29.0.1518.2 => chromium}/unistd-2.patch | 0
>>> .../x86-64/include.gypi | 0
>>> .../x86-64/oe-defaults.gypi | 0
>>> .../{chromium_29.0.1518.2.bb => chromium_35.0.1883.0.bb} | 15
>>> ---
>>> 15 files changed, 11 insertions(+), 10 deletions(-)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv6/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv6/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv7a/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/armv7a/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/google-chrome (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/google-chrome.desktop (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/i586/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/i586/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/secitem_array.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/uninitialised-warning.patch (96%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/unistd-2.patch (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/x86-64/include.gypi (100%)
>>> rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
>>> chromium}/x86-64/oe-defaults.gypi (100%)
>>> rename recipes-browser/chromium/{chromium_29.0.1518.2.bb =>
>>> chromium_35.0.1883.0.bb} (84%)
>>>
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>>
>>> b/recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> similarity index 100%
>>> rename from
>>> recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> rename to
>>> recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>>> b/recipes-browser/chromium/chromium/armv6/include.gypi
>>> similarity index 100%
>>> rename from recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
>>> rename to recipes-browser/chromium/chromium/armv6/include.gypi
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>>> b/recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>>> similarity index 100%
>>> rename from
>>> recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
>>> rename to recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>>> b/recipes-browser/chromium/chromium/armv7a/include.gypi
>>> similarity index 100%
>>> rename from
>>> recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
>>> rename to recipes-browser/chromium/chromium/armv7a/include.gypi
>>> diff --git
>>> a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/oe-defaults.gypi
>>> b/recipes-browser/chromium/chromium/armv7a/oe-defaults.gypi
>>> similarity index 100%
>>> rename fr
Re: [oe] [meta-browser][RFT][PATCH] chromium: Upgrade 29 -> 35
On 2014-03-14 14:52, Otavio Salvador wrote:
> On Fri, Mar 14, 2014 at 1:57 PM, Gary Thomas wrote:
>> On 2014-03-13 05:12, Gary Thomas wrote:
>>> On 2014-03-11 22:46, Khem Raj wrote:
Removed already applied patches
License year changed thats why there is change in checksum
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
we see
rpm/bin/debugedit: canonicalization unexpectedly shrank by one character
so we add PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
Signed-off-by: Khem Raj
---
..._focus_tracker_notify_deprecated_since_ATK_2_9_4.patch | 0
.../{chromium-29.0.1518.2 => chromium}/armv6/include.gypi | 0
.../armv6/oe-defaults.gypi| 0
.../armv7a/include.gypi | 0
.../armv7a/oe-defaults.gypi | 0
.../{chromium-29.0.1518.2 => chromium}/google-chrome | 0
.../google-chrome.desktop | 0
.../{chromium-29.0.1518.2 => chromium}/i586/include.gypi | 0
.../i586/oe-defaults.gypi | 0
.../secitem_array.patch | 0
.../uninitialised-warning.patch | 6 +++---
.../{chromium-29.0.1518.2 => chromium}/unistd-2.patch | 0
.../x86-64/include.gypi | 0
.../x86-64/oe-defaults.gypi | 0
.../{chromium_29.0.1518.2.bb => chromium_35.0.1883.0.bb} | 15
---
15 files changed, 11 insertions(+), 10 deletions(-)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
(100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/armv6/include.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/armv6/oe-defaults.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/armv7a/include.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/armv7a/oe-defaults.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/google-chrome (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/google-chrome.desktop (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/i586/include.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/i586/oe-defaults.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/secitem_array.patch (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/uninitialised-warning.patch (96%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/unistd-2.patch (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/x86-64/include.gypi (100%)
rename recipes-browser/chromium/{chromium-29.0.1518.2 =>
chromium}/x86-64/oe-defaults.gypi (100%)
rename recipes-browser/chromium/{chromium_29.0.1518.2.bb =>
chromium_35.0.1883.0.bb} (84%)
diff --git
a/recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
b/recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
similarity index 100%
rename from
recipes-browser/chromium/chromium-29.0.1518.2/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
rename to
recipes-browser/chromium/chromium/001-atk_focus_tracker_notify_deprecated_since_ATK_2_9_4.patch
diff --git
a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
b/recipes-browser/chromium/chromium/armv6/include.gypi
similarity index 100%
rename from
recipes-browser/chromium/chromium-29.0.1518.2/armv6/include.gypi
rename to recipes-browser/chromium/chromium/armv6/include.gypi
diff --git
a/recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
b/recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
similarity index 100%
rename from
recipes-browser/chromium/chromium-29.0.1518.2/armv6/oe-defaults.gypi
rename to recipes-browser/chromium/chromium/armv6/oe-defaults.gypi
diff --git
a/recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
b/recipes-browser/chromium/chromium/armv7a/include.gypi
similarity index 100%
rename from
recipes-browser/chromium/chromium-29.0.1518.2/armv7a/include.gypi
rename to recipes-browser/chromium/chromium/armv7a/include.gypi
diff --git
a/recipes-browser/chromium/
Re: [oe] [meta-browser][PATCH V2] chromium: Upgrade 29 -> 35
On 2014-03-14 12:04, Khem Raj wrote: > Removed already applied patches > > License year changed thats why there is change in checksum > > -// Copyright 2014 The Chromium Authors. All rights reserved. > +// Copyright (c) 2013 The Chromium Authors. All rights reserved. > > we see > > rpm/bin/debugedit: canonicalization unexpectedly shrank by one character > > so we add PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" > > Enable SUID sandbox > > Install ICU configuration file which is required > > Signed-off-by: Khem Raj > Signed-off-by: Gary Thomas Build and run tested. Seems to work fine. -- Gary Thomas | Consulting for the MLB Associates |Embedded world -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
