Move kernel to common.

cfg/kernel_v6.14-rc7

@@ -11,8 +11,8 @@ CONFIG_AS_VERSION=24400
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24400
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108700
-CONFIG_RUSTC_LLVM_VERSION=200101
+CONFIG_RUSTC_VERSION=108800
+CONFIG_RUSTC_LLVM_VERSION=200105
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -37,7 +37,7 @@ CONFIG_LOCALVERSION="-arm64"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_DEFAULT_INIT=""
-CONFIG_DEFAULT_HOSTNAME="CB1"
+CONFIG_DEFAULT_HOSTNAME="Printer"
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYSVIPC_COMPAT=y
@@ -1900,6 +1900,7 @@ CONFIG_PCS_XPCS=y
 # CONFIG_SLIP is not set
 # CONFIG_USB_NET_DRIVERS is not set
 CONFIG_WLAN=y
+# CONFIG_SSV6051 is not set
 # CONFIG_WLAN_VENDOR_ADMTEK is not set
 # CONFIG_WLAN_VENDOR_ATH is not set
 # CONFIG_WLAN_VENDOR_ATMEL is not set
@@ -3047,6 +3048,7 @@ CONFIG_REGULATOR_AXP20X=y
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
 # CONFIG_REGULATOR_FAN53880 is not set
+# CONFIG_REGULATOR_FAN53200 is not set
 CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_ISL9305 is not set
 # CONFIG_REGULATOR_ISL6271A is not set
@@ -5027,6 +5029,7 @@ CONFIG_EXTCON=y
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=y
+# CONFIG_EXTCON_USBC_VIRTUAL_PD is not set
 # CONFIG_MEMORY is not set
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y

config/board/opi_zero2.json

@@ -51,7 +51,7 @@
             "parent": "kernel",
             "version": "v6.14-rc7",
             "version_type": "tag",
-            "patch_dir": "kernel/sunxi-6.14",
+            "patch_dir": [ "kernel/sunxi-6.14", "kernel/rockchip64-6.14" ],
             "target": [ "clean", "Image", "modules", "dtbs", "modules_install" ],
             "artifacts":
             [
@@ -60,7 +60,7 @@
                     "store_type": "boot"
                 },
                 {
-                    "file": "arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1*.dtb",
+                    "file": "arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero2.dtb",
                     "store_type": "boot",
                     "subdir": "dtb/allwiner"
                 },

files/initramfs/init

@@ -80,8 +80,8 @@ CHROOT="${NEW_ROOT}"
 run mount -n -t tmpfs tmpfs ${NEW_ROOT}
 DEVICES=$(devicelist)
 run findmediamount "cdrom"   "/livecd"  "REAL_ROOT" "${CDROOT_PATH}" "${DEVICES}" || run_emergency_shell
-run findmediamount "rw_part" "/rw_part" "RW_ROOT"   "${RW_MNT}"      "${DEVICES}" || run_emergency_shell
 run mount -o remount,ro "${CDROOT_PATH}"
+run findmediamount "rw_part" "/rw_part" "RW_ROOT"   "${RW_MNT}"      "${DEVICES}" || run_emergency_shell
 #sh
 CHROOT=${NEW_ROOT}
 

files/initramfs/init.script

@@ -53,7 +53,6 @@ bad_msg() {
     local msg_string=${1}
     msg_string="${msg_string:-...}"
     log_msg "[!!] ${msg_string}"
-    splash 'verbose' >/dev/null &
     printf "%b\n" "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
 }
 
@@ -176,3 +175,50 @@ findmediamount() {
     eval local result='$'${vrbl}
     [ -n "${result}" ] || bad_msg "Media not found"
 }
