Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spdx tags: Use PSDX tags for this project #7

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Conversation

vinodkoul
Copy link
Contributor

Add SPDX tags and remove the license text, Also adds SPDX tags to files which have this missing

tinycompress project is licensed under LGPL 2.1 and BSD 3 Clause, so
remove the license text and use SPDX tags

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Update to use SPDX tags in the C files.
Ensure the Copyright and Author information is retained

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Update to use SPDX tags in the H files.
Ensure the Copyright and Author information is retained

Signed-off-by: Vinod Koul <vkoul@kernel.org>
The Makefile.am and Android.mk files do not contains any license
information, add the SPDX tags in the files

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Since utils-lgpl in only licensed as LGPL-2.1, add the COPYING file
mentioning this explicitly

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Use the /* ... */ style to add SDPX tags.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
The Makefile.am file do not contains any license
information, add the SPDX tags in the files

Signed-off-by: Vinod Koul <vkoul@kernel.org>
@vinodkoul
Copy link
Contributor Author

@plbossart @charleskeepax Please do check the Copyright/Author info is not messed up -)

Copy link
Contributor

@plbossart plbossart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comments below


tinycompress library for compress audio offload in alsa
Copyright (c) 2011-2012, Intel Corporation
All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vinodkoul you cannot remove the Intel Copyright.
Copyright is a different concept to the license. It's fine to use SPDX for the license, the copyright needs to stay as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart If you look closely, the copyright is retained in src file where IMO it is apt. Here in COPYING file it feels a copy paste mistake, hence removal.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these COPYING files only provide the license, others combine license and copyright. I don't know what the rule is and I am not a lawyer, so when in doubt I am asking you to please keep the copyright as is. It may be a mistake but that's not for me to approve.

LGPL LICENSE

tinycompress library for compress audio offload in alsa
Copyright (c) 2011-2012, Intel Corporation.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, please keep the copyright for Intel.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

*/
/* SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause) */
/* Copyright (c) 2011-2012, Intel Corporation */
/* Author: Vinod Koul <vkoul@kernel.org> */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not the kernel-style

// SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause)
// Copyright (c) 2011-2012, Intel Corporation
// Vinod Koul <vkoul@kernel.org

-> I don't know what the official policy is but you did this work as an Intel employee. Your email no longer reflect that fact.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt that we can be simpler and use two styles, /* SPDX */ for code files.
and # SPDX for Makefiles.
Let me know if there is a strong reason to keep kernel style

The email refers to author of file and that persons updated email address, has nothing to do we who I was employed with (it was actually modified after I left Intel)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't care about style, but you created your own style here. why change?

tinycompress is provided under a dual BSD/LGPLv2.1 license. When using or
redistributing tinycompress, you may do so under either license.
tinycompress is provided under:
SPDX-License-Identifier: LGPL-2.1-only OR BSD-3-Clause
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not use the same notation as in the rest of the files

SPDX-License-Identifier: (LGPL-2.1-only OR BSD-3-Clause)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should, thanks for pointing

/* Copyright (c) 2011-2012, Intel Corporation */
/* Copyright (c) 2013-2014, Wolfson Microelectronic Ltd. */
/* Author: Vinod Koul <vkoul@kernel.org> */
/* Author: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the C comments are really not very nice.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like simpler notation, so this feels better than using 3 styles

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the kernel documentation (Documentation/process/license-rules.rst), the point of the different styles was to work round some tooling bugs regarding .lds files, which have since been fixed. So I don't think there is any issue with using a single style here, although I have no opinion on what style would be best.


//Copyright (c) 2011-2012, Intel Corporation
//Copyright (c) 2018-2019, Linaro Ltd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why change this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code style change


//Copyright (c) 2011-2012, Intel Corporation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not really confused as to whether this is indeed an Intel contribution. I don't think we added anything with LGPL-only, did we?

Copy link
Contributor Author

@vinodkoul vinodkoul Sep 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was derived from cplay.c (lots of code copy) hence the original copyright was retained by me and new one added

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. In that case, you should make it clearer. e.g.

Derived from cplay.c Copyright (c) 2011-2012, Intel Corporation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants