linux-5(7-12): Get rid of the anbox modules patch. It actually cannot work as building the modules will fail (but we never turned that on, thankfully).

Added a note regarding how to use Anbox with the current implementation, which works just fine.
2021-03-11 15:17:45 +07:00 · 2021-03-11 15:17:45 +07:00 · 2e41105b58
parent 3e2caa647c
commit 2e41105b58
9 changed files with 38 additions and 663 deletions
--- a/26
+++ b/26
@ -53,7 +53,7 @@ else
 fi
 pkgname=("${pkgbase}" "${pkgbase}-headers")
 pkgver="${_basekernel}"."${_sub}"
-pkgrel=135
+pkgrel=136
 pkgdesc='Linux-tkg'
 arch=('x86_64') # no i686 in here
 url="http://www.kernel.org/"
@ -148,7 +148,6 @@ case $_basever in
        	0009-prjc_v5.7-r3.patch
        	0011-ZFS-fix.patch
        	0012-linux-hardened.patch
-        	0013-anbox-modules.patch
 	)
 	sha256sums=('de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0'
            '66a0173a13cd58015f5bf1b14f67bfa15dc1db5d8e7225fcd95ac2e9a5341653'
@ -174,8 +173,7 @@ case $_basever in
            '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
            'b2a2ae866fc3f1093f67e69ba59738827e336b8f800fb0487599127f7f3ef881'
            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '6821f92bd2bde3a3938d17b070d70f18a2f33cae81647567b5a4d94c9cd75f3d'
-            '9bdb396f70bfcb6485457e611d61b2f6614f9b96b2a7e238b86b4c50a126228a')
+            '6821f92bd2bde3a3938d17b070d70f18a2f33cae81647567b5a4d94c9cd75f3d')
 	;;
 	58)
 	opt_ver="5.8%2B"
@ -207,7 +205,6 @@ case $_basever in
        	0009-prjc_v5.8-r3.patch
        	0011-ZFS-fix.patch
        	#0012-linux-hardened.patch
-        	0013-anbox-modules.patch
 	)
 	sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
            '5b558a40c2fdad2c497fe0b1a64679313fd5a7ccbaecef8803d49b3baaccbacd'
@ -229,8 +226,7 @@ case $_basever in
            '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
            '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
            'f5dbff4833a2e3ca94c202e5197894d5f1006c689ff149355353e77d2e17c943'
-            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '9bdb396f70bfcb6485457e611d61b2f6614f9b96b2a7e238b86b4c50a126228a')
+            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
 	;;
 	59)
 	opt_ver="5.8%2B"
@ -262,7 +258,6 @@ case $_basever in
 		0009-prjc_v5.9-r3.patch
        	0011-ZFS-fix.patch
 	        #0012-linux-hardened.patch
-	        0013-anbox-modules.patch
 	)
 	sha256sums=('3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06'
            '46c520da2db82d8f9a15c2117d3a50e0faaaf98f05bd4ea1f3105e2724f207d6'
@ -287,8 +282,7 @@ case $_basever in
            '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
            'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
            '0d5fe3a9050536fe431564b221badb85af7ff57b330e3978ae90d21989fcad2d'
-            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '9bdb396f70bfcb6485457e611d61b2f6614f9b96b2a7e238b86b4c50a126228a')
+            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
 	;;
 	510)
 	opt_ver="5.8%2B"
@ -322,7 +316,6 @@ case $_basever in
        0011-ZFS-fix.patch
        0012-linux-hardened.patch
        0012-misc-additions.patch
-        0013-anbox-modules.patch
    )
    sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
            'a24279f21f69cdbf69f99f483fab39c024a88e1ef55e00a953f55a653402df5c'
@ -351,8 +344,7 @@ case $_basever in
            'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1'
            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
            '105f51e904d80f63c1421203e093b612fc724edefd3e388b64f8d371c0b3a842'
-            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24'
-            '9bdb396f70bfcb6485457e611d61b2f6614f9b96b2a7e238b86b4c50a126228a')
+            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24')
 	;;
 	511)
 	opt_ver="5.8%2B"
