Use kernel_configure_variable in append for rpi

This changeset simplifies the configuration of the rpi kernel
by using kernel_configure_variable in do_configure_append.
Due to an upstream bug, we need to repeat the final configuration call.

We also enable BLK_DEV_RAM, BLK_DEV_NBD and SMACK.

For this we also define an OVERRIDE for netboot.

v2: add conditional appends for netboot, sota, smack by using overrides.

Change-Id: I2a4a8fae6989246d715fc2fc71bb4c251f423bdb
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

1 files changed, 46 insertions, 1 deletions

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend
index 8c0073538..f7b12e065 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.4.bbappend
@@ -5,10 +5,55 @@ LINUX_VERSION = "4.4.16"
 SRCREV = "26550dcfb86b0308a99f726abbfb55abb1b0f78c"
 
 SRC_URI_append = "\
-	file://0001-rpi-defconfig.patch \
 	${@base_conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
 "
 
+do_configure_append_smack() {
+    # SMACK and Co
+    kernel_configure_variable IP_NF_SECURITY m
+    kernel_configure_variable IP6_NF_SECURITY m
+    kernel_configure_variable EXT2_FS_SECURITY y
+    kernel_configure_variable EXT3_FS_SECURITY y
+    kernel_configure_variable EXT4_FS_SECURITY y
+    kernel_configure_variable SECURITY y
+    kernel_configure_variable SECURITY_SMACK y
+    kernel_configure_variable TMPFS_XATTR y
+    kernel_configure_variable DEFAULT_SECURITY "smack"
+    kernel_configure_variable DEFAULT_SECURITY_SMACK y
+    kernel_configure_variable FANOTIFY_ACCESS_PERMISSIONS y
+}
+
+do_configure_append_netboot() {
+    # NBD for netboot
+    kernel_configure_variable BLK_DEV_NBD y
+    # ramblk for inird
+    kernel_configure_variable BLK_DEV_RAM y
+}
+
+do_configure_append_sota() {
+    # ramblk for inird
+    kernel_configure_variable BLK_DEV_RAM y
+}
+
+do_configure_append() {
+
+    # VC4 Wayland/Weston
+    kernel_configure_variable I2C_BCM2835 y
+    kernel_configure_variable DRM y
+    kernel_configure_variable DRM_PANEL_RASPBERRYPI_TOUCHSCREEN y
+    kernel_configure_variable DRM_VC4 y
+    kernel_configure_variable FB_BCM2708 n
+
+    # KEEP until fixed upstream:
+      # Keep this the last line
+      # Remove all modified configs and add the rest to .config
+      sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
+
+      yes '' | oe_runmake oldconfig
+      kernel_do_configure
+}
+
+
 CMDLINE_append = " usbhid.mousepoll=0"
 
 KERNEL_MODULE_AUTOLOAD += "snd-bcm2835"