Date   

Re: psplash and mountpoint -q

Khem Raj
 

On Wed, Aug 5, 2020 at 2:19 AM Mauro Ziliani <mauro@faresoftware.it> wrote:

Hi all.

I'm working woth Zeus on intel platform

When the script is run in shutdown I get the error at line 28

26: export TMPDIR=/mnt/.psplash
27: [ -d $TMPDIR ] || mkdir -p $TMPDIR
28: if [ ! mountpoint -q $TMPDIR ]; then
29: mount tmpfs -t tmpfs $TMPDIR -o,size=40k
30: fi

So I change the line so

28: if [ ! `mountpoint -q $TMPDIR` ]; then


Is this ok?
checking for the return value of mountpount to be non-zero is the
right thing to do here maybe more explicit check like

mountpoint -q $TMPDIR
if [ $? -ne 0 ]; then

might do the trick as well.


MZ


Re: when is it appropriate to push recipe enhancements (eg., class-nativesdk) upstream?

Khem Raj
 

On Wed, Aug 5, 2020 at 4:14 AM Robert P. J. Day <rpjday@crashcourse.ca> wrote:

based on recipe from an existing (zeus-based) project, colleague asks
about a bbappend file, and whether it's appropriate that it be submitted
upstream as a patch -- this example involves "pciutils" recipe from
oe-core, but the question more generally covers any number of recipes.

this particular code base has the following pciutils_%.bbappend file:

=== start ===
PACKAGECONFIG_class-nativesdk = ""

DISABLE_STATIC_pn-nativesdk-pciutils = ""

# Need nativesdk-specific do_install due to ${sbindir} being set to usr/bin
do_install_class-nativesdk () {
oe_runmake DESTDIR=${D} install install-lib

oe_multilib_header pci/config.h
}

BBCLASSEXTEND += "nativesdk"
=== end ===

i'm looking at this for the first time and, sure, it appears to
extend the pciutils recipe for nativesdk. but if that's true, then
would it not make sense to submit that as a patch?

the current zeus "pciutils_3.6.2.bb" recipe doesn't extend the
recipe for nativesdk, so if this bbappend file actually correctly
does that, would it not make sense to contribute that enhancement
back?
yes, it would be good to send a patch to extend the recipe to upstream oe-core
I also see the bbappend is using a greedy wildcard, sometimes they can
be error prone when upgrading
to newer versions of oe-core, so usually I like to recommend that
create version specific bbappends so
it reminds you of this quirk when recipe is upgraded underneath.

in general, there appear to be numerous recipes in this code base
that do little more than extend the recipe for native and nativesdk
because the oe-core (or meta-oe) recipes don't do that.

am i thinking about this correctly? it seems that, if local bbappend
content fixes or enhances a recipe, it would make sense to push that
fix so as to not have to carry around the bbappend files.

thoughts? i'm not passing any judgment on the correctness of this
particular bbappend file, i'm more interested in the general
philosophy of pushing improvements to not have to keep carrying
them around in the local code base.

rday



Re: Does any version of Yocto currently support LLVM/CLANG/and OpenCL ?

Khem Raj
 

Hi Steve

On Thu, Aug 6, 2020 at 9:22 AM Monsees, Steven C (US) via
lists.yoctoproject.org
<steven.monsees=baesystems.com@lists.yoctoproject.org> wrote:

Hello:



I am currently working with rocko 2.4.1… building for X86_64 platforms.



I am looking to add support for LLVM/CLANG/and OpenCL, but thought it might be easier to move to a more recent version of Yocto if support was already in place for these components.
clang support is provided via its own layer ( meta-clang ) see
http://layers.openembedded.org/layerindex/branch/master/layer/meta-clang/
you can add it to your layer mix and it will add needed bits, please
go through README and see what options you need.



Is there a more recent version of the Yocto Project which possibly includes support for these components ?, and if not, has anyone ever attempted to build an SDK to add support these components to their platform ?
There is rocko branch of meta-clang which should work for your release
however rocko is no longer supported for meta-clang, for best results,
I would suggest to move to latest release ( dunfell ) as of now, this
branch is actively supported as well



My first pass attempt finds the “nativesdk-cmake” functional, but the LLVM/CLANG build under the SDK appears to have some issues.

Knowing my current rocko platform is a bit dated, I thought it best to check in and see if porting to a more recent platform might be beneficial.



Thanks,

Steve




Kernel external module with firmware

Sol
 

  Hi,
I followed the hello-mod example and got my module compiling, installed, mounted to target and even functioning (talking to the hw).
I am trying to add now firmware binaries to send to the hardware.