@ -386,7 +378,6 @@ case $_basever in
        0011-ZFS-fix.patch
        #0012-linux-hardened.patch
        0012-misc-additions.patch
-        0013-anbox-modules.patch
    )
    sha256sums=('04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4'
            'afb0f641117643354cd08759549ad69f2cab55feafa22516eeb1a0ac7439e3c4'
@ -412,8 +403,7 @@ case $_basever in
            'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
            'e394d4b7721f55837a8364c8311cb06cb5a59484de8aa8731e38d1aff2b7014e'
            '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
-            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24'
-            '9bdb396f70bfcb6485457e611d61b2f6614f9b96b2a7e238b86b4c50a126228a')
+            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24')
 	;;
 	512)
 	opt_ver="5.8%2B"
@ -446,7 +436,6 @@ case $_basever in
        #0009-prjc_v5.12-r0.patch
        #0012-linux-hardened.patch
        0012-misc-additions.patch
-        0013-anbox-modules.patch
    )
    sha256sums=('fccc4b9e65cbffd5f75ebaed0904df96d10d431c675823875cdde94e40e09d0f'
            'SKIP'
@ -460,8 +449,7 @@ case $_basever in
            '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
            'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
            'e67872500624b9369641a953cd1ba87b720d6f5dc95b74adb9a7cf51cb4ad4bd'
-            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24'
-            '9bdb396f70bfcb6485457e611d61b2f6614f9b96b2a7e238b86b4c50a126228a')
+            '7fb1104c167edb79ec8fbdcde97940ed0f806aa978bdd14d0c665a1d76d25c24')
 	;;
 esac

