From 03847696e1ebce26ddd500f3db08e1a2407d09d4 Mon Sep 17 00:00:00 2001
From: Anri Dellal <anridellal@gmail.com>
Date: Mon, 15 Mar 2021 19:35:12 +0300
Subject: [PATCH] linux-nobby-230: install modules (MR 2031)

- Changes APKBUILD to build and install kernel modules
- Build UBIFS support as module

[ci:skip-build] Already passed CI
---
 device/testing/linux-nobby-230/APKBUILD             | 13 +++++++++++--
 .../testing/linux-nobby-230/config-nobby-230.armv7  |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/device/testing/linux-nobby-230/APKBUILD b/device/testing/linux-nobby-230/APKBUILD
index e11a530db..d27e4cead 100644
--- a/device/testing/linux-nobby-230/APKBUILD
+++ b/device/testing/linux-nobby-230/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=linux-nobby-230
 pkgver=3.10.17
-pkgrel=3
+pkgrel=4
 pkgdesc="Nobby 230 kernel fork"
 arch="armv7"
 _carch="arm"
@@ -49,14 +49,23 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+
+	make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" modules
 }
 
 package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
+
+	unset LDFLAGS
+	make modules_install \
+		ARCH="$_carch" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
+		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1
 }
 
 sha512sums="0bee0e9c67c155957ed90f6f3707ec9663fd541c1c73e93c747b71423b37d64486c1c758b5e889280210b69d377c0bb203346f8d290252d5a4989788749b6e89  linux-nobby-230-161c7229a4873ead08fc0118d93967b66e38d645.tar.gz
-cc1bcb7c7e27541a325990abbfbec0931776ae902c8bfe9381f8593c37b164a2bf92bd260c8b706d8b912409eb15231ae62b5868a4937660df767230cb0321de  config-nobby-230.armv7
+b9812776690b07fabd5bc1bfa2157eef6902101c32d1eee2ec602ffb93865020090079a8d76d62b1a3f10c76413d57edec84605babd11a57d03445a2efacc693  config-nobby-230.armv7
 35f8b9f5a22c8aec5906b1ba2fc4c214962d8091e933abe7b354b0e9023b03bb543a08157e0d22c68367ef30b3543af9385299fdcfa8df63cca9da08a8fa4d80  lcd_ili9340.c
 ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch
 fd3d5578120f43a09013feebe3ea75cff71de1078a92a20d27083f15279106f4c95f7889d432eabc689954d9db4bff09a429374b8d2891f23f08d64e66affd86  01-fix-X11.patch
diff --git a/device/testing/linux-nobby-230/config-nobby-230.armv7 b/device/testing/linux-nobby-230/config-nobby-230.armv7
index 870e1e0d3..84636a603 100644
--- a/device/testing/linux-nobby-230/config-nobby-230.armv7
+++ b/device/testing/linux-nobby-230/config-nobby-230.armv7
@@ -1086,7 +1086,7 @@ CONFIG_MTD_NAND_DOLPHIN=y
 # LPDDR flash memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
-CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
@@ -2896,7 +2896,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_JFFS2_FS is not set
-CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y