fix(build): Update Makefile scripts and merge KSUN Next into v1.0.8, fix for IMEI 0

Author: frpunlocking-com

Androidbp

@@ -43,3 +43,9 @@ cc_library_headers {
     vendor: true,
     recovery_available: true,
 }
+genrule {
+    name: "link_kernel_modules_dir",
+    cmd: "ln -sf $(HOST_OUT)/obj/PACKAGING/kernel_modules_intermediates/lib/modules/$(KERNELRELEASE) " +
+         "$(HOST_OUT)/obj/PACKAGING/kernel_modules_intermediates/lib/modules/$(KERNELVERSION)",
+    out: ["modules_linked"],
+}

KernelSU-Next

@@ -1 +1 @@
-Subproject commit 5ee435638b1d407378c50845123b60b8bf782089
+Subproject commit 9d9f9ed5d5f3a66a2f44e24c926075554f9275ce

Makefile

@@ -1179,7 +1179,8 @@ export INSTALL_DTBS_PATH ?= $(INSTALL_PATH)/dtbs/$(KERNELRELEASE)
 
 MODLIB	= $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
 export MODLIB
-
+INS_MOD := $(INSTALL_MOD_PATH)
+export INS_MOD
 #ifdef OPLUS_FEATURE_CHG_BASIC
 KBUILD_CFLAGS += -DOPLUS_FEATURE_CHG_BASIC
 #endif
@@ -1589,13 +1590,23 @@ _modinst_:
 	@sed 's:^:kernel/:' modules.builtin > $(MODLIB)/modules.builtin
 	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
+# Ensure directories exist
+	@mkdir -p "$(INS_MOD)/../depmod_vendor_intermediates/lib/modules/0.0"
+	@mkdir -p "$(INS_MOD)/../depmod_vendor_ramdisk_intermediates/lib/modules/0.0"
+# Copy all files from versioned directory to /0.0/ (force overwrite)
+		@cp -a "$(INS_MOD)/lib/modules/$(KERNELRELEASE)/." "$(INS_MOD)/lib/modules/$(KERNELVERSION)/"
+# Copy ALL module metadata files (using find to handle spaces)
+	@find "$(INS_MOD)/lib/modules/$(KERNELRELEASE)/" -maxdepth 1 -type f -name 'modules.*' \
+		-exec cp -t "$(INS_MOD)/../depmod_vendor_intermediates/lib/modules/0.0/" {} +
+	@find "$(INS_MOD)/lib/modules/$(KERNELRELEASE)/" -maxdepth 1 -type f -name 'modules.*' \
+		-exec cp -t "$(INS_MOD)/../depmod_vendor_ramdisk_intermediates/lib/modules/0.0/" {} +
 
 # This depmod is only for convenience to give the initial
 # boot a modules.dep even before / is mounted read-write.  However the
 # boot script depmod is the master version.
 PHONY += _modinst_post
 _modinst_post: _modinst_
-	$(call cmd,depmod)
+	$(call cmd,depmod -b "$(INS_MOD)" -C /dev/null -e -F "$(INS_MOD)/lib/modules/$(KERNELRELEASE)/System.map" -E "$(INS_MOD)/lib/modules/$(KERNELRELEASE)/modules.order" "$(KERNELRELEASE)")
 
 ifeq ($(CONFIG_MODULE_SIG), y)
 PHONY += modules_sign

fs/Makefile

@@ -19,6 +19,8 @@ obj-y :=	open.o read_write.o file_table.o super.o \
 
 obj-$(CONFIG_KSU_SUSFS) += susfs.o
 
+obj-$(CONFIG_KSU_SUSFS) += susfs.o
+
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=	buffer.o block_dev.o direct-io.o mpage.o
 else

fs/Makefile.orig

@@ -17,6 +17,8 @@ obj-y :=	open.o read_write.o file_table.o super.o \
 		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
 		fs_types.o fs_context.o fs_parser.o fsopen.o
 
+obj-$(CONFIG_KSU_SUSFS) += susfs.o
+
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=	buffer.o block_dev.o direct-io.o mpage.o
 else

fs/dcache.c.rej

@@ -0,0 +1,37 @@
+--- fs/dcache.c
++++ fs/dcache.c
+@@ -32,6 +32,9 @@
+ #include <linux/bit_spinlock.h>
+ #include <linux/rculist_bl.h>
+ #include <linux/list_lru.h>
++#ifdef CONFIG_KSU_SUSFS_SUS_PATH
++#include <linux/susfs_def.h>
++#endif
+ #include "internal.h"
+ #include "mount.h"
+ 
+@@ -2295,6 +2298,11 @@ struct dentry *__d_lookup_rcu(const struct dentry *parent,
+ 				continue;
+ 			if (dentry_cmp(dentry, str, hashlen_len(hashlen)) != 0)
+ 				continue;
++#ifdef CONFIG_KSU_SUSFS_SUS_PATH
++			if (dentry->d_inode && unlikely(dentry->d_inode->i_state & INODE_STATE_SUS_PATH) && likely(current->susfs_task_state & TASK_STRUCT_NON_ROOT_USER_APP_PROC)) {
++				continue;
++			}
++#endif
+ 		}
+ 		*seqp = seq;
+ 		return dentry;
+@@ -2378,6 +2386,12 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
+ 		if (dentry->d_name.hash != hash)
+ 			continue;
+ 
++#ifdef CONFIG_KSU_SUSFS_SUS_PATH
++		if (dentry->d_inode && unlikely(dentry->d_inode->i_state & INODE_STATE_SUS_PATH) && likely(current->susfs_task_state & TASK_STRUCT_NON_ROOT_USER_APP_PROC)) {
++			continue;
++		}
++#endif
++
+ 		spin_lock(&dentry->d_lock);
+ 		if (dentry->d_parent != parent)
+ 			goto next;

fs/devpts/inode.c.rej

@@ -0,0 +1,27 @@
+--- fs/devpts/inode.c
++++ fs/devpts/inode.c
+@@ -596,6 +596,11 @@ struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
+ 	return dentry;
+ }
+ 
++#ifdef CONFIG_KSU_SUSFS_SUS_SU
++extern bool ksu_devpts_hook;
++extern int ksu_handle_devpts(struct inode*);
++#endif
++
+ /**
+  * devpts_get_priv -- get private data for a slave
+  * @pts_inode: inode of the slave
+@@ -604,6 +609,12 @@ struct dentry *devpts_pty_new(struct pts_fs_info *fsi, int index, void *priv)
+  */
+ void *devpts_get_priv(struct dentry *dentry)
+ {
++#ifdef CONFIG_KSU_SUSFS_SUS_SU
++	if (likely(ksu_devpts_hook)) {
++		ksu_handle_devpts(dentry->d_inode);
++	}
++#endif
++
+ 	if (dentry->d_sb->s_magic != DEVPTS_SUPER_MAGIC)
+ 		return NULL;
+ 	return dentry->d_fsdata;

fs/exec.c.rej

@@ -0,0 +1,24 @@
+--- fs/exec.c
++++ fs/exec.c
+@@ -1919,11 +1919,21 @@ static int __do_execve_file(int fd, struct filename *filename,
+ 	return retval;
+ }
+ 
++#ifdef CONFIG_KSU_SUSFS_SUS_SU
++extern bool susfs_is_sus_su_hooks_enabled __read_mostly;
++extern int ksu_handle_execveat_sucompat(int *fd, struct filename **filename_ptr, void *argv,
++				void *envp, int *flags);
++#endif
++
+ static int do_execveat_common(int fd, struct filename *filename,
+ 			      struct user_arg_ptr argv,
+ 			      struct user_arg_ptr envp,
+ 			      int flags)
+ {
++#ifdef CONFIG_KSU_SUSFS_SUS_SU
++	if (susfs_is_sus_su_hooks_enabled)
++		ksu_handle_execveat_sucompat(&fd, &filename, &argv, &envp, &flags);
++#endif
+ 	return __do_execve_file(fd, filename, argv, envp, flags, NULL);
+ }
+