--- a/README.md
+++ b/README.md
@ -29,6 +29,33 @@ You can optionally enable support for it at the beginning of the PKGBUILD file.
 **Note regarding kernels older than 5.9 on Archlinux:**
 **Since the switch to zstd compressed initramfs by default, you will face an "invalid magic at start of compress" error by default. You can workaround the issue by editing `/etc/mkinitcpio.conf` to uncomment the `COMPRESSION="lz4"` (for example, since that's the best option after zstd) line and regenerating for all kernels with `sudo mkinitpcio -P`.**

+
+### Anbox usage
+
+When enabling the anbox support option, the modules are built-in. You don't have to load them. However you'll need to mount binderfs :
+```
+sudo mkdir /dev/binderfs
+sudo mount -t binder binder /dev/binderfs
+```
+
+To make this persistent, you can add the following to your `/etc/fstab` :
+```
+binder                         /dev/binderfs binder   nofail  0      0
+```
+
+Then, if needed, start the anbox service :
+```
+systemctl start anbox-container-manager.service
+```
+
+You can also enable the service for it to be auto-started on boot :
+```
+systemctl enable anbox-container-manager.service
+```
+
+You're set to run Anbox.
+
+
 ## Other stuff included:
 - Graysky's per-CPU-arch native optimizations - https://github.com/graysky2/kernel_gcc_patch
 - memory management and swapping tweaks
--- a/linux-tkg-config/prepare
+++ b/linux-tkg-config/prepare
@ -1119,7 +1119,6 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
      read -rp "`echo $'    > N/y : '`" CONDITION12;
    fi
    if [[ "$CONDITION12" =~ [yY] ]] || [ "$_anbox" = "true" ]; then
-      msg2 "Patching kernel to build Android ashmem and binder as modules instead of built-in"
      echo "CONFIG_ASHMEM=y" >> ./.config
      echo "CONFIG_ION=y" >> ./.config
      echo "# CONFIG_ION_SYSTEM_HEAP is not set" >> ./.config
@ -1128,7 +1127,10 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\n
      echo "CONFIG_ANDROID_BINDERFS=y" >>./.config
      echo 'CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"' >>./.config
      echo "# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set" >> ./.config
-      tkgpatch="$srcdir/0013-anbox-modules.patch" && _tkg_patcher
+      warning "Please make sure to read up on how to use this; https://github.com/Frogging-Family/linux-tkg#anbox-usage"
+      if [[ "$CONDITION12" =~ [yY] ]]; then
+        read -rp "Press enter to continue..."
+      fi
    fi
  fi

--- a/linux-tkg-patches/5.10/0013-anbox-modules.patch
+++ b/linux-tkg-patches/5.10/0013-anbox-modules.patch
@ -1,107 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate
---
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- drivers/staging/android/Kconfig  | 2 +-
- drivers/staging/android/Makefile | 3 ++-
- drivers/staging/android/ashmem.c | 3 +++
- 6 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: debian-kernel/drivers/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/android/Kconfig
-+++ debian-kernel/drivers/android/Kconfig
-@@ -9,7 +9,7 @@ config ANDROID
- if ANDROID
- 
- config ANDROID_BINDER_IPC
-	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
-Index: debian-kernel/drivers/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/android/Makefile
-+++ debian-kernel/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-Index: debian-kernel/drivers/android/binder_alloc.c
-===================================================================
--- debian-kernel.orig/drivers/android/binder_alloc.c
-+++ debian-kernel/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
-module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
-Index: debian-kernel/drivers/staging/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Kconfig
-+++ debian-kernel/drivers/staging/android/Kconfig
-@@ -4,7 +4,7 @@ menu "Android"
- if ANDROID
- 
- config ASHMEM
-	bool "Enable the Anonymous Shared Memory Subsystem"
-+	tristate "Enable the Anonymous Shared Memory Subsystem"
- 	depends on SHMEM
- 	help
- 	  The ashmem subsystem is a new shared memory allocator, similar to
-Index: debian-kernel/drivers/staging/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Makefile
-+++ debian-kernel/drivers/staging/android/Makefile
-@@ -3,4 +3,5 @@ ccflags-y += -I$(src)			# needed for tra
- 
- obj-y					+= ion/
- 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
-+obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
-+ashmem_linux-y				+= ashmem.o
-Index: debian-kernel/drivers/staging/android/ashmem.c
-===================================================================
--- debian-kernel.orig/drivers/staging/android/ashmem.c
-+++ debian-kernel/drivers/staging/android/ashmem.c
-@@ -24,6 +24,7 @@
- #include <linux/bitops.h>
- #include <linux/mutex.h>
- #include <linux/shmem_fs.h>
-+#include <linux/module.h>
- #include "ashmem.h"
- 
- #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -953,3 +954,5 @@ out:
- 	return ret;
- }
- device_initcall(ashmem_init);
-+
-+MODULE_LICENSE("GPL v2");
- 
--- a/linux-tkg-patches/5.11/0013-anbox-modules.patch
+++ b/linux-tkg-patches/5.11/0013-anbox-modules.patch
@ -1,107 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate
---
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- drivers/staging/android/Kconfig  | 2 +-
- drivers/staging/android/Makefile | 3 ++-
- drivers/staging/android/ashmem.c | 3 +++
- 6 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: debian-kernel/drivers/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/android/Kconfig
-+++ debian-kernel/drivers/android/Kconfig
-@@ -9,7 +9,7 @@ config ANDROID
- if ANDROID
- 
- config ANDROID_BINDER_IPC
-	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
-Index: debian-kernel/drivers/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/android/Makefile
-+++ debian-kernel/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-Index: debian-kernel/drivers/android/binder_alloc.c
-===================================================================
--- debian-kernel.orig/drivers/android/binder_alloc.c
-+++ debian-kernel/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
-module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
-Index: debian-kernel/drivers/staging/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Kconfig
-+++ debian-kernel/drivers/staging/android/Kconfig
-@@ -4,7 +4,7 @@ menu "Android"
- if ANDROID
- 
- config ASHMEM
-	bool "Enable the Anonymous Shared Memory Subsystem"
-+	tristate "Enable the Anonymous Shared Memory Subsystem"
- 	depends on SHMEM
- 	help
- 	  The ashmem subsystem is a new shared memory allocator, similar to
-Index: debian-kernel/drivers/staging/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Makefile
-+++ debian-kernel/drivers/staging/android/Makefile
-@@ -3,4 +3,5 @@ ccflags-y += -I$(src)			# needed for tra
- 
- obj-y					+= ion/
- 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
-+obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
-+ashmem_linux-y				+= ashmem.o
-Index: debian-kernel/drivers/staging/android/ashmem.c
-===================================================================
--- debian-kernel.orig/drivers/staging/android/ashmem.c
-+++ debian-kernel/drivers/staging/android/ashmem.c
-@@ -24,6 +24,7 @@
- #include <linux/bitops.h>
- #include <linux/mutex.h>
- #include <linux/shmem_fs.h>
-+#include <linux/module.h>
- #include "ashmem.h"
- 
- #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -953,3 +954,5 @@ out:
- 	return ret;
- }
- device_initcall(ashmem_init);
-+
-+MODULE_LICENSE("GPL v2");
- 
--- a/linux-tkg-patches/5.12/0013-anbox-modules.patch
+++ b/linux-tkg-patches/5.12/0013-anbox-modules.patch
@ -1,107 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate
---
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- drivers/staging/android/Kconfig  | 2 +-
- drivers/staging/android/Makefile | 3 ++-
- drivers/staging/android/ashmem.c | 3 +++
- 6 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: debian-kernel/drivers/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/android/Kconfig
-+++ debian-kernel/drivers/android/Kconfig
-@@ -9,7 +9,7 @@ config ANDROID
- if ANDROID
- 
- config ANDROID_BINDER_IPC
-	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
-Index: debian-kernel/drivers/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/android/Makefile
-+++ debian-kernel/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-Index: debian-kernel/drivers/android/binder_alloc.c
-===================================================================
--- debian-kernel.orig/drivers/android/binder_alloc.c
-+++ debian-kernel/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
-module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
-Index: debian-kernel/drivers/staging/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Kconfig
-+++ debian-kernel/drivers/staging/android/Kconfig
-@@ -4,7 +4,7 @@ menu "Android"
- if ANDROID
- 
- config ASHMEM
-	bool "Enable the Anonymous Shared Memory Subsystem"
-+	tristate "Enable the Anonymous Shared Memory Subsystem"
- 	depends on SHMEM
- 	help
- 	  The ashmem subsystem is a new shared memory allocator, similar to
-Index: debian-kernel/drivers/staging/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Makefile
-+++ debian-kernel/drivers/staging/android/Makefile
-@@ -3,4 +3,5 @@ ccflags-y += -I$(src)			# needed for tra
- 
- obj-y					+= ion/
- 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
-+obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
-+ashmem_linux-y				+= ashmem.o
-Index: debian-kernel/drivers/staging/android/ashmem.c
-===================================================================
--- debian-kernel.orig/drivers/staging/android/ashmem.c
-+++ debian-kernel/drivers/staging/android/ashmem.c
-@@ -24,6 +24,7 @@
- #include <linux/bitops.h>
- #include <linux/mutex.h>
- #include <linux/shmem_fs.h>
-+#include <linux/module.h>
- #include "ashmem.h"
- 
- #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -953,3 +954,5 @@ out:
- 	return ret;
- }
- device_initcall(ashmem_init);
-+
-+MODULE_LICENSE("GPL v2");
- 
--- a/linux-tkg-patches/5.7/0013-anbox-modules.patch
+++ b/linux-tkg-patches/5.7/0013-anbox-modules.patch
@ -1,107 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate
---
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- drivers/staging/android/Kconfig  | 2 +-
- drivers/staging/android/Makefile | 3 ++-
- drivers/staging/android/ashmem.c | 3 +++
- 6 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: debian-kernel/drivers/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/android/Kconfig
-+++ debian-kernel/drivers/android/Kconfig
-@@ -9,7 +9,7 @@ config ANDROID
- if ANDROID
- 
- config ANDROID_BINDER_IPC
-	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
-Index: debian-kernel/drivers/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/android/Makefile
-+++ debian-kernel/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-Index: debian-kernel/drivers/android/binder_alloc.c
-===================================================================
--- debian-kernel.orig/drivers/android/binder_alloc.c
-+++ debian-kernel/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
-module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
-Index: debian-kernel/drivers/staging/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Kconfig
-+++ debian-kernel/drivers/staging/android/Kconfig
-@@ -4,7 +4,7 @@ menu "Android"
- if ANDROID
- 
- config ASHMEM
-	bool "Enable the Anonymous Shared Memory Subsystem"
-+	tristate "Enable the Anonymous Shared Memory Subsystem"
- 	depends on SHMEM
- 	help
- 	  The ashmem subsystem is a new shared memory allocator, similar to
-Index: debian-kernel/drivers/staging/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Makefile
-+++ debian-kernel/drivers/staging/android/Makefile
-@@ -3,4 +3,5 @@ ccflags-y += -I$(src)			# needed for tra
- 
- obj-y					+= ion/
- 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
-+obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
-+ashmem_linux-y				+= ashmem.o
-Index: debian-kernel/drivers/staging/android/ashmem.c
-===================================================================
--- debian-kernel.orig/drivers/staging/android/ashmem.c
-+++ debian-kernel/drivers/staging/android/ashmem.c
-@@ -24,6 +24,7 @@
- #include <linux/bitops.h>
- #include <linux/mutex.h>
- #include <linux/shmem_fs.h>
-+#include <linux/module.h>
- #include "ashmem.h"
- 
- #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -953,3 +954,5 @@ out:
- 	return ret;
- }
- device_initcall(ashmem_init);
-+
-+MODULE_LICENSE("GPL v2");
- 
--- a/linux-tkg-patches/5.8/0013-anbox-modules.patch
+++ b/linux-tkg-patches/5.8/0013-anbox-modules.patch
@ -1,107 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate
---
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- drivers/staging/android/Kconfig  | 2 +-
- drivers/staging/android/Makefile | 3 ++-
- drivers/staging/android/ashmem.c | 3 +++
- 6 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: debian-kernel/drivers/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/android/Kconfig
-+++ debian-kernel/drivers/android/Kconfig
-@@ -9,7 +9,7 @@ config ANDROID
- if ANDROID
- 
- config ANDROID_BINDER_IPC
-	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
-Index: debian-kernel/drivers/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/android/Makefile
-+++ debian-kernel/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-Index: debian-kernel/drivers/android/binder_alloc.c
-===================================================================
--- debian-kernel.orig/drivers/android/binder_alloc.c
-+++ debian-kernel/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
-module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
-Index: debian-kernel/drivers/staging/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Kconfig
-+++ debian-kernel/drivers/staging/android/Kconfig
-@@ -4,7 +4,7 @@ menu "Android"
- if ANDROID
- 
- config ASHMEM
-	bool "Enable the Anonymous Shared Memory Subsystem"
-+	tristate "Enable the Anonymous Shared Memory Subsystem"
- 	depends on SHMEM
- 	help
- 	  The ashmem subsystem is a new shared memory allocator, similar to
-Index: debian-kernel/drivers/staging/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Makefile
-+++ debian-kernel/drivers/staging/android/Makefile
-@@ -3,4 +3,5 @@ ccflags-y += -I$(src)			# needed for tra
- 
- obj-y					+= ion/
- 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
-+obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
-+ashmem_linux-y				+= ashmem.o
-Index: debian-kernel/drivers/staging/android/ashmem.c
-===================================================================
--- debian-kernel.orig/drivers/staging/android/ashmem.c
-+++ debian-kernel/drivers/staging/android/ashmem.c
-@@ -24,6 +24,7 @@
- #include <linux/bitops.h>
- #include <linux/mutex.h>
- #include <linux/shmem_fs.h>
-+#include <linux/module.h>
- #include "ashmem.h"
- 
- #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -953,3 +954,5 @@ out:
- 	return ret;
- }
- device_initcall(ashmem_init);
-+
-+MODULE_LICENSE("GPL v2");
- 
--- a/linux-tkg-patches/5.9/0013-anbox-modules.patch
+++ b/linux-tkg-patches/5.9/0013-anbox-modules.patch
@ -1,107 +0,0 @@
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Fri, 22 Jun 2018 17:27:00 +0100
-Subject: android: Enable building ashmem and binder as modules
-Bug-Debian: https://bugs.debian.org/901492
-
-We want to enable use of the Android ashmem and binder drivers to
-support Anbox, but they should not be built-in as that would waste
-resources and increase security attack surface on systems that don't
-need them.
-
- Add a MODULE_LICENSE declaration to ashmem
- Change the Makefiles to build each driver as an object with the
-  "_linux" suffix (which is what Anbox expects)
- Change config symbol types to tristate
---
- drivers/android/Kconfig          | 2 +-
- drivers/android/Makefile         | 7 ++++---
- drivers/android/binder_alloc.c   | 2 +-
- drivers/staging/android/Kconfig  | 2 +-
- drivers/staging/android/Makefile | 3 ++-
- drivers/staging/android/ashmem.c | 3 +++
- 6 files changed, 12 insertions(+), 7 deletions(-)
-
-Index: debian-kernel/drivers/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/android/Kconfig
-+++ debian-kernel/drivers/android/Kconfig
-@@ -9,7 +9,7 @@ config ANDROID
- if ANDROID
- 
- config ANDROID_BINDER_IPC
-	bool "Android Binder IPC Driver"
-+	tristate "Android Binder IPC Driver"
- 	depends on MMU
- 	default n
- 	help
-Index: debian-kernel/drivers/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/android/Makefile
-+++ debian-kernel/drivers/android/Makefile
-@@ -1,6 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0-only
- ccflags-y += -I$(src)			# needed for trace events
- 
-obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
-obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
-obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-+obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder_linux.o
-+binder_linux-y := binder.o binder_alloc.o
-+binder_linux-$(CONFIG_ANDROID_BINDERFS)	+= binderfs.o
-+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-Index: debian-kernel/drivers/android/binder_alloc.c
-===================================================================
--- debian-kernel.orig/drivers/android/binder_alloc.c
-+++ debian-kernel/drivers/android/binder_alloc.c
-@@ -38,7 +38,7 @@ enum {
- };
- static uint32_t binder_alloc_debug_mask = BINDER_DEBUG_USER_ERROR;
- 
-module_param_named(debug_mask, binder_alloc_debug_mask,
-+module_param_named(alloc_debug_mask, binder_alloc_debug_mask,
- 		   uint, 0644);
- 
- #define binder_alloc_debug(mask, x...) \
-Index: debian-kernel/drivers/staging/android/Kconfig
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Kconfig
-+++ debian-kernel/drivers/staging/android/Kconfig
-@@ -4,7 +4,7 @@ menu "Android"
- if ANDROID
- 
- config ASHMEM
-	bool "Enable the Anonymous Shared Memory Subsystem"
-+	tristate "Enable the Anonymous Shared Memory Subsystem"
- 	depends on SHMEM
- 	help
- 	  The ashmem subsystem is a new shared memory allocator, similar to
-Index: debian-kernel/drivers/staging/android/Makefile
-===================================================================
--- debian-kernel.orig/drivers/staging/android/Makefile
-+++ debian-kernel/drivers/staging/android/Makefile
-@@ -3,4 +3,5 @@ ccflags-y += -I$(src)			# needed for tra
- 
- obj-y					+= ion/
- 
-obj-$(CONFIG_ASHMEM)			+= ashmem.o
-+obj-$(CONFIG_ASHMEM)			+= ashmem_linux.o
-+ashmem_linux-y				+= ashmem.o
-Index: debian-kernel/drivers/staging/android/ashmem.c
-===================================================================
--- debian-kernel.orig/drivers/staging/android/ashmem.c
-+++ debian-kernel/drivers/staging/android/ashmem.c
-@@ -24,6 +24,7 @@
- #include <linux/bitops.h>
- #include <linux/mutex.h>
- #include <linux/shmem_fs.h>
-+#include <linux/module.h>
- #include "ashmem.h"
- 
- #define ASHMEM_NAME_PREFIX "dev/ashmem/"
-@@ -953,3 +954,5 @@ out:
- 	return ret;
- }
- device_initcall(ashmem_init);
-+
-+MODULE_LICENSE("GPL v2");
-