update

kiddin9 · Dec 5, 2023 · 8311d7e · 8311d7e
1 parent a277309
commit 8311d7e
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 44 deletions.
diff --git a/devices/common/patches/kernel_version.patch b/devices/common/patches/kernel_version.patch
@@ -0,0 +1,30 @@
+--- a/scripts/json_overview_image_info.py
++++ b/scripts/json_overview_image_info.py
+@@ -47,7 +47,7 @@ def get_initial_output(image_info):
+
+
+ if output:
+-    default_packages, output["arch_packages"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
+         [
+             "make",
+             "--no-print-directory",
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
+             "target/linux/",
+             "val.DEFAULT_PACKAGES",
+             "val.ARCH_PACKAGES",
++            "val.LINUX_VERSION",
+         ],
+         stdout=PIPE,
+         stderr=PIPE,
+
+--- a/scripts/json_add_image_info.py
++++ b/scripts/json_add_image_info.py
+@@ -55,6 +55,7 @@ def get_titles():
+     "profiles": {
+         device_id: {
+             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
++            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
+             "images": [
+                 {
+                     "type": getenv("FILE_TYPE"),
diff --git a/devices/common/patches/fix.patch → devices/common/patches/rootfstargz.patch b/devices/common/patches/fix.patch → devices/common/patches/rootfstargz.patch
@@ -79,46 +79,3 @@
    $$(eval $$(foreach compile,$$(COMPILE), \
      $$(call Device/Build/compile,$$(compile),$(1))))
 
-
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
-
-
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-         ],
-         stdout=PIPE,
-         stderr=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),
-
---- a/package/system/procd/files/procd.sh
-+++ b/package/system/procd/files/procd.sh
-@@ -260,7 +260,7 @@ _procd_set_param() {
- 		reload_signal)
- 			json_add_int "$type" $(kill -l "$1")
- 		;;
--		pidfile|user|group|seccomp|capabilities|facility|\
-+		pidfile|user|group|capabilities|facility|\
- 		extroot|overlaydir|tmpoverlaysize)
- 			json_add_string "$type" "$1"
- 		;;
diff --git a/devices/common/patches/seccomp.patch b/devices/common/patches/seccomp.patch
@@ -0,0 +1,11 @@
+--- a/package/system/procd/files/procd.sh
++++ b/package/system/procd/files/procd.sh
+@@ -260,7 +260,7 @@ _procd_set_param() {
+ 		reload_signal)
+ 			json_add_int "$type" $(kill -l "$1")
+ 		;;
+-		pidfile|user|group|seccomp|capabilities|facility|\
++		pidfile|user|group|capabilities|facility|\
+ 		extroot|overlaydir|tmpoverlaysize)
+ 			json_add_string "$type" "$1"
+ 		;;
diff --git a/devices/mediatek_mt7981/diy.sh b/devices/mediatek_mt7981/diy.sh
@@ -6,7 +6,7 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 rm -rf feeds/kiddin9/{rtl*,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/packages/libevdev
 
-rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
+rm -rf devices/common/patches/{rootfstargz.patch,kernel_version.patch,seccomp.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
 #sed -i "/KernelPackage,sound-soc-core/d" package/kernel/linux/modules/sound.mk
 #sed -i "/KernelPackage,multimedia-input/d" package/kernel/linux/modules/video.mk

diff --git a/devices/qualcommax_ipq60xx/diy.sh b/devices/qualcommax_ipq60xx/diy.sh
@@ -7,3 +7,5 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 git clone https://github.com/JiaY-shi/nss-packages.git package/nss-packages
 
 rm -rf feeds/kiddin9/{fibocom_QMI_WWAN,quectel_Gobinet,shortcut-fe}
+
+rm -rf devices/common/patches/rootfstargz.patch
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
		git clone https://github.com/JiaY-shi/nss-packages.git package/nss-packages

		rm -rf feeds/kiddin9/{fibocom_QMI_WWAN,quectel_Gobinet,shortcut-fe}

		rm -rf devices/common/patches/rootfstargz.patch