+
+run_shell() {
+	[ -x /bin/sh ] && SH=/bin/sh || SH=/bin/ash
+
+	export PS1='rescueshell \w \# '
+
+	echo
+	GOOD=${BLUE} good_msg "${NORMAL}Welcome to ${BOLD}rescue shell${NORMAL}!" 0
+	GOOD=${BLUE} good_msg "${NORMAL}...running Linux kernel ${BOLD}${KV}${NORMAL}" 0
+	echo
+
+	# Avoid /dev/{console,tty0} due to "can't access tty; job control turned off" problem;
+	# cttyhack will handle this for us...
+	if [ -n "${CONSOLE}" ] \
+		&& [ "${CONSOLE}" != "/dev/console" ] \
+		&& [ "${CONSOLE}" != "/dev/tty0" ] \
+		&& [ -c "${CONSOLE}" ]
+	then
+		log_msg "Opening rescue shell on ${CONSOLE} ..."
+		setsid ${SH} -c "exec sh --login 0<>${CONSOLE} 1<>${CONSOLE} 2<>${CONSOLE}"
+	elif command -v cttyhack 1>/dev/null 2>&1
+	then
+		log_msg "Opening rescue shell using cttyhack ..."
+		setsid cttyhack ${SH} --login
+	elif [ -c '/dev/tty1' ]
+	then
+		log_msg "Opening rescue shell on /dev/tty1 fallback ..."
+		setsid ${SH} -c "exec sh --login 0<>/dev/tty1 1<>/dev/tty1 2<>/dev/tty1"
+	else
+		log_msg "Opening rescue shell (last resort) ..."
+		${SH} --login
+	fi
+
+	# Leave function early when /dev/null does not exist anymore,
+	# i.e. after failed switch_root call
+	[ ! -e /dev/null ] && return
+
+	echo
+
+	# We maybe have called exec and dettached from main script; We
+	# must restore control...
+	exec 0<>${CONSOLE} 1<>${CONSOLE} 2<>${CONSOLE}
+}
+
+run_emergency_shell() {
+	run_shell
+}

scripts/initramfs.py

@@ -5,14 +5,14 @@ from . import *
 class Initramfs:
     def __init__(self):
         self.busybox = Sources("busybox", "https://git.busybox.net/busybox")
-        self.busybox.init_source_path("common")
+        self.busybox.init_source_path("common", True)
         self.busybox.set_git_params("@", "head")
         self.busybox_cfg = f"{ROOT_DIR}/cfg/busybox_config"
         self.eudev = Sources("eudev", "https://github.com/eudev-project/eudev.git")
-        self.eudev.init_source_path("common")
+        self.eudev.init_source_path("common", True)
         self.eudev.set_git_params("@", "head")
         self.e2fsp = Sources("e2fsp", "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git")
-        self.e2fsp.init_source_path("common")
+        self.e2fsp.init_source_path("common", True)
         self.e2fsp.set_git_params("@", "head")
         self.build_dir = f"{ROOT_DIR}/build/common"
         self.out_dir = f"{ROOT_DIR}/out"

scripts/sources.py

@@ -244,7 +244,7 @@ class Sources:
                 # copy configuration, if exists
                 shutil.copyfile(cfg_name, work_cfg_name)
         opts.insert(0, "make")
-        opts.append("-j8")
+        opts.append("-l11")
         p = subprocess.Popen(opts, cwd=self.work_dir)
         p.wait()
         if (p.returncode != 0):

scripts/target.py

@@ -33,7 +33,10 @@ class Target:
         self.sources.set_git_params(detail_js["version"], detail_js["version_type"])
         self.target = detail_js["target"]
         self.version = detail_js["version"]
-        self.config_name = f"{ROOT_DIR}/cfg/{board_name}/{self.name}"
+        if (self.is_shared):
+            self.config_name = f"{ROOT_DIR}/cfg/{self.name}"
+        else:
+            self.config_name = f"{ROOT_DIR}/cfg/{board_name}/{self.name}"
         if (self.version != "") and (self.version != "@"):
             self.config_name += f"_{self.version}"
         if ("patch_dir" in detail_js):