From 6eb657dee8236888b08f37d3db9bf68e3f4aafdf Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Sat, 23 Jul 2022 13:56:47 -0400
Subject: [PATCH] Package and repo clean up.

---
 Makefile                                     |  3 ++
 projects/Rockchip/packages/linux/package.mk  | 31 ++++++++++----------
 projects/Rockchip/packages/u-boot/package.mk | 29 +++++++++---------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index 242dc3b3d..8a2f0dac0 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,9 @@ world: RG552 RG503 RG353P RG351P RG351V RG351MP
 X86_64:
 	PROJECT=PC DEVICE=X86_64 ARCH=x86_64 ./scripts/build_distro
 
+X86_64L:
+	PROJECT=PC DEVICE=X86_64L ARCH=x86_64 ./scripts/build_distro
+
 RG552:
 	PROJECT=Rockchip DEVICE=RG552 ARCH=arm ./scripts/build_distro
 	PROJECT=Rockchip DEVICE=RG552 ARCH=aarch64 ./scripts/build_distro
diff --git a/projects/Rockchip/packages/linux/package.mk b/projects/Rockchip/packages/linux/package.mk
index 86ab1c84d..b071efbb7 100644
--- a/projects/Rockchip/packages/linux/package.mk
+++ b/projects/Rockchip/packages/linux/package.mk
@@ -6,7 +6,7 @@
 
 PKG_NAME="linux"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.kernel.org"
+PKG_SITE="https://github.com/JustEnoughLinuxOS"
 PKG_DEPENDS_HOST="ccache:host openssl:host"
 PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils ${KERNEL_EXTRA_DEPENDS_TARGET}"
 PKG_DEPENDS_INIT="toolchain"
@@ -15,22 +15,23 @@ PKG_LONGDESC="This package builds the kernel for Rockchip devices"
 PKG_IS_KERNEL_PKG="yes"
 PKG_STAMP="${KERNEL_TARGET} ${KERNEL_MAKE_EXTRACMD}"
 PKG_PATCH_DIRS+="${DEVICE}"
-  PKG_GIT_CLONE_BRANCH="main"
+PKG_GIT_CLONE_BRANCH="main"
 GET_HANDLER_SUPPORT="git"
 
-if [[ "${DEVICE}" =~ RG552 ]]
-then
-  PKG_URL="https://github.com/JustEnoughLinuxOS/rockchip-kernel.git"
-  PKG_VERSION="cb0d79995"
-elif [[ "${DEVICE}" =~ RG351 ]]
-then
-  PKG_URL="https://github.com/JustEnoughLinuxOS/rg351x-kernel.git"
-  PKG_VERSION="effc106f9"
-elif [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]]
-then
-  PKG_URL="https://github.com/JustEnoughLinuxOS/rk356x-kernel.git"
-  PKG_VERSION="e75a81b17"
-fi
+case ${DEVICE} in
+  RG351P|RG351V|RG351MP)
+    PKG_URL="${PKG_SITE}/rk3326-kernel.git"
+    PKG_VERSION="effc106f9"
+  ;;
+  RG552)
+    PKG_URL="${PKG_SITE}/rk3399-kernel.git"
+    PKG_VERSION="cb0d79995"
+  ;;
+  RG353P|RG503)
+    PKG_URL="${PKG_SITE}/rk356x-kernel.git"
+    PKG_VERSION="e75a81b17"
+  ;;
+esac
 
 PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die
 
diff --git a/projects/Rockchip/packages/u-boot/package.mk b/projects/Rockchip/packages/u-boot/package.mk
index f9145a94d..1e9c5ed7b 100644
--- a/projects/Rockchip/packages/u-boot/package.mk
+++ b/projects/Rockchip/packages/u-boot/package.mk
@@ -6,25 +6,26 @@
 PKG_NAME="u-boot"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/JustEnoughLinuxOS/rockchip-uboot"
+PKG_SITE="https://github.com/JustEnoughLinuxOS"
 PKG_DEPENDS_TARGET="toolchain swig:host rkbin"
 PKG_LONGDESC="Rockchip U-Boot is a bootloader for embedded systems."
-PKG_URL="${PKG_SITE}.git"
-PKG_VERSION="23f4a5d"
 GET_HANDLER_SUPPORT="git"
 PKG_PATCH_DIRS+="${DEVICE}"
 
-if [[ "${DEVICE}" =~ RG351 ]]
-then
-  PKG_URL="https://github.com/JustEnoughLinuxOS/rg351x-uboot.git"
-  PKG_VERSION="9f8c2e3936"
-fi
-
-if [[ "${DEVICE}" =~ RG503 ]] || [[ "${DEVICE}" =~ RG353P ]]
-then
-  PKG_URL="https://github.com/JustEnoughLinuxOS/rk356x-uboot.git"
-  PKG_VERSION="2988a90"
-fi
+case ${DEVICE} in
+  RG351P|RG351V|RG351MP)
+    PKG_URL="${PKG_SITE}/rk3326-uboot.git"
+    PKG_VERSION="9f8c2e3936"
+  ;;
+  RG552)
+    PKG_URL="${PKG_SITE}/rk3399-uboot.git"
+    PKG_VERSION="23f4a5d"
+  ;;
+  RG353P|RG503)
+    PKG_URL="${PKG_SITE}/rk356x-uboot.git"
+    PKG_VERSION="2988a90"
+  ;;
+esac
 
 PKG_IS_KERNEL_PKG="yes"
 PKG_STAMP="${UBOOT_CONFIG}"