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

Organizing and removing unneeded packages. #2

Merged
merged 3 commits into from
Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CODE_OF_CONDUCT.md

This file was deleted.

1 change: 0 additions & 1 deletion CONTRIBUTING.md

This file was deleted.

17 changes: 7 additions & 10 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
&nbsp;&nbsp;<img src="https://raw.githubusercontent.com/JustEnoughLinuxOS/distribution/dev/distributions/JELOS/logos/rocknix-logo.png" width=192>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[![Latest Version](https://img.shields.io/github/release/JustEnoughLinuxOS/distribution.svg?color=5998FF&label=latest%20version&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/releases/latest) [![Activity](https://img.shields.io/github/commit-activity/m/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/commits) [![Pull Requests](https://img.shields.io/github/issues-pr-closed/JustEnoughLinuxOS/distribution?color=5998FF&style=flat-square)](https://github.com/JustEnoughLinuxOS/distribution/pulls) [![Discord Server](https://img.shields.io/discord/948029830325235753?color=5998FF&label=chat&style=flat-square)](https://discord.gg/seTxckZjJy)
#

## Licenses

JELOS is a Linux distribution that is made up of many open-source components. Components are provided under their respective licenses. This distribution includes components licensed for non-commercial use only.
ROCKNIX is a Linux distribution that is made up of many open-source components. Components are provided under their respective licenses. This distribution includes components licensed for non-commercial use only.

### JELOS Branding
### ROCKNIX Branding

JELOS branding and images are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/).
ROCKNIX branding and images are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/).

You are free to:

Expand All @@ -20,11 +17,11 @@ Under the following terms:
- NonCommercial: You may not use the material for commercial purposes.
- ShareAlike: If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.

### JELOS Software
### ROCKNIX Software

Copyright 2023 JELOS (https://github.com/JustEnoughLinuxOS)
Copyright 2024 ROCKNIX (https://github.com/ROCKNIX)

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.
Original software and scripts developed by the ROCKNIX 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. Modifications to bundled software and scripts by the JELOS team are licensed under the terms of the software being modified.
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 ROCKNIX team are licensed under the terms of the software being modified.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BUILD_DIRS=build.*
-include $(HOME)/.${DISTRONAME}/options
-include $(HOME)/.ROCKNIX/options

all: world

Expand Down Expand Up @@ -47,6 +47,7 @@ S922X:
PROJECT=Amlogic DEVICE=S922X ARCH=aarch64 ./scripts/build_distro

RK3566:
unset DEVICE_ROOT
DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro
DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro

Expand Down Expand Up @@ -74,7 +75,7 @@ package-clean:
# For example: make docker-AMD64 will use docker to call: make AMD64
# All variables are scoped to docker-* commands to prevent weird collisions/behavior with non-docker commands

docker-%: DOCKER_IMAGE := "justenoughlinuxos/rocknix-build:latest"
docker-%: DOCKER_IMAGE := "rocknix/rocknix-build:latest"

# DOCKER_WORK_DIR is the directory in the Docker image - it is set to /work by default
# Anytime this directory changes, you must run `make clean` similarly to moving the distribution directory
Expand Down
38 changes: 0 additions & 38 deletions PULL_REQUEST_TEMPLATE.md

This file was deleted.

Binary file removed distributions/ROCKNIX/splash/splash.png
Binary file not shown.
1 change: 0 additions & 1 deletion documentation/DEVEL_ADD_HARDWARE_QUIRKS.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/DEVEL_BUILDING_ROCKNIX.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/DEVEL_CREATING_PACKAGES.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/GENERAL_CUSTOM_SHADERS.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/GENERAL_DONATING_TO_ROCKNIX.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/GENERAL_FREQUENTLY_ASKED_QUESTIONS.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/GENERAL_HOTKEYS_AND_BUTTON_CODES.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/GENERAL_NETWORK_PLAY.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/GENERAL_PERFORMANCE_AND_BATTERY.md

This file was deleted.

23 changes: 0 additions & 23 deletions documentation/SETUP_BT_AUDIO.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/SETUP_CLOUD_DRIVES.md

This file was deleted.

91 changes: 0 additions & 91 deletions documentation/SETUP_GAME_ENGINES_AND_LAUNCH_FILES.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/SETUP_MOONLIGHT_STREAMING.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/SETUP_P2P_ZEROTIER.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/SETUP_SYNCTHING.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/SETUP_VPN_TAILSCALE.md

This file was deleted.

1 change: 0 additions & 1 deletion documentation/SETUP_VPN_WIREGUARD.md

This file was deleted.

4 changes: 2 additions & 2 deletions packages/apps/moonlight/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PKG_SHORTDESC="Moonlight is an open source implementation of NVIDIA's GameStream
GET_HANDLER_SUPPORT="git"
PKG_PATCH_DIRS+="${DEVICE}"

if [ "${TARGET_ARCH}" = "x86_64" ]
if [ "${TARGET_ARCH}" = "x86_64" ]
then
PKG_SITE+="qt"
PKG_URL="${PKG_SITE}.git"
Expand Down Expand Up @@ -44,7 +44,7 @@ fi

if [ "${PROJECT}" = "Rockchip" ]
then
PKG_DEPENDS_TARGET+=" librga rkmpp"
PKG_DEPENDS_TARGET+=" rkmpp"
fi

if [ ! "${OPENGL}" = "no" ]; then
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/portmaster/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PKG_URL="${PKG_SITE}/releases/download/${PKG_VERSION}/PortMaster.zip"
COMPAT_URL="https://github.com/brooksytech/JelosAddOns/raw/main/compat.zip"
PKG_LICENSE="MIT"
PKG_ARCH="arm aarch64"
PKG_DEPENDS_TARGET="toolchain gptokeyb gamecontrollerdb wget oga_controls control-gen"
PKG_DEPENDS_TARGET="toolchain rocknix-hotkey gamecontrollerdb wget oga_controls control-gen"
PKG_TOOLCHAIN="manual"
PKG_LONGDESC="Portmaster - a simple tool that allows you to download various game ports"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2021-present Shanti Gilbert (https://github.com/shantigilbert)

PKG_NAME="gptokeyb"
PKG_VERSION="0303b36b5376a9b25cf82a53ed4242509daf14e9"
PKG_NAME="rocknix-hotkey"
PKG_VERSION="14255daccc61dd8f366b3c88292d54cfef1c087a"
PKG_ARCH="any"
PKG_LICENSE="GPLv3"
PKG_SITE="https://github.com/EmuELEC/gptokeyb"
PKG_SITE="https://github.com/ROCKNIX/rocknix-hotkey"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain libevdev SDL2 control-gen"
PKG_TOOLCHAIN="make"
Expand Down
12 changes: 0 additions & 12 deletions packages/devel/librga/package.mk

This file was deleted.

12 changes: 0 additions & 12 deletions packages/devel/librga/patches/01-string_not_arr.patch

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion packages/emulators/standalone/drastic-sa/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PKG_VERSION="1.0"
PKG_LICENSE="Proprietary:DRASTIC.pdf"
PKG_ARCH="aarch64"
PKG_URL="https://github.com/r3claimer/JelosAddOns/raw/main/drastic.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_TARGET="toolchain rocknix-hotkey"
PKG_LONGDESC="Install Drastic Launcher script, will dowload bin on first run"
PKG_TOOLCHAIN="make"

Expand Down
26 changes: 0 additions & 26 deletions packages/emulators/tools/gptokeyb/patches/0001-build_fix.patch

This file was deleted.

Loading