From bb81d99d1bb2fadeec036de98ea3fda5a207b07f Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 23 Oct 2023 23:06:10 +0000 Subject: [PATCH 1/5] Update documentation to reflect license change. --- docs/contribute/index.md | 4 ++-- docs/faqs.md | 4 ++-- docs/index.md | 10 ++++------ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/contribute/index.md b/docs/contribute/index.md index 7c34a9c..d0d3b64 100644 --- a/docs/contribute/index.md +++ b/docs/contribute/index.md @@ -45,8 +45,8 @@ Pull requests are the best way to propose changes to the codebase (we use [Githu ## License -When you submit code changes, your submissions are understood to be contributed under the same license as the original project code or under [Apache 2](https://choosealicense.com/licenses/apache-2.0/) license when no other license applies. +When you submit code changes, your submissions are understood to be contributed under the same license as the original project code or under [GPLv2](https://choosealicense.com/licenses/gpl-2.0/) license when no other license applies. ## References -This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md) \ No newline at end of file +This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md) diff --git a/docs/faqs.md b/docs/faqs.md index 06f669d..fae45e2 100644 --- a/docs/faqs.md +++ b/docs/faqs.md @@ -29,7 +29,7 @@ To receive permission to redistribute JELOS the following *minimum* criteria mus JELOS branding is licensed for non-commercial use only. Even if approved to be distributed on a device, it is not allowed to be sold or included as an up charge in any form what-so-ever. Period. This is not negotiable. ### What if you stop working on JELOS? -We don't expect that to happen, however JELOS is an Open Source project hosted here on GitHub which means the source code is readily available for anyone in the world to pick up and continue where we left off. Our [license model](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)) allows for this to happen by providing and encouraging redistribution ([freedom 2](https://www.gnu.org/philosophy/free-sw.en.html#four-freedoms)) and the right to distribute a modified version ([freedom 3](https://www.gnu.org/philosophy/free-sw.en.html#four-freedoms)). JELOS only prohibits commercial use through our branding which is licensed by the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-sharealike-4.0-international-(cc-by-nc-sa-4.0)). +We don't expect that to happen, however JELOS is an Open Source project hosted here on GitHub which means the source code is readily available for anyone in the world to pick up and continue where we left off. Our license model([GPLv2](https://choosealicense.com/licenses/gpl-2.0/)) license when no other license applies.) allows for this to happen by providing and encouraging redistribution ([freedom 2](https://www.gnu.org/philosophy/free-sw.en.html#four-freedoms)) and the right to distribute a modified version ([freedom 3](https://www.gnu.org/philosophy/free-sw.en.html#four-freedoms)). JELOS only prohibits commercial use through our branding which is licensed by the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-sharealike-4.0-international-(cc-by-nc-sa-4.0)). ## Using JELOS @@ -96,4 +96,4 @@ Various logs are generated, including ### I have a device with a single microsd and I can't see the games partition in Windows or macOS. -JELOS does not create an ExFAT partition on the boot device, and expands the full partition using ext4. You can sync files to the device over the network or by loading your files onto a EXT4, ExFAT, or FAT32 formatted usb stick and copy them with FileMan or over ssh. Please see the [Adding Games](/play/add-games) page for more details. \ No newline at end of file +JELOS does not create an ExFAT partition on the boot device, and expands the full partition using ext4. You can sync files to the device over the network or by loading your files onto a EXT4, ExFAT, or FAT32 formatted usb stick and copy them with FileMan or over ssh. Please see the [Adding Games](/play/add-games) page for more details. diff --git a/docs/index.md b/docs/index.md index 6776775..42896e4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -60,15 +60,13 @@ Under the following terms: ### JELOS Software -Copyright 2021-present Fewtarius +Copyright 2021-present - The JELOS Project -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +Original software and scripts developed by the JELOS team are licensed under the terms of the [GNU GPL Version 2](https://choosealicense.com/licenses/gpl-2.0/). The full license can be found in this project's licenses folder. ### Bundled Works -All other software is provided under each component's respective license. These licenses can be found in the software sources or in this project's licenses folder. +All other software is provided under each component's respective license. These licenses can be found in the software sources or in this project's licenses folder. Modifications to bundled software and scripts by the JELOS team are licensed under the terms of the software being modified. ## Credits -Like any Linux distribution, this project is not the work of one person. It is the work of many persons all over the world who have developed the open source bits without which this project could not exist. Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the open source community. \ No newline at end of file +Like any Linux distribution, this project is not the work of one person. It is the work of many persons all over the world who have developed the open source bits without which this project could not exist. Special thanks to CoreELEC, LibreELEC, and to developers and contributors across the open source community. From acb4c140c7ac968ecb70c740444ce06e4aed4979 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 23 Oct 2023 23:39:50 +0000 Subject: [PATCH 2/5] Start the new license clock in the current year. --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 42896e4..2a4bb2a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -60,7 +60,7 @@ Under the following terms: ### JELOS Software -Copyright 2021-present - The JELOS Project +Copyright 2023-present - The JELOS Project Original software and scripts developed by the JELOS team are licensed under the terms of the [GNU GPL Version 2](https://choosealicense.com/licenses/gpl-2.0/). The full license can be found in this project's licenses folder. From 0aa73579e8c6df8b513c121bc7ed2d048e9ef9c1 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Mon, 23 Oct 2023 23:45:11 +0000 Subject: [PATCH 3/5] Clarify branding. --- docs/faqs.md | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/docs/faqs.md b/docs/faqs.md index fae45e2..f612820 100644 --- a/docs/faqs.md +++ b/docs/faqs.md @@ -9,24 +9,10 @@ No. JELOS is something that we develop for fun, it is provided as-is. There are We are a community developed distribution, and we believe that it is the responsibility of the person who wants a new feature to develop and contribute that feature. If you would like to add something to JELOS, pull requests are welcomed. Please review our [code of conduct](contribute/code-of-conduct.md), our [contributing guidelines](contribute/index.md), and our [build guide](contribute/build.md) before submitting your first pull request. ### Licensing JELOS for redistribution -JELOS utilizes a non-commercial CC BY-NC-SA 4.0 copyleft license on our branding which is intended to prevent abuse of our software. Device Makers and others who would like to bundle on devices may not do so without our express permission. - -#### Redistribution Authorization Requirements -If you would like to receive permission from our project to redistribute JELOS, you must request permission in writing. We can be reached at contact@jelos.org. - -##### Benefits -Authorization to use our branding will allow you to distribute JELOS on your device without needing to maintain a fork of the project for your device. This would include access to our online update feature. - -##### Minimum Requirements -To receive permission to redistribute JELOS the following *minimum* criteria must be met. Please note, that taking these actions without formally receiving approval from our project does not grant you the authority to use our branding. You MUST receive approval from JELOS. - -1. We receive sources for device(s) before they ship to consumers and we have irrevokable authority to publish at our leisure. We strongly prefer device makers contribute changes to support their device(s) directly to the distribution themselves. -2. Provide, upon request, device samples for every JELOS team member (including core developers, moderation team, and outside contributors), as well as any community developer designated by JELOS, for all devices planned, supported by, or bundled with JELOS for as long as the device maker manufactures the device. -3. It is up to the requestor to secure distribution rights for software included with JELOS that is not developed or owned by JELOS. -4. A support representative must join and participate in our community to support their device(s). +JELOS utilizes a non-commercial CC BY-NC-SA 4.0 copyleft license on our branding which is intended to prevent abuse of our work. Device Makers and others who would like to bundle on devices may not do so without our express permission. ##### Selling JELOS -JELOS branding is licensed for non-commercial use only. Even if approved to be distributed on a device, it is not allowed to be sold or included as an up charge in any form what-so-ever. Period. This is not negotiable. +The JELOS brand is licensed for non-commercial use only. It is not allowed to be sold or included as an up charge in any form what-so-ever. Period. This is not negotiable. ### What if you stop working on JELOS? We don't expect that to happen, however JELOS is an Open Source project hosted here on GitHub which means the source code is readily available for anyone in the world to pick up and continue where we left off. Our license model([GPLv2](https://choosealicense.com/licenses/gpl-2.0/)) license when no other license applies.) allows for this to happen by providing and encouraging redistribution ([freedom 2](https://www.gnu.org/philosophy/free-sw.en.html#four-freedoms)) and the right to distribute a modified version ([freedom 3](https://www.gnu.org/philosophy/free-sw.en.html#four-freedoms)). JELOS only prohibits commercial use through our branding which is licensed by the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://tldrlegal.com/license/creative-commons-attribution-noncommercial-sharealike-4.0-international-(cc-by-nc-sa-4.0)). From 6a732101b66dc43762db9b49a92bddd1a0b464aa Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 24 Oct 2023 11:43:48 +0000 Subject: [PATCH 4/5] Warn that ARC-S, and ARC-D models will not be supported. --- docs/devices/anbernic/rg353pmvvs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devices/anbernic/rg353pmvvs.md b/docs/devices/anbernic/rg353pmvvs.md index 58d454c..4724192 100644 --- a/docs/devices/anbernic/rg353pmvvs.md +++ b/docs/devices/anbernic/rg353pmvvs.md @@ -12,7 +12,7 @@ | RG353VS | Rockchip RK3566 (ARM) | Rockchip BSP 4.19 | Mali | KMS/DRM + Emulation Station | !!! info "Anbernic RG353P/M/V/VS devices with both v1 and v2 displays are supported." -!!! warning "RG353PS will not be supported." +!!! warning "RG353PS, ARC-S, and ARC-D models will not be supported." ## Features From 9cf5c8666819fe718b4d971d70d02cd277446aa2 Mon Sep 17 00:00:00 2001 From: fewtarius Date: Tue, 24 Oct 2023 16:05:54 +0000 Subject: [PATCH 5/5] Clean up copyright notice. --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index 2a4bb2a..bea4707 100644 --- a/docs/index.md +++ b/docs/index.md @@ -60,7 +60,7 @@ Under the following terms: ### JELOS Software -Copyright 2023-present - The JELOS Project +Copyright 2023 JELOS (https://github.com/JustEnoughLinuxOS) Original software and scripts developed by the JELOS team are licensed under the terms of the [GNU GPL Version 2](https://choosealicense.com/licenses/gpl-2.0/). The full license can be found in this project's licenses folder.