I added the following to my .bb:
do_install_append() {
    install -d ${D}${base_libdir}/firmware/xxx
    install    ${WORKDIR}/FwImage/*.bin ${D}${base_libdir}/firmware/xxx/
}

FILES_${PN}-firmware = "${base_libdir}/firmware/xxx/xxx*.bin"


This is the output from bitbake -e xxx|grep ^FILES_ :
FILES_xxx-firmware="/lib/firmware/xxx/xxx*.bin"
FILES_xxx-bin="/usr/bin/* /usr/sbin/*"
FILES_xxx-locale="/usr/share/locale"
FILES_SOLIBSDEV="/lib/lib*.so /usr/lib/lib*.so"
FILES_xxx-doc="/usr/share/doc /usr/share/man /usr/share/info /usr/share/gtk-doc /usr/share/gnome/help"
FILES_xxx=""
FILES_xxx-dev="/usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal /lib/*.o /usr/lib/xxx/*.la /lib/*.la"
FILES_xxx-dbg="/usr/lib/debug /usr/src/debug"
FILES_xxx-staticdev="/usr/lib/*.a /lib/*.a /usr/lib/xxx/*.a"


But I still get:
ERROR: xxx-module-r0 do_package: QA Issue: xxx: Files/directories were installed but not shipped in any package:
  /lib/firmware
  /lib/firmware/xxx
  /lib/firmware/xxx/xxx1.bin
  /lib/firmware/xxx/xxx2.bin
  /lib/firmware/xxx/xxx3.bin
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
xxx: 5 installed and not shipped files. [installed-vs-shipped]


Any idea what am I doing wrong?

Thanks,
Sol


Re: Is http://downloads.yoctoproject.org/ down?

Scott Branden <scott.branden@...>
 

Hi Richard,

On 2020-08-06 1:35 p.m., Richard Purdie wrote:
On Thu, 2020-08-06 at 11:05 -0700, Scott Branden wrote:
We found the source of the uninative fetch problem:

SOURCE_MIRROR_URL needs to be set in order for uninative to be picked
up from local mirror.

The standard PREMIRRORS mechanism doesn't work for this single
tarball.
So every time a clean poky build took place it always went to the
internet to fetch the uninative tarball
the first time and store it in the local build download.

I think this should be clearly documented somewhere in the yocto
manual?
That definitely explains things. I think its assumed that people would
set appropriate PREMIRRORS to cover uninative in this case but that
isn't documented. I'm not even sure we want for people to have to care
about this :/.

Can you try this change:

diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 70799bbf6d..99072e1326 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -56,9 +56,14 @@ python uninative_event_fetchloader() {
# Our games with path manipulation of DL_DIR mean standard PREMIRRORS don't work
# and we can't easily put 'chksum' into the url path from a url parameter with
# the current fetcher url handling
- ownmirror = d.getVar('SOURCE_MIRROR_URL')
- if ownmirror:
- localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} ${SOURCE_MIRROR_URL}/uninative/%s/${UNINATIVE_TARBALL}" % chksum)
+ premirrors = bb.fetch2.mirror_from_string(localdata.getVar("PREMIRRORS"))
+ for line in premirrors:
+ try:
+ (find, replace) = line
+ except ValueError:
+ continue
+ if find.startswith("http"):
+ localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum))

srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};sha256sum=%s" % chksum)
bb.note("Fetching uninative binary shim from %s" % srcuri)
Note is missleading as it is going to fetch from PREMIRRORS.

Hopefully that handles this case more generically.
Yes, this works.  uninative is now fetched from the PREMIRRORS like all the other downloads even though it prints the note about Fetching uninative binary shim from the URL.

Cheers,
Richard




Re: Is http://downloads.yoctoproject.org/ down?

Richard Purdie
 

On Thu, 2020-08-06 at 11:05 -0700, Scott Branden wrote:
We found the source of the uninative fetch problem:

SOURCE_MIRROR_URL needs to be set in order for uninative to be picked
up from local mirror.

The standard PREMIRRORS mechanism doesn't work for this single
tarball.
So every time a clean poky build took place it always went to the
internet to fetch the uninative tarball
the first time and store it in the local build download.

I think this should be clearly documented somewhere in the yocto
manual?
That definitely explains things. I think its assumed that people would
set appropriate PREMIRRORS to cover uninative in this case but that
isn't documented. I'm not even sure we want for people to have to care
about this :/.

Can you try this change:

diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 70799bbf6d..99072e1326 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -56,9 +56,14 @@ python uninative_event_fetchloader() {
# Our games with path manipulation of DL_DIR mean standard PREMIRRORS don't work
# and we can't easily put 'chksum' into the url path from a url parameter with
# the current fetcher url handling
- ownmirror = d.getVar('SOURCE_MIRROR_URL')
- if ownmirror:
- localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} ${SOURCE_MIRROR_URL}/uninative/%s/${UNINATIVE_TARBALL}" % chksum)
+ premirrors = bb.fetch2.mirror_from_string(localdata.getVar("PREMIRRORS"))
+ for line in premirrors:
+ try:
+ (find, replace) = line
+ except ValueError:
+ continue
+ if find.startswith("http"):
+ localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum))

srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};sha256sum=%s" % chksum)
bb.note("Fetching uninative binary shim from %s" % srcuri)

Hopefully that handles this case more generically.

Cheers,
Richard


[matchbox-window-manager-2][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
---
COPYING | 340 ++++++++++++++++++
matchbox/client-types/mb-wm-client-app.c | 2 +
matchbox/client-types/mb-wm-client-app.h | 10 +-
matchbox/client-types/mb-wm-client-desktop.c | 2 +-
matchbox/client-types/mb-wm-client-desktop.h | 10 +-
matchbox/client-types/mb-wm-client-dialog.c | 2 +-
matchbox/client-types/mb-wm-client-dialog.h | 10 +-
matchbox/client-types/mb-wm-client-input.c | 2 +-
matchbox/client-types/mb-wm-client-input.h | 10 +-
matchbox/client-types/mb-wm-client-menu.c | 2 +-
matchbox/client-types/mb-wm-client-menu.h | 10 +-
matchbox/client-types/mb-wm-client-note.c | 11 +-
matchbox/client-types/mb-wm-client-note.h | 10 +-
matchbox/client-types/mb-wm-client-override.c | 11 +-
matchbox/client-types/mb-wm-client-override.h | 10 +-
matchbox/client-types/mb-wm-client-panel.c | 1 +
matchbox/client-types/mb-wm-client-panel.h | 10 +-
matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c | 10 +-
matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h | 10 +-
matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c | 10 +-
matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h | 10 +-
matchbox/comp-mgr/mb-wm-comp-mgr.c | 10 +-
matchbox/comp-mgr/mb-wm-comp-mgr.h | 10 +-
matchbox/core/mb-window-manager.c | 10 +-
matchbox/core/mb-window-manager.h | 10 +-
matchbox/core/mb-wm-atoms.c | 1 +
matchbox/core/mb-wm-atoms.h | 10 +-
matchbox/core/mb-wm-client-base.c | 10 +-
matchbox/core/mb-wm-client-base.h | 10 +-
matchbox/core/mb-wm-client-window.c | 10 +-
matchbox/core/mb-wm-client-window.h | 10 +-
matchbox/core/mb-wm-client.c | 10 +-
matchbox/core/mb-wm-client.h | 10 +-
matchbox/core/mb-wm-debug.c | 10 +-
matchbox/core/mb-wm-debug.h | 10 +-
matchbox/core/mb-wm-decor.c | 10 +-
matchbox/core/mb-wm-decor.h | 10 +-
matchbox/core/mb-wm-keys.c | 1 +
matchbox/core/mb-wm-keys.h | 10 +-
matchbox/core/mb-wm-layout.c | 1 +
matchbox/core/mb-wm-layout.h | 10 +-
matchbox/core/mb-wm-macros.h | 10 +-
matchbox/core/mb-wm-main-context.c | 1 +
matchbox/core/mb-wm-main-context.h | 10 +-
matchbox/core/mb-wm-object-props.h | 1 +
matchbox/core/mb-wm-object.c | 10 +-
matchbox/core/mb-wm-object.h | 10 +-
matchbox/core/mb-wm-props.c | 1 +
matchbox/core/mb-wm-props.h | 10 +-
matchbox/core/mb-wm-root-window.c | 10 +-
matchbox/core/mb-wm-root-window.h | 10 +-
matchbox/core/mb-wm-stack.c | 10 +-
matchbox/core/mb-wm-stack.h | 10 +-
matchbox/core/mb-wm-types.h | 10 +-
matchbox/core/mb-wm-util.c | 1 +
matchbox/core/mb-wm-util.h | 1 +
matchbox/core/mb-wm.h | 10 +-
matchbox/core/xas.c | 2 +
matchbox/core/xas.h | 2 +
util/matchbox-remote.c | 11 +-
60 files changed, 402 insertions(+), 394 deletions(-)
create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/matchbox/client-types/mb-wm-client-app.c b/matchbox/client-types/mb-wm-client-app.c
index 3aa9d2e..f2b6ef0 100644
--- a/matchbox/client-types/mb-wm-client-app.c
+++ b/matchbox/client-types/mb-wm-client-app.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mb-wm-client-app.h"

#include "mb-wm-theme.h"
diff --git a/matchbox/client-types/mb-wm-client-app.h b/matchbox/client-types/mb-wm-client-app.h
index 935a99c..4181e97 100644
--- a/matchbox/client-types/mb-wm-client-app.h
+++ b/matchbox/client-types/mb-wm-client-app.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-desktop.c b/matchbox/client-types/mb-wm-client-desktop.c
index 81ce628..1a528ee 100644
--- a/matchbox/client-types/mb-wm-client-desktop.c
+++ b/matchbox/client-types/mb-wm-client-desktop.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm-client-desktop.h"
#include "mb-wm-theme.h"

@@ -193,4 +194,3 @@ mb_wm_client_desktop_new (MBWindowManager *wm, MBWMClientWindow *win)

return client;
}
-
diff --git a/matchbox/client-types/mb-wm-client-desktop.h b/matchbox/client-types/mb-wm-client-desktop.h
index 128c450..55b1d6c 100644
--- a/matchbox/client-types/mb-wm-client-desktop.h
+++ b/matchbox/client-types/mb-wm-client-desktop.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-dialog.c b/matchbox/client-types/mb-wm-client-dialog.c
index e4bcdfb..7645899 100644
--- a/matchbox/client-types/mb-wm-client-dialog.c
+++ b/matchbox/client-types/mb-wm-client-dialog.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm-client-dialog.h"

#include "mb-wm-theme.h"
@@ -356,4 +357,3 @@ mb_wm_client_dialog_new (MBWindowManager *wm, MBWMClientWindow *win)

return client;
}
-
diff --git a/matchbox/client-types/mb-wm-client-dialog.h b/matchbox/client-types/mb-wm-client-dialog.h
index fd0eee3..3d9b283 100644
--- a/matchbox/client-types/mb-wm-client-dialog.h
+++ b/matchbox/client-types/mb-wm-client-dialog.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-input.c b/matchbox/client-types/mb-wm-client-input.c
index 3a63d40..d72e23b 100644
--- a/matchbox/client-types/mb-wm-client-input.c
+++ b/matchbox/client-types/mb-wm-client-input.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm-client-input.h"

static void
@@ -181,4 +182,3 @@ mb_wm_client_input_detransitise (MBWindowManagerClient *client)
MBWMClientReqGeomForced);
}
}
-
diff --git a/matchbox/client-types/mb-wm-client-input.h b/matchbox/client-types/mb-wm-client-input.h
index 05ffabd..5fbe429 100644
--- a/matchbox/client-types/mb-wm-client-input.h
+++ b/matchbox/client-types/mb-wm-client-input.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-menu.c b/matchbox/client-types/mb-wm-client-menu.c
index b68f771..2e51c58 100644
--- a/matchbox/client-types/mb-wm-client-menu.c
+++ b/matchbox/client-types/mb-wm-client-menu.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm-client-menu.h"

#include "mb-wm-theme.h"
@@ -153,4 +154,3 @@ mb_wm_client_menu_new (MBWindowManager *wm, MBWMClientWindow *win)

return client;
}
-
diff --git a/matchbox/client-types/mb-wm-client-menu.h b/matchbox/client-types/mb-wm-client-menu.h
index 4908736..93b8719 100644
--- a/matchbox/client-types/mb-wm-client-menu.h
+++ b/matchbox/client-types/mb-wm-client-menu.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-note.c b/matchbox/client-types/mb-wm-client-note.c
index d0bb770..65c861c 100644
--- a/matchbox/client-types/mb-wm-client-note.c
+++ b/matchbox/client-types/mb-wm-client-note.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

@@ -150,4 +142,3 @@ mb_wm_client_note_new (MBWindowManager *wm, MBWMClientWindow *win)

return client;
}
-
diff --git a/matchbox/client-types/mb-wm-client-note.h b/matchbox/client-types/mb-wm-client-note.h
index 3a7d5ba..1a67ebe 100644
--- a/matchbox/client-types/mb-wm-client-note.h
+++ b/matchbox/client-types/mb-wm-client-note.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-override.c b/matchbox/client-types/mb-wm-client-override.c
index 238ce73..f516023 100644
--- a/matchbox/client-types/mb-wm-client-override.c
+++ b/matchbox/client-types/mb-wm-client-override.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

@@ -121,4 +113,3 @@ mb_wm_client_override_new (MBWindowManager *wm, MBWMClientWindow *win)

return client;
}
-
diff --git a/matchbox/client-types/mb-wm-client-override.h b/matchbox/client-types/mb-wm-client-override.h
index 7bf896a..fe2919d 100644
--- a/matchbox/client-types/mb-wm-client-override.h
+++ b/matchbox/client-types/mb-wm-client-override.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/client-types/mb-wm-client-panel.c b/matchbox/client-types/mb-wm-client-panel.c
index c915d6b..2031000 100644
--- a/matchbox/client-types/mb-wm-client-panel.c
+++ b/matchbox/client-types/mb-wm-client-panel.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm-client-panel.h"
#include "mb-wm-theme.h"

diff --git a/matchbox/client-types/mb-wm-client-panel.h b/matchbox/client-types/mb-wm-client-panel.h
index e0b7d77..65d21d0 100644
--- a/matchbox/client-types/mb-wm-client-panel.h
+++ b/matchbox/client-types/mb-wm-client-panel.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
index 21d728f..1610afc 100644
--- a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2008 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
index f67f46c..8865046 100644
--- a/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-clutter.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2008 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c b/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c
index fccb0b0..7b2e382 100644
--- a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.c
@@ -7,15 +7,7 @@
*
* Copyright (c) 2002, 2004, 2007, 2008 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h b/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h
index 8e09fd2..4a5576b 100644
--- a/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr-xrender.h
@@ -7,15 +7,7 @@
*
* Copyright (c) 2002, 2004, 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr.c b/matchbox/comp-mgr/mb-wm-comp-mgr.c
index 160303f..7ec8dd8 100644
--- a/matchbox/comp-mgr/mb-wm-comp-mgr.c
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004, 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/comp-mgr/mb-wm-comp-mgr.h b/matchbox/comp-mgr/mb-wm-comp-mgr.h
index 35ac83d..24b11b6 100644
--- a/matchbox/comp-mgr/mb-wm-comp-mgr.h
+++ b/matchbox/comp-mgr/mb-wm-comp-mgr.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004, 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-window-manager.c b/matchbox/core/mb-window-manager.c
index f6c2232..0a78bf6 100644
--- a/matchbox/core/mb-window-manager.c
+++ b/matchbox/core/mb-window-manager.c
@@ -7,15 +7,7 @@
*
* Copyright (c) 2005, 2007, 2008 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
#include "mb-wm.h"
diff --git a/matchbox/core/mb-window-manager.h b/matchbox/core/mb-window-manager.h
index 3e83532..cc4d5f8 100644
--- a/matchbox/core/mb-window-manager.h
+++ b/matchbox/core/mb-window-manager.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005, 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-atoms.c b/matchbox/core/mb-wm-atoms.c
index 5d7e805..7cf69dc 100644
--- a/matchbox/core/mb-wm-atoms.c
+++ b/matchbox/core/mb-wm-atoms.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm.h"

void
diff --git a/matchbox/core/mb-wm-atoms.h b/matchbox/core/mb-wm-atoms.h
index ef06083..a5aab5d 100644
--- a/matchbox/core/mb-wm-atoms.h
+++ b/matchbox/core/mb-wm-atoms.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-client-base.c b/matchbox/core/mb-wm-client-base.c
index 6460b22..8c4527d 100644
--- a/matchbox/core/mb-wm-client-base.c
+++ b/matchbox/core/mb-wm-client-base.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-client-base.h b/matchbox/core/mb-wm-client-base.h
index edc8008..ea1f1b7 100644
--- a/matchbox/core/mb-wm-client-base.h
+++ b/matchbox/core/mb-wm-client-base.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-client-window.c b/matchbox/core/mb-wm-client-window.c
index 19aa703..4be1c1d 100644
--- a/matchbox/core/mb-wm-client-window.c
+++ b/matchbox/core/mb-wm-client-window.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-client-window.h b/matchbox/core/mb-wm-client-window.h
index 287f881..1b5c050 100644
--- a/matchbox/core/mb-wm-client-window.h
+++ b/matchbox/core/mb-wm-client-window.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-client.c b/matchbox/core/mb-wm-client.c
index f88a8d8..c71a389 100644
--- a/matchbox/core/mb-wm-client.c
+++ b/matchbox/core/mb-wm-client.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-client.h b/matchbox/core/mb-wm-client.h
index 8127b07..7e437ee 100644
--- a/matchbox/core/mb-wm-client.h
+++ b/matchbox/core/mb-wm-client.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-debug.c b/matchbox/core/mb-wm-debug.c
index 75d6e63..f2809a5 100644
--- a/matchbox/core/mb-wm-debug.c
+++ b/matchbox/core/mb-wm-debug.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-debug.h b/matchbox/core/mb-wm-debug.h
index 4c10be4..490dda0 100644
--- a/matchbox/core/mb-wm-debug.h
+++ b/matchbox/core/mb-wm-debug.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-decor.c b/matchbox/core/mb-wm-decor.c
index f4f171b..c2694fb 100644
--- a/matchbox/core/mb-wm-decor.c
+++ b/matchbox/core/mb-wm-decor.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-decor.h b/matchbox/core/mb-wm-decor.h
index 6adeadf..df3571f 100644
--- a/matchbox/core/mb-wm-decor.h
+++ b/matchbox/core/mb-wm-decor.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-keys.c b/matchbox/core/mb-wm-keys.c
index 7c32105..27398cf 100644
--- a/matchbox/core/mb-wm-keys.c
+++ b/matchbox/core/mb-wm-keys.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm.h"
#include <ctype.h> /* isalpha etc */

diff --git a/matchbox/core/mb-wm-keys.h b/matchbox/core/mb-wm-keys.h
index af4dc02..0b72832 100644
--- a/matchbox/core/mb-wm-keys.h
+++ b/matchbox/core/mb-wm-keys.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-layout.c b/matchbox/core/mb-wm-layout.c
index 793276c..a2347ab 100644
--- a/matchbox/core/mb-wm-layout.c
+++ b/matchbox/core/mb-wm-layout.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm.h"
#include "mb-wm-client-input.h"

diff --git a/matchbox/core/mb-wm-layout.h b/matchbox/core/mb-wm-layout.h
index 7ee61d6..51aaea5 100644
--- a/matchbox/core/mb-wm-layout.h
+++ b/matchbox/core/mb-wm-layout.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-macros.h b/matchbox/core/mb-wm-macros.h
index 5c8ab4b..c97caab 100644
--- a/matchbox/core/mb-wm-macros.h
+++ b/matchbox/core/mb-wm-macros.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-main-context.c b/matchbox/core/mb-wm-main-context.c
index 71d5d6c..f735f2e 100644
--- a/matchbox/core/mb-wm-main-context.c
+++ b/matchbox/core/mb-wm-main-context.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm-main-context.h"

#include <sys/time.h>
diff --git a/matchbox/core/mb-wm-main-context.h b/matchbox/core/mb-wm-main-context.h
index d93574c..673a468 100644
--- a/matchbox/core/mb-wm-main-context.h
+++ b/matchbox/core/mb-wm-main-context.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-object-props.h b/matchbox/core/mb-wm-object-props.h
index bc1f753..e547058 100644
--- a/matchbox/core/mb-wm-object-props.h
+++ b/matchbox/core/mb-wm-object-props.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */

#ifndef _HAVE_MB_OBJECT_PROPS_H
#define _HAVE_MB_OBJECT_PROPS_H
diff --git a/matchbox/core/mb-wm-object.c b/matchbox/core/mb-wm-object.c
index 09a6ad4..32607f9 100644
--- a/matchbox/core/mb-wm-object.c
+++ b/matchbox/core/mb-wm-object.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-object.h b/matchbox/core/mb-wm-object.h
index 2df9ea5..eb49b52 100644
--- a/matchbox/core/mb-wm-object.h
+++ b/matchbox/core/mb-wm-object.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-props.c b/matchbox/core/mb-wm-props.c
index 01a74bb..340344b 100644
--- a/matchbox/core/mb-wm-props.c
+++ b/matchbox/core/mb-wm-props.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm.h"
#include "xas.h"

diff --git a/matchbox/core/mb-wm-props.h b/matchbox/core/mb-wm-props.h
index 07418ca..05d9bfb 100644
--- a/matchbox/core/mb-wm-props.h
+++ b/matchbox/core/mb-wm-props.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-root-window.c b/matchbox/core/mb-wm-root-window.c
index 40e2732..46a65dc 100644
--- a/matchbox/core/mb-wm-root-window.c
+++ b/matchbox/core/mb-wm-root-window.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-root-window.h b/matchbox/core/mb-wm-root-window.h
index 7d3cdbe..bc914a0 100644
--- a/matchbox/core/mb-wm-root-window.h
+++ b/matchbox/core/mb-wm-root-window.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2007 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-stack.c b/matchbox/core/mb-wm-stack.c
index f75b228..b864a6f 100644
--- a/matchbox/core/mb-wm-stack.c
+++ b/matchbox/core/mb-wm-stack.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-stack.h b/matchbox/core/mb-wm-stack.h
index 58afc45..147144d 100644
--- a/matchbox/core/mb-wm-stack.h
+++ b/matchbox/core/mb-wm-stack.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-types.h b/matchbox/core/mb-wm-types.h
index 249c875..a3e93b4 100644
--- a/matchbox/core/mb-wm-types.h
+++ b/matchbox/core/mb-wm-types.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/mb-wm-util.c b/matchbox/core/mb-wm-util.c
index 792cb81..b153e32 100644
--- a/matchbox/core/mb-wm-util.c
+++ b/matchbox/core/mb-wm-util.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "mb-wm.h"
#include <stdarg.h>

diff --git a/matchbox/core/mb-wm-util.h b/matchbox/core/mb-wm-util.h
index 07e193d..56bcede 100644
--- a/matchbox/core/mb-wm-util.h
+++ b/matchbox/core/mb-wm-util.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#ifndef _MB_HAVE_UTIL_H
#define _MB_HAVE_UTIL_H

diff --git a/matchbox/core/mb-wm.h b/matchbox/core/mb-wm.h
index 0edbb04..ec51a49 100644
--- a/matchbox/core/mb-wm.h
+++ b/matchbox/core/mb-wm.h
@@ -6,15 +6,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/matchbox/core/xas.c b/matchbox/core/xas.c
index 47329dc..fa7be07 100644
--- a/matchbox/core/xas.c
+++ b/matchbox/core/xas.c
@@ -7,6 +7,8 @@
* Copyright (C) 2002 Havoc Pennington
* Copyright (C) 1986, 1998 The Open Group
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
diff --git a/matchbox/core/xas.h b/matchbox/core/xas.h
index e9b7ca8..8d27cfd 100644
--- a/matchbox/core/xas.h
+++ b/matchbox/core/xas.h
@@ -7,6 +7,8 @@
* Copyright (C) 2002 Havoc Pennington
* Copyright (C) 1986, 1998 The Open Group
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Permission to use, copy, modify, distribute, and sell this software
* and its documentation for any purpose is hereby granted without
* fee, provided that the above copyright notice appear in all copies
diff --git a/util/matchbox-remote.c b/util/matchbox-remote.c
index c83926e..78f1c6f 100644
--- a/util/matchbox-remote.c
+++ b/util/matchbox-remote.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2008 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
#define _GNU_SOURCE
@@ -336,4 +328,3 @@ int main(int argc, char* argv[])

return 0;
}
-
--
2.27.0


[matchbox-tests][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthewzmd@gmail.com>
---
COPYING | 340 ++++++++++++++++++++++++++++++++++++++++++++
argbtest.c | 1 +
gcov-wrapper.sh | 4 +-
libmb-tests.c | 1 +
sendkey.c | 12 +-
test-argb.sh | 3 +
test-dock.sh | 2 +-
test-gconf.sh | 2 +
test-interaction.sh | 2 +
test-windows.sh | 2 +
testrun.sh | 2 +
winspew.c | 14 +-
12 files changed, 361 insertions(+), 24 deletions(-)
create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/argbtest.c b/argbtest.c
index 13b93cc..13737ea 100644
--- a/argbtest.c
+++ b/argbtest.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/gcov-wrapper.sh b/gcov-wrapper.sh
index f56dcec..b1c75c3 100755
--- a/gcov-wrapper.sh
+++ b/gcov-wrapper.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
-# wrapper for generating gcov stats from matchbox source
-#
+# wrapper for generating gcov stats from matchbox source
#
+# SPDX-License-Identifier: GPL-2.0-or-later

if [ -z "$1" ] || [ -z "$2" ]; then
echo
diff --git a/libmb-tests.c b/libmb-tests.c
index 12b1802..250f727 100644
--- a/libmb-tests.c
+++ b/libmb-tests.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/sendkey.c b/sendkey.c
index 73c2676..c9c6d6e 100644
--- a/sendkey.c
+++ b/sendkey.c
@@ -3,16 +3,8 @@

Copyright 2003 Matthew Allum

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
+ SPDX-License-Identifier: GPL-2.0-or-later
+
*/

#include <stdio.h>
diff --git a/test-argb.sh b/test-argb.sh
index 4ffd1ee..1b3d45b 100755
--- a/test-argb.sh
+++ b/test-argb.sh
@@ -1,6 +1,9 @@
#!/bin/bash
#
# test-argb.sh
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
# ====
#
# basically tests a argb window is rendered ok and doesn't crash matchbox
diff --git a/test-dock.sh b/test-dock.sh
index 849eecf..4369383 100755
--- a/test-dock.sh
+++ b/test-dock.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# matchbox-panel test
#
-#
+# SPDX-License-Identifier: GPL-2.0-or-later

if [ -z $(which matchbox-panel|grep "/matchbox-panel") ]; then
echo "$0: 'matchbox-panel' missing! Have you installed Matchbox properly?"
diff --git a/test-gconf.sh b/test-gconf.sh
index 7612cb3..832f0d7 100755
--- a/test-gconf.sh
+++ b/test-gconf.sh
@@ -1,6 +1,8 @@
#!/bin/bash
#
# test-gconf.sh
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
# ====
#
# Tests gconf key shortcut settings.
diff --git a/test-interaction.sh b/test-interaction.sh
index fe3a238..2a9845d 100755
--- a/test-interaction.sh
+++ b/test-interaction.sh
@@ -1,6 +1,8 @@
#!/bin/bash
#
# test-interaction.sh
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
# ====
#
# Launches a number of window types, and then via 'xnee' automates
diff --git a/test-windows.sh b/test-windows.sh
index fc9d7f8..8829b10 100755
--- a/test-windows.sh
+++ b/test-windows.sh
@@ -1,5 +1,7 @@
#!/bin/bash
#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
# script which runs through all the window option tests

if [ \! -x winspew ]; then
diff --git a/testrun.sh b/testrun.sh
index dce949c..b73dbc6 100755
--- a/testrun.sh
+++ b/testrun.sh
@@ -1,5 +1,7 @@
#!/bin/bash
#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
# script for driving all the other Matchbox test scripts
#
# To add a new test, write a file name 'test-<test name>.sh' to the
diff --git a/winspew.c b/winspew.c
index 6cce391..e795c58 100644
--- a/winspew.c
+++ b/winspew.c
@@ -3,23 +3,15 @@

Copyright 2003 Matthew Allum

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
+ SPDX-License-Identifier: GPL-2.0-or-later
+
*/


#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
-
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
--
2.27.0


[matchbox-window-manager][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com>

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthewzmd@gmail.com>
---
COPYING | 340 +++++++++++++++++++++++++++++++++++++++
src/base_client.c | 12 +-
src/base_client.h | 12 +-
src/client_common.c | 12 +-
src/client_common.h | 12 +-
src/composite-engine.c | 12 +-
src/composite-engine.h | 12 +-
src/desktop_client.c | 12 +-
src/desktop_client.h | 12 +-
src/dialog_client.c | 12 +-
src/dialog_client.h | 12 +-
src/dockbar_client.c | 14 +-
src/dockbar_client.h | 12 +-
src/ewmh.c | 12 +-
src/ewmh.h | 12 +-
src/keys.c | 12 +-
src/keys.h | 12 +-
src/list.c | 12 +-
src/list.h | 12 +-
src/main.c | 10 +-
src/main_client.c | 10 +-
src/main_client.h | 12 +-
src/matchbox-remote.c | 12 +-
src/mbtheme-standalone.c | 12 +-
src/mbtheme-standalone.h | 12 +-
src/mbtheme.c | 12 +-
src/mbtheme.h | 12 +-
src/misc.c | 12 +-
src/misc.h | 12 +-
src/select_client.c | 14 +-
src/select_client.h | 12 +-
src/session.c | 12 +-
src/session.h | 12 +-
src/stack.c | 12 +-
src/stack.h | 12 +-
src/structs.h | 12 +-
src/toolbar_client.c | 12 +-
src/toolbar_client.h | 12 +-
src/toolbar_client_alt.c | 12 +-
src/wm.c | 12 +-
src/wm.h | 12 +-
src/xml.c | 12 +-
src/xml.h | 12 +-
43 files changed, 424 insertions(+), 420 deletions(-)
create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/src/base_client.c b/src/base_client.c
index 07f8334..02569ec 100644
--- a/src/base_client.c
+++ b/src/base_client.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/base_client.h b/src/base_client.h
index 60e3f00..1aa40e8 100644
--- a/src/base_client.h
+++ b/src/base_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/client_common.c b/src/client_common.c
index 2b62024..f139f3d 100644
--- a/src/client_common.c
+++ b/src/client_common.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/client_common.h b/src/client_common.h
index dd4c1d3..fc0d70b 100644
--- a/src/client_common.h
+++ b/src/client_common.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/composite-engine.c b/src/composite-engine.c
index 96f850e..de2dad8 100644
--- a/src/composite-engine.c
+++ b/src/composite-engine.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/composite-engine.h b/src/composite-engine.h
index c0b1341..639810d 100644
--- a/src/composite-engine.h
+++ b/src/composite-engine.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/desktop_client.c b/src/desktop_client.c
index 984cab6..2f1ecef 100644
--- a/src/desktop_client.c
+++ b/src/desktop_client.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/desktop_client.h b/src/desktop_client.h
index 9cfe904..153b2fb 100644
--- a/src/desktop_client.h
+++ b/src/desktop_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/dialog_client.c b/src/dialog_client.c
index 399a364..da54710 100644
--- a/src/dialog_client.c
+++ b/src/dialog_client.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/dialog_client.h b/src/dialog_client.h
index ed2685f..7764e88 100644
--- a/src/dialog_client.h
+++ b/src/dialog_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/dockbar_client.c b/src/dockbar_client.c
index 836c003..8a929d4 100644
--- a/src/dockbar_client.c
+++ b/src/dockbar_client.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,19 +6,11 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

-/*
+/*
* a Dockbar is a *Panel*.
*/

diff --git a/src/dockbar_client.h b/src/dockbar_client.h
index 7d805ee..1bc1034 100644
--- a/src/dockbar_client.h
+++ b/src/dockbar_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/ewmh.c b/src/ewmh.c
index afcabe7..dccac67 100644
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/ewmh.h b/src/ewmh.h
index 3e54c07..c6220c2 100644
--- a/src/ewmh.h
+++ b/src/ewmh.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/keys.c b/src/keys.c
index bc83bd4..19ec286 100644
--- a/src/keys.c
+++ b/src/keys.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/keys.h b/src/keys.h
index 8450e82..865d673 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/list.c b/src/list.c
index 2f6251f..a39e8a5 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/list.h b/src/list.h
index 9cdf1f1..9971d99 100644
--- a/src/list.h
+++ b/src/list.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/main.c b/src/main.c
index c201bc4..4c37679 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/main_client.c b/src/main_client.c
index cafe5a0..9640940 100644
--- a/src/main_client.c
+++ b/src/main_client.c
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
#include "main_client.h"
diff --git a/src/main_client.h b/src/main_client.h
index 8f4decd..417354a 100644
--- a/src/main_client.h
+++ b/src/main_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/matchbox-remote.c b/src/matchbox-remote.c
index e6cc076..bcf2c36 100644
--- a/src/matchbox-remote.c
+++ b/src/matchbox-remote.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/
#define _GNU_SOURCE
diff --git a/src/mbtheme-standalone.c b/src/mbtheme-standalone.c
index b754a14..0528074 100644
--- a/src/mbtheme-standalone.c
+++ b/src/mbtheme-standalone.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/mbtheme-standalone.h b/src/mbtheme-standalone.h
index 7aa595a..e4490af 100644
--- a/src/mbtheme-standalone.h
+++ b/src/mbtheme-standalone.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/mbtheme.c b/src/mbtheme.c
index 821195a..7f7527b 100644
--- a/src/mbtheme.c
+++ b/src/mbtheme.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/mbtheme.h b/src/mbtheme.h
index aa9a7c5..e23ed95 100644
--- a/src/mbtheme.h
+++ b/src/mbtheme.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/misc.c b/src/misc.c
index 792ec08..3c34727 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/misc.h b/src/misc.h
index 383a76a..3597844 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/select_client.c b/src/select_client.c
index 0a6c540..56d3712 100644
--- a/src/select_client.c
+++ b/src/select_client.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,19 +6,11 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

-/*
+/*
* A 'select client' is the small titilebar task menu dropdown.
*/

diff --git a/src/select_client.h b/src/select_client.h
index e718cd4..eb04415 100644
--- a/src/select_client.h
+++ b/src/select_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/session.c b/src/session.c
index 8f08279..df06e72 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/session.h b/src/session.h
index b9fcf88..52d5829 100644
--- a/src/session.h
+++ b/src/session.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/stack.c b/src/stack.c
index c985fa2..62fc18b 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/stack.h b/src/stack.h
index 516fe00..c23cea6 100644
--- a/src/stack.h
+++ b/src/stack.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/structs.h b/src/structs.h
index 24985e7..dd9b0d0 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/toolbar_client.c b/src/toolbar_client.c
index 422791b..66af91d 100644
--- a/src/toolbar_client.c
+++ b/src/toolbar_client.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/toolbar_client.h b/src/toolbar_client.h
index 61c4281..57a4ce1 100644
--- a/src/toolbar_client.h
+++ b/src/toolbar_client.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/toolbar_client_alt.c b/src/toolbar_client_alt.c
index e7f6975..3a0c233 100644
--- a/src/toolbar_client_alt.c
+++ b/src/toolbar_client_alt.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/wm.c b/src/wm.c
index 0823fef..b1ce058 100644
--- a/src/wm.c
+++ b/src/wm.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/wm.h b/src/wm.h
index 52de97e..37f218c 100644
--- a/src/wm.h
+++ b/src/wm.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/xml.c b/src/xml.c
index 2a48f14..c7601bb 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

diff --git a/src/xml.h b/src/xml.h
index ac0ab63..f737bae 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -1,4 +1,4 @@
-/*
+/*
* Matchbox Window Manager - A lightweight window manager not for the
* desktop.
*
@@ -6,15 +6,7 @@
*
* Copyright (c) 2002, 2004 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
*/

--
2.27.0


[matchbox-terminal][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
---
main.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/main.c b/main.c
index c0672df..dfa3634 100644
--- a/main.c
+++ b/main.c
@@ -1,19 +1,8 @@
-/*
+/*
* Copyright (C) 2007 OpenedHand Ltd
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#include <gtk/gtk.h>
--
2.27.0


[matchbox-panel-manager][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthewzmd@gmail.com>
---
mbpanelmgr.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/mbpanelmgr.c b/mbpanelmgr.c
index 4d45665..c65d229 100644
--- a/mbpanelmgr.c
+++ b/mbpanelmgr.c
@@ -1,17 +1,9 @@
/*
- * Gtk2 Based matchbox panel manager.
+ * Gtk2 Based matchbox panel manager.
*
* Copyright 2003 Matthew Allum <mallum@handhelds.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/

#include <sys/types.h>
--
2.27.0


[matchbox-panel-2][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
---
applets/battery/battery-acpi.c | 2 ++
applets/battery/battery-apm.c | 2 ++
applets/battery/battery.c | 2 ++
applets/battery/battery.h | 2 ++
applets/brightness/brightness.c | 2 ++
applets/clock/clock.c | 2 ++
applets/common/test_main.c | 2 ++
applets/exit/exit.c | 2 ++
applets/launcher/launcher.c | 2 ++
applets/notify/applet.c | 2 ++
applets/notify/mb-notification.c | 2 ++
applets/notify/mb-notification.h | 2 ++
applets/notify/notify-store.c | 2 ++
applets/notify/notify-store.h | 2 ++
applets/showdesktop/showdesktop.c | 2 ++
applets/startup-notify/startup.c | 2 ++
applets/startup/startup.c | 2 ++
applets/systray/fixedtip.c | 4 +++-
applets/systray/fixedtip.h | 4 +++-
applets/systray/na-tray-child.c | 2 ++
applets/systray/na-tray-child.h | 2 ++
applets/systray/na-tray-manager.c | 2 ++
applets/systray/na-tray-manager.h | 2 ++
applets/systray/na-tray.c | 2 ++
applets/systray/na-tray.h | 2 ++
applets/systray/systray.c | 2 ++
applets/windowselector/windowselector.c | 2 ++
matchbox-panel/mb-panel-scaling-image.c | 2 ++
matchbox-panel/mb-panel-scaling-image.h | 2 ++
matchbox-panel/mb-panel-scaling-image2.c | 2 ++
matchbox-panel/mb-panel-scaling-image2.h | 2 ++
matchbox-panel/mb-panel.c | 2 ++
matchbox-panel/mb-panel.h | 2 ++
33 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/applets/battery/battery-acpi.c b/applets/battery/battery-acpi.c
index 8431127..d1d3de9 100644
--- a/applets/battery/battery-acpi.c
+++ b/applets/battery/battery-acpi.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 Intel.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/

diff --git a/applets/battery/battery-apm.c b/applets/battery/battery-apm.c
index 2f39cb6..edaba43 100644
--- a/applets/battery/battery-apm.c
+++ b/applets/battery/battery-apm.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 Intel.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/

diff --git a/applets/battery/battery.c b/applets/battery/battery.c
index c755856..b11517d 100644
--- a/applets/battery/battery.c
+++ b/applets/battery/battery.c
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/battery/battery.h b/applets/battery/battery.h
index cf23431..534988f 100644
--- a/applets/battery/battery.h
+++ b/applets/battery/battery.h
@@ -1,6 +1,8 @@
/*
* (C) 2008 Intel.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/

diff --git a/applets/brightness/brightness.c b/applets/brightness/brightness.c
index f605fbe..a523b29 100644
--- a/applets/brightness/brightness.c
+++ b/applets/brightness/brightness.c
@@ -1,6 +1,8 @@
/*
* Author: Manuel Teira <manuel.teira@telefonica.net>
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Licensed under the GPL v2 or greater.
*/

diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index a71f895..b8057a4 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -3,6 +3,8 @@
/*
* (C) 2006-2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
* Ross Burton <ross.burton@intel.com>
*
diff --git a/applets/common/test_main.c b/applets/common/test_main.c
index 4558616..94de9a6 100644
--- a/applets/common/test_main.c
+++ b/applets/common/test_main.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include <config.h>
#include <gtk/gtk.h>

diff --git a/applets/exit/exit.c b/applets/exit/exit.c
index f973bb7..480683a 100644
--- a/applets/exit/exit.c
+++ b/applets/exit/exit.c
@@ -1,6 +1,8 @@
/*
* (C) 2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross.burton@intel.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/launcher/launcher.c b/applets/launcher/launcher.c
index d1ab8e4..046de0c 100644
--- a/applets/launcher/launcher.c
+++ b/applets/launcher/launcher.c
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/notify/applet.c b/applets/notify/applet.c
index 2d896e8..6c378c8 100644
--- a/applets/notify/applet.c
+++ b/applets/notify/applet.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/notify/mb-notification.c b/applets/notify/mb-notification.c
index c73b21f..f4463a0 100644
--- a/applets/notify/mb-notification.c
+++ b/applets/notify/mb-notification.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include <gtk/gtk.h>
#include "mb-notification.h"

diff --git a/applets/notify/mb-notification.h b/applets/notify/mb-notification.h
index ecf5ca1..c609ec0 100644
--- a/applets/notify/mb-notification.h
+++ b/applets/notify/mb-notification.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _MB_NOTIFICATION
#define _MB_NOTIFICATION

diff --git a/applets/notify/notify-store.c b/applets/notify/notify-store.c
index f25c8b9..bfae532 100644
--- a/applets/notify/notify-store.c
+++ b/applets/notify/notify-store.c
@@ -1,6 +1,8 @@
/*
* (C) 2008 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/notify/notify-store.h b/applets/notify/notify-store.h
index b1cdd42..0a2b562 100644
--- a/applets/notify/notify-store.h
+++ b/applets/notify/notify-store.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _MB_NOTIFY_STORE
#define _MB_NOTIFY_STORE

diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c
index 14f9d96..36c14d8 100644
--- a/applets/showdesktop/showdesktop.c
+++ b/applets/showdesktop/showdesktop.c
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/applets/startup-notify/startup.c b/applets/startup-notify/startup.c
index a4686ef..c69bddb 100644
--- a/applets/startup-notify/startup.c
+++ b/applets/startup-notify/startup.c
@@ -7,6 +7,8 @@
* Portions by Matthew Allum <mallum@o-hand.com>,
* Stefan Schmidt <stefan@openmoko.org>.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; version 2 of the license.
diff --git a/applets/startup/startup.c b/applets/startup/startup.c
index 026dce2..3d3f0d7 100644
--- a/applets/startup/startup.c
+++ b/applets/startup/startup.c
@@ -9,6 +9,8 @@
* Stefan Schmidt <stefan@openmoko.org>
* Ross Burton <ross.burton@intel.com>
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Based on mb-applet-startup-monitor
*
* This program is free software; you can redistribute it and/or modify
diff --git a/applets/systray/fixedtip.c b/applets/systray/fixedtip.c
index ce19067..bc7d86d 100644
--- a/applets/systray/fixedtip.c
+++ b/applets/systray/fixedtip.c
@@ -3,7 +3,9 @@
/*
* Copyright (C) 2001 Havoc Pennington
* Copyright (C) 2003-2006 Vincent Untz
- *
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
diff --git a/applets/systray/fixedtip.h b/applets/systray/fixedtip.h
index a29e85c..e5b69c0 100644
--- a/applets/systray/fixedtip.h
+++ b/applets/systray/fixedtip.h
@@ -3,7 +3,9 @@
/*
* Copyright (C) 2001 Havoc Pennington, 2002 Red Hat Inc.
* Copyright (C) 2003-2006 Vincent Untz
- *
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
diff --git a/applets/systray/na-tray-child.c b/applets/systray/na-tray-child.c
index 1042940..949d612 100644
--- a/applets/systray/na-tray-child.c
+++ b/applets/systray/na-tray-child.c
@@ -3,6 +3,8 @@
* Copyright (C) 2003-2006 Vincent Untz
* Copyright (C) 2008 Red Hat, Inc.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray-child.h b/applets/systray/na-tray-child.h
index 29cab3b..c3f181b 100644
--- a/applets/systray/na-tray-child.h
+++ b/applets/systray/na-tray-child.h
@@ -4,6 +4,8 @@
* Copyright (C) 2003-2006 Vincent Untz
* Copyright (C) 2008 Red Hat, Inc.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray-manager.c b/applets/systray/na-tray-manager.c
index 8999350..493ecd1 100644
--- a/applets/systray/na-tray-manager.c
+++ b/applets/systray/na-tray-manager.c
@@ -2,6 +2,8 @@
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
* Copyright (C) 2003-2006 Vincent Untz
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray-manager.h b/applets/systray/na-tray-manager.h
index 0408959..b14db4e 100644
--- a/applets/systray/na-tray-manager.h
+++ b/applets/systray/na-tray-manager.h
@@ -3,6 +3,8 @@
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
* Copyright (C) 2003-2006 Vincent Untz
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/na-tray.c b/applets/systray/na-tray.c
index 714bd90..9d98df3 100644
--- a/applets/systray/na-tray.c
+++ b/applets/systray/na-tray.c
@@ -3,6 +3,8 @@
* Copyright (C) 2003-2006 Vincent Untz
* Copyright (C) 2007 Christian Persch
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
diff --git a/applets/systray/na-tray.h b/applets/systray/na-tray.h
index 8fd7db4..af1a099 100644
--- a/applets/systray/na-tray.h
+++ b/applets/systray/na-tray.h
@@ -3,6 +3,8 @@
* Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
* Copyright (C) 2003-2006 Vincent Untz
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
diff --git a/applets/systray/systray.c b/applets/systray/systray.c
index 39698a8..92d0ae0 100644
--- a/applets/systray/systray.c
+++ b/applets/systray/systray.c
@@ -2,6 +2,8 @@
/*
* (C) 2006-2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
* Ross Burton <ross.burton@intel.com>
*
diff --git a/applets/windowselector/windowselector.c b/applets/windowselector/windowselector.c
index 33f12f5..77eb219 100644
--- a/applets/windowselector/windowselector.c
+++ b/applets/windowselector/windowselector.c
@@ -1,6 +1,8 @@
/*
* (C) 2006, 2007 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Authors: Jorn Baayen <jorn@openedhand.com>
* Ross Burton <ross@openedhand.com>
*
diff --git a/matchbox-panel/mb-panel-scaling-image.c b/matchbox-panel/mb-panel-scaling-image.c
index 56d2d78..3e13232 100644
--- a/matchbox-panel/mb-panel-scaling-image.c
+++ b/matchbox-panel/mb-panel-scaling-image.c
@@ -2,6 +2,8 @@
/*
* (C) 2006, 2007 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel-scaling-image.h b/matchbox-panel/mb-panel-scaling-image.h
index cd63754..e5fdad6 100644
--- a/matchbox-panel/mb-panel-scaling-image.h
+++ b/matchbox-panel/mb-panel-scaling-image.h
@@ -1,6 +1,8 @@
/*
* (C) 2006, 2007 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel-scaling-image2.c b/matchbox-panel/mb-panel-scaling-image2.c
index 258f1e4..f0aaeb5 100644
--- a/matchbox-panel/mb-panel-scaling-image2.c
+++ b/matchbox-panel/mb-panel-scaling-image2.c
@@ -2,6 +2,8 @@
/*
* (C) 2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross.burton@intel.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel-scaling-image2.h b/matchbox-panel/mb-panel-scaling-image2.h
index 5c0dd76..12d5d6b 100644
--- a/matchbox-panel/mb-panel-scaling-image2.h
+++ b/matchbox-panel/mb-panel-scaling-image2.h
@@ -1,6 +1,8 @@
/*
* (C) 2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Ross Burton <ross.burton@intel.com>
*
* Licensed under the GPL v2 or greater.
diff --git a/matchbox-panel/mb-panel.c b/matchbox-panel/mb-panel.c
index 4f5fb74..49aeb46 100644
--- a/matchbox-panel/mb-panel.c
+++ b/matchbox-panel/mb-panel.c
@@ -3,6 +3,8 @@
/*
* (C) 2006-2013 Intel Corp
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Authors: Ross Burton <ross.burton@intel.com>
* Jorn Baayen <jorn@openedhand.com>
*
diff --git a/matchbox-panel/mb-panel.h b/matchbox-panel/mb-panel.h
index be367dd..91e5442 100644
--- a/matchbox-panel/mb-panel.h
+++ b/matchbox-panel/mb-panel.h
@@ -1,6 +1,8 @@
/*
* (C) 2006 OpenedHand Ltd.
*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
* Author: Jorn Baayen <jorn@openedhand.com>
*
* Licensed under the GPL v2 or greater.
--
2.27.0


[matchbox-keyboard][PATCH] Add SPDX-License-Identifier: LGPL-2.1

Matthew
 

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
---
applet/applet.c | 8 +-------
examples/matchbox-keyboard-gtk-embed.c | 2 ++
gtk-im/im-context.c | 9 +--------
gtk-im/im-context.h | 9 +--------
gtk-im/im-module.c | 9 +--------
gtk-im/im-protocol.c | 9 +--------
gtk-im/im-protocol.h | 9 +--------
src/config-parser.c | 10 +---------
src/libmatchbox-keyboard.c | 9 +--------
src/libmatchbox-keyboard.h | 9 +--------
src/main.c | 10 +---------
src/matchbox-keyboard-image.c | 9 +--------
src/matchbox-keyboard-key.c | 10 +---------
src/matchbox-keyboard-layout.c | 10 +---------
src/matchbox-keyboard-popup.c | 9 +--------
src/matchbox-keyboard-popup.h | 9 +--------
src/matchbox-keyboard-remote.c | 9 +--------
src/matchbox-keyboard-remote.h | 9 +--------
src/matchbox-keyboard-row.c | 9 +--------
src/matchbox-keyboard-ui-cairo-backend.c | 9 +--------
src/matchbox-keyboard-ui-cairo-backend.h | 9 +--------
src/matchbox-keyboard-ui-xft-backend.c | 9 +--------
src/matchbox-keyboard-ui-xft-backend.h | 9 +--------
src/matchbox-keyboard-ui.c | 9 +--------
src/matchbox-keyboard-xembed.c | 9 +--------
src/matchbox-keyboard.c | 9 +--------
src/matchbox-keyboard.h | 9 +--------
src/mb-gtk-keyboard.c | 1 +
src/mb-gtk-keyboard.h | 1 +
src/util-list.c | 9 +--------
src/util.c | 9 +--------
31 files changed, 32 insertions(+), 227 deletions(-)

diff --git a/applet/applet.c b/applet/applet.c
index 69cc600..3fdd049 100644
--- a/applet/applet.c
+++ b/applet/applet.c
@@ -7,14 +7,8 @@
* Ross Burton <ross@openedhand.com>
* Stefan Schmidt <stefan@openmoko.org>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1
*
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
*/

#include <gtk/gtk.h>
diff --git a/examples/matchbox-keyboard-gtk-embed.c b/examples/matchbox-keyboard-gtk-embed.c
index bbf9b19..66f6a66 100644
--- a/examples/matchbox-keyboard-gtk-embed.c
+++ b/examples/matchbox-keyboard-gtk-embed.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: LGPL-2.1 */
+
#include <gtk/gtk.h>

#include <fcntl.h>
diff --git a/gtk-im/im-context.c b/gtk-im/im-context.c
index 3e1749e..2c4cce1 100644
--- a/gtk-im/im-context.c
+++ b/gtk-im/im-context.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2007-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/gtk-im/im-context.h b/gtk-im/im-context.h
index 0ee6710..58ef159 100644
--- a/gtk-im/im-context.h
+++ b/gtk-im/im-context.h
@@ -5,14 +5,7 @@
*
* Copyright (c) 2007-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/gtk-im/im-module.c b/gtk-im/im-module.c
index d4734e1..049aa17 100644
--- a/gtk-im/im-module.c
+++ b/gtk-im/im-module.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2007-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/gtk-im/im-protocol.c b/gtk-im/im-protocol.c
index de98fd6..cbc8bd1 100644
--- a/gtk-im/im-protocol.c
+++ b/gtk-im/im-protocol.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2007-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/gtk-im/im-protocol.h b/gtk-im/im-protocol.h
index e189a76..ae2995b 100644
--- a/gtk-im/im-protocol.h
+++ b/gtk-im/im-protocol.h
@@ -5,14 +5,7 @@
*
* Copyright (c) 2007-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/config-parser.c b/src/config-parser.c
index fc0b903..4a30d2b 100644
--- a/src/config-parser.c
+++ b/src/config-parser.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

@@ -752,4 +745,3 @@ mb_kbd_config_load(MBKeyboard *kbd, char *variant, char *lang)

return retval;
}
-
diff --git a/src/libmatchbox-keyboard.c b/src/libmatchbox-keyboard.c
index 1b3a051..4d73961 100644
--- a/src/libmatchbox-keyboard.c
+++ b/src/libmatchbox-keyboard.c
@@ -7,14 +7,7 @@
*
* Copyright (c) 2012 Vernier Software and Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/libmatchbox-keyboard.h b/src/libmatchbox-keyboard.h
index 7cbd4f8..45ce74b 100644
--- a/src/libmatchbox-keyboard.h
+++ b/src/libmatchbox-keyboard.h
@@ -7,14 +7,7 @@
*
* Copyright (c) 2012 Vernier Software and Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/main.c b/src/main.c
index 75c263f..d4e8b39 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,15 +5,7 @@
*
* Copyright (c) 2005 OpenedHand Ltd - http://o-hand.com
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/matchbox-keyboard-image.c b/src/matchbox-keyboard-image.c
index 92485dc..723f510 100644
--- a/src/matchbox-keyboard-image.c
+++ b/src/matchbox-keyboard-image.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2005-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-key.c b/src/matchbox-keyboard-key.c
index 18305e4..5cb7907 100644
--- a/src/matchbox-keyboard-key.c
+++ b/src/matchbox-keyboard-key.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

@@ -873,4 +866,3 @@ mb_kbd_key_dump_key(MBKeyboardKey *key)
fprintf(stderr, "-------------------------------\n");

}
-
diff --git a/src/matchbox-keyboard-layout.c b/src/matchbox-keyboard-layout.c
index e5e6b2a..04e3caa 100644
--- a/src/matchbox-keyboard-layout.c
+++ b/src/matchbox-keyboard-layout.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

@@ -77,4 +70,3 @@ mb_kbd_layout_rows(MBKeyboardLayout *layout)
{
return util_list_get_first(layout->rows);
}
-
diff --git a/src/matchbox-keyboard-popup.c b/src/matchbox-keyboard-popup.c
index 8c35300..0e80d0d 100644
--- a/src/matchbox-keyboard-popup.c
+++ b/src/matchbox-keyboard-popup.c
@@ -6,14 +6,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software and Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/
#include <math.h>
diff --git a/src/matchbox-keyboard-popup.h b/src/matchbox-keyboard-popup.h
index 13787e1..ccf6483 100644
--- a/src/matchbox-keyboard-popup.h
+++ b/src/matchbox-keyboard-popup.h
@@ -5,14 +5,7 @@
*
* Copyright (c) 2012 Vernier Software and Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-remote.c b/src/matchbox-keyboard-remote.c
index 1d51cfb..e280348 100644
--- a/src/matchbox-keyboard-remote.c
+++ b/src/matchbox-keyboard-remote.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2007-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-remote.h b/src/matchbox-keyboard-remote.h
index 5c911f0..46e0d98 100644
--- a/src/matchbox-keyboard-remote.h
+++ b/src/matchbox-keyboard-remote.h
@@ -5,14 +5,7 @@
*
* Copyright (c) 2005-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-row.c b/src/matchbox-keyboard-row.c
index d69d20a..f163894 100644
--- a/src/matchbox-keyboard-row.c
+++ b/src/matchbox-keyboard-row.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-ui-cairo-backend.c b/src/matchbox-keyboard-ui-cairo-backend.c
index 438e6e3..0b5ee4f 100644
--- a/src/matchbox-keyboard-ui-cairo-backend.c
+++ b/src/matchbox-keyboard-ui-cairo-backend.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-ui-cairo-backend.h b/src/matchbox-keyboard-ui-cairo-backend.h
index 373f2fd..42d1706 100644
--- a/src/matchbox-keyboard-ui-cairo-backend.h
+++ b/src/matchbox-keyboard-ui-cairo-backend.h
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-ui-xft-backend.c b/src/matchbox-keyboard-ui-xft-backend.c
index f7efc0f..26766a7 100644
--- a/src/matchbox-keyboard-ui-xft-backend.c
+++ b/src/matchbox-keyboard-ui-xft-backend.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-ui-xft-backend.h b/src/matchbox-keyboard-ui-xft-backend.h
index 87c1262..8bbcdef 100644
--- a/src/matchbox-keyboard-ui-xft-backend.h
+++ b/src/matchbox-keyboard-ui-xft-backend.h
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-ui.c b/src/matchbox-keyboard-ui.c
index 988504e..e0e67ba 100644
--- a/src/matchbox-keyboard-ui.c
+++ b/src/matchbox-keyboard-ui.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard-xembed.c b/src/matchbox-keyboard-xembed.c
index 9f2bdc0..3cd8b01 100644
--- a/src/matchbox-keyboard-xembed.c
+++ b/src/matchbox-keyboard-xembed.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/matchbox-keyboard.c b/src/matchbox-keyboard.c
index 5dce4a3..1c6506d 100644
--- a/src/matchbox-keyboard.c
+++ b/src/matchbox-keyboard.c
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/
#ifdef HAVE_CONFIG_H
diff --git a/src/matchbox-keyboard.h b/src/matchbox-keyboard.h
index 9654810..4cba305 100644
--- a/src/matchbox-keyboard.h
+++ b/src/matchbox-keyboard.h
@@ -7,14 +7,7 @@
* Copyright (c) 2005-2012 Intel Corp
* Copyright (c) 2012 Vernier Software & Technology
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/mb-gtk-keyboard.c b/src/mb-gtk-keyboard.c
index e46d762..c35c3c4 100644
--- a/src/mb-gtk-keyboard.c
+++ b/src/mb-gtk-keyboard.c
@@ -1,4 +1,5 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* SPDX-License-Identifier: LGPL-2.1 */

#include "libmatchbox-keyboard.h"
#include "matchbox-keyboard.h"
diff --git a/src/mb-gtk-keyboard.h b/src/mb-gtk-keyboard.h
index 06eabcc..a5d31f1 100644
--- a/src/mb-gtk-keyboard.h
+++ b/src/mb-gtk-keyboard.h
@@ -1,4 +1,5 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* SPDX-License-Identifier: LGPL-2.1 */

#ifndef _MB_GTK_KEYBOARD_H
#define _MB_GTK_KEYBOARD_H
diff --git a/src/util-list.c b/src/util-list.c
index 664af94..37bc48d 100644
--- a/src/util-list.c
+++ b/src/util-list.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2005-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

diff --git a/src/util.c b/src/util.c
index ba20c53..560f451 100644
--- a/src/util.c
+++ b/src/util.c
@@ -5,14 +5,7 @@
*
* Copyright (c) 2005-2012 Intel Corp
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
+ * SPDX-License-Identifier: LGPL-2.1
*
*/

--
2.27.0


Re: Is http://downloads.yoctoproject.org/ down?

Scott Branden <scott.branden@...>
 

We found the source of the uninative fetch problem:

SOURCE_MIRROR_URL needs to be set in order for uninative to be picked up from local mirror.

The standard PREMIRRORS mechanism doesn't work for this single tarball.
So every time a clean poky build took place it always went to the internet to fetch the uninative tarball
the first time and store it in the local build download.

I think this should be clearly documented somewhere in the yocto manual?

On 2020-08-05 10:07 a.m., Scott Branden wrote:
Hi Richard,

On 2020-08-05 2:50 a.m., Richard Purdie wrote:
On Tue, 2020-08-04 at 14:36 -0700, Scott Branden via
lists.yoctoproject.org wrote:
With downloads.yoctoproject.org down again this begs the question:

Why does uninative tarball get fetched by default from the internet
every time?
Why is it in not cached like every other tarball that is downloaded
by recipes?
The default behaviour for the yocto project should be to have the
tarball stored in the yocto cache such that it is not fetched every
time?
Those are good questions.

As far as I know on my own local builds, the uninative tarball *is*
cached locally in DL_DIR. We don't see repeated downloads on the
autobuilder either so it appears to work there too.
Yes, the uninative tarball *is* cached but I see repeated downloads.
If you're not seeing that it would definitely be something to
investigate.
I just did a clone of poky.git and the repeated downloads do NOT happen.
So I now need to investigate what is different when adding layers and conf settings
that is causing the issue.

Cheers,

Richard
Thanks for confirming the uninative caching should work, but it is not in my environment and I will have to investigate.

Scott


Re: out of kernel custom module build fails

Quentin Schulz
 

Hi Rob,

On Thu, Aug 06, 2020 at 12:37:15PM -0400, Rob Prowel wrote:
On 2020-08-06 11:45, Rob Prowel wrote:
the important bb file content is:

inherit module
SRC_URI = "file://Makefile \
           file://customslip.c \
           file://customslip.h \
           file://COPYING \
          "
S = "${WORKDIR}"

RPROVIDES_${PN} += "kernel-module-customslip"

------------------
What yocto override variable can I set in the bb to make it not care
what the localversion appended to the kernel name is?
adding DEPENDS_${PN} = "virtual/kernel" seems to have fixed this (making the
DEPENDS_${PN} does nothing, so that's not what fixed it ;)

I doubt LOCAL_VERSION_EXTEND or however it's called is used for creating
the package version of the kernel. I'd expect the dependencies to check
for the package version and not some other variable. So probably PV of
the kernel recipe is the correct variable to change? Just throwing
ideas.

Quentin


[matchbox-desktop][PATCHv2] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

Fixes [YOCTO #13319]

Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
---
COPYING | 340 ++++++++++++++++++++++++++++++++++++
modules/dotdesktop.c | 2 +
modules/simplefilebrowser.c | 2 +
modules/tasks.c | 2 +
src/mbdesktop.c | 12 +-
src/mbdesktop.h | 2 +
src/mbdesktop_item.c | 2 +
src/mbdesktop_item.h | 2 +
src/mbdesktop_module.c | 2 +
src/mbdesktop_module.h | 2 +
src/mbdesktop_view.c | 2 +
src/mbdesktop_view.h | 2 +
src/mbdesktop_win_plugin.c | 2 +
src/mbdesktop_win_plugin.h | 2 +
14 files changed, 366 insertions(+), 10 deletions(-)
create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/modules/dotdesktop.c b/modules/dotdesktop.c
index 22dde99..372f969 100644
--- a/modules/dotdesktop.c
+++ b/modules/dotdesktop.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"

#ifdef USE_LIBSN
diff --git a/modules/simplefilebrowser.c b/modules/simplefilebrowser.c
index e68c481..1118df1 100644
--- a/modules/simplefilebrowser.c
+++ b/modules/simplefilebrowser.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/modules/tasks.c b/modules/tasks.c
index 5437c13..ed8d1a7 100644
--- a/modules/tasks.c
+++ b/modules/tasks.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"

static int trapped_error_code = 0;
diff --git a/src/mbdesktop.c b/src/mbdesktop.c
index 90dc364..309d84f 100644
--- a/src/mbdesktop.c
+++ b/src/mbdesktop.c
@@ -1,17 +1,9 @@
/*
- mbdesktop - a desktop for handhelds etc.
+ mbdesktop - a desktop for handhelds etc.

Copyright 2002 Matthew Allum

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ SPDX-License-Identifier: GPL-2.0-or-later
*/


diff --git a/src/mbdesktop.h b/src/mbdesktop.h
index cbb4aff..4231e58 100644
--- a/src/mbdesktop.h
+++ b/src/mbdesktop.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_H
#define _HAVE_MBDESKTOP_H

diff --git a/src/mbdesktop_item.c b/src/mbdesktop_item.c
index 4bd7dd7..e7e7fcf 100644
--- a/src/mbdesktop_item.c
+++ b/src/mbdesktop_item.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_item.h"
#include "mbdesktop_module.h"
#include "md5.h"
diff --git a/src/mbdesktop_item.h b/src/mbdesktop_item.h
index 6eb7770..073f659 100644
--- a/src/mbdesktop_item.h
+++ b/src/mbdesktop_item.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_ITEM_H
#define _HAVE_MBDESKTOP_ITEM_H

diff --git a/src/mbdesktop_module.c b/src/mbdesktop_module.c
index 7c961b2..4c18b48 100644
--- a/src/mbdesktop_module.c
+++ b/src/mbdesktop_module.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"

MBDesktopItem *
diff --git a/src/mbdesktop_module.h b/src/mbdesktop_module.h
index c31e091..dde93bc 100644
--- a/src/mbdesktop_module.h
+++ b/src/mbdesktop_module.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_MODULE_H
#define _HAVE_MBDESKTOP_MODULE_H

diff --git a/src/mbdesktop_view.c b/src/mbdesktop_view.c
index 8ee20f6..0b552c0 100644
--- a/src/mbdesktop_view.c
+++ b/src/mbdesktop_view.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_view.h"

static void
diff --git a/src/mbdesktop_view.h b/src/mbdesktop_view.h
index 44fcffc..659ea35 100644
--- a/src/mbdesktop_view.h
+++ b/src/mbdesktop_view.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_VIEW_H
#define _HAVE_MBDESKTOP_VIEW_H

diff --git a/src/mbdesktop_win_plugin.c b/src/mbdesktop_win_plugin.c
index e302f9e..a2f5fb1 100644
--- a/src/mbdesktop_win_plugin.c
+++ b/src/mbdesktop_win_plugin.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop.h"
#include "mbdesktop_win_plugin.h"

diff --git a/src/mbdesktop_win_plugin.h b/src/mbdesktop_win_plugin.h
index 2211b23..8a78233 100644
--- a/src/mbdesktop_win_plugin.h
+++ b/src/mbdesktop_win_plugin.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_WIN_PLUGIN_H
#define _HAVE_MBDESKTOP_WIN_PLUGIN_H

--
2.27.0


Re: out of kernel custom module build fails

Rob Prowel
 

On 2020-08-06 11:45, Rob Prowel wrote:
the important bb file content is:
inherit module
SRC_URI = "file://Makefile \
           file://customslip.c \
           file://customslip.h \
           file://COPYING \
          "
S = "${WORKDIR}"
RPROVIDES_${PN} += "kernel-module-customslip"
------------------
What yocto override variable can I set in the bb to make it not care what the localversion appended to the kernel name is?
adding DEPENDS_${PN} = "virtual/kernel" seems to have fixed this (making the kernel build the single dependency?), but the more important question is whether that is the "right" way to fix it.


Re: [matchbox-desktop][PATCH] Add SPDX-License-Identifier: GPL-2.0-or-later

Matthew
 

Ouch, whitespaces also got removed from the patch file.
Will submit another patch, with the file COPYING as well.

Matthew <matthew.zeng@windriver.com> writes:

Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
---
modules/dotdesktop.c | 2 ++
modules/simplefilebrowser.c | 2 ++
modules/tasks.c | 2 ++
src/mbdesktop.c | 12 ++----------
src/mbdesktop.h | 2 ++
src/mbdesktop_item.c | 2 ++
src/mbdesktop_item.h | 2 ++
src/mbdesktop_module.c | 2 ++
src/mbdesktop_module.h | 2 ++
src/mbdesktop_view.c | 2 ++
src/mbdesktop_view.h | 2 ++
src/mbdesktop_win_plugin.c | 2 ++
src/mbdesktop_win_plugin.h | 2 ++
13 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/modules/dotdesktop.c b/modules/dotdesktop.c
index 22dde99..372f969 100644
--- a/modules/dotdesktop.c
+++ b/modules/dotdesktop.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"

#ifdef USE_LIBSN
diff --git a/modules/simplefilebrowser.c b/modules/simplefilebrowser.c
index e68c481..1118df1 100644
--- a/modules/simplefilebrowser.c
+++ b/modules/simplefilebrowser.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/modules/tasks.c b/modules/tasks.c
index 5437c13..ed8d1a7 100644
--- a/modules/tasks.c
+++ b/modules/tasks.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"

static int trapped_error_code = 0;
diff --git a/src/mbdesktop.c b/src/mbdesktop.c
index 90dc364..309d84f 100644
--- a/src/mbdesktop.c
+++ b/src/mbdesktop.c
@@ -1,17 +1,9 @@
/*
- mbdesktop - a desktop for handhelds etc.
+ mbdesktop - a desktop for handhelds etc.

Copyright 2002 Matthew Allum

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ SPDX-License-Identifier: GPL-2.0-or-later
*/


diff --git a/src/mbdesktop.h b/src/mbdesktop.h
index cbb4aff..4231e58 100644
--- a/src/mbdesktop.h
+++ b/src/mbdesktop.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_H
#define _HAVE_MBDESKTOP_H

diff --git a/src/mbdesktop_item.c b/src/mbdesktop_item.c
index 4bd7dd7..e7e7fcf 100644
--- a/src/mbdesktop_item.c
+++ b/src/mbdesktop_item.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_item.h"
#include "mbdesktop_module.h"
#include "md5.h"
diff --git a/src/mbdesktop_item.h b/src/mbdesktop_item.h
index 6eb7770..073f659 100644
--- a/src/mbdesktop_item.h
+++ b/src/mbdesktop_item.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_ITEM_H
#define _HAVE_MBDESKTOP_ITEM_H

diff --git a/src/mbdesktop_module.c b/src/mbdesktop_module.c
index 7c961b2..4c18b48 100644
--- a/src/mbdesktop_module.c
+++ b/src/mbdesktop_module.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_module.h"

MBDesktopItem *
diff --git a/src/mbdesktop_module.h b/src/mbdesktop_module.h
index c31e091..dde93bc 100644
--- a/src/mbdesktop_module.h
+++ b/src/mbdesktop_module.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_MODULE_H
#define _HAVE_MBDESKTOP_MODULE_H

diff --git a/src/mbdesktop_view.c b/src/mbdesktop_view.c
index 8ee20f6..0b552c0 100644
--- a/src/mbdesktop_view.c
+++ b/src/mbdesktop_view.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop_view.h"

static void
diff --git a/src/mbdesktop_view.h b/src/mbdesktop_view.h
index 44fcffc..659ea35 100644
--- a/src/mbdesktop_view.h
+++ b/src/mbdesktop_view.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_VIEW_H
#define _HAVE_MBDESKTOP_VIEW_H

diff --git a/src/mbdesktop_win_plugin.c b/src/mbdesktop_win_plugin.c
index e302f9e..a2f5fb1 100644
--- a/src/mbdesktop_win_plugin.c
+++ b/src/mbdesktop_win_plugin.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#include "mbdesktop.h"
#include "mbdesktop_win_plugin.h"

diff --git a/src/mbdesktop_win_plugin.h b/src/mbdesktop_win_plugin.h
index 2211b23..8a78233 100644
--- a/src/mbdesktop_win_plugin.h
+++ b/src/mbdesktop_win_plugin.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
#ifndef _HAVE_MBDESKTOP_WIN_PLUGIN_H
#define _HAVE_MBDESKTOP_WIN_PLUGIN_H
--
Mingde (Matthew) Zeng


Does any version of Yocto currently support LLVM/CLANG/and OpenCL ?

Monsees, Steven C (US)
 

Hello:

 

I am currently working with rocko 2.4.1… building for X86_64 platforms.

 

I am looking to add support for LLVM/CLANG/and OpenCL, but thought it might be  easier to move to a more recent version of Yocto if support was already in place for these components.

 

Is there a more recent version of the Yocto Project which possibly includes support for these components ?, and if not, has anyone ever attempted to build an SDK to add support these components to their platform ?

 

My first pass attempt finds the “nativesdk-cmake” functional, but the LLVM/CLANG build under the SDK appears to have some issues.

Knowing my current rocko platform is a bit dated, I thought it best to check in and see if porting to a more recent platform might be beneficial.

 

Thanks,

Steve

 


out of kernel custom module build fails

Rob Prowel
 

I need to build a custom slip driver out of the normal kernel build process and I've overridden the var

LINUX_VERSION_EXTENSION = \
"-${PROMPT}-$(/bin/date +%j%H%M)${PM1_DEVEL_IMAGE}"

so that my kernel always has a unique identifier for the development build I'm working on.

problem is that the custom driver bb file barfs.

bitbake -f -c cleanall virtual/kernel
bitbake my-image

fails with:

Collected errors:
* Solver encountered 1 problem(s):
* Problem 1/1:
* - nothing provides kernel-4.14.0-hpcu-2182234dev needed by kernel-module-customslip-4.14.0-hpcu-2182234dev-...
*
* Solution 1:
* - do not ask to install a package providing customslip-mod

the important bb file content is:

inherit module
SRC_URI = "file://Makefile \
file://customslip.c \
file://customslip.h \
file://COPYING \
"
S = "${WORKDIR}"

RPROVIDES_${PN} += "kernel-module-customslip"

------------------
What yocto override variable can I set in the bb to make it not care what the localversion appended to the kernel name is?

1821 - 1840 of 52041