From cfdc440340fed94696e4a6be1e759a0564bda556 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Tue, 14 Feb 2017 03:47:34 +0000 Subject: raspberrypi-linux: add smack patchset to 4.9 bbappend Breakout smack patchset files definitions into both 4.4 and 4.9 bbappends since the later only needs one of the patches. Issue: SPEC-443 Change-Id: I04afcaf55da2f9aa735e6798ba60a00ba0838726 Signed-off-by: Matt Ranostay --- .../linux/linux-raspberrypi_%.bbappend | 72 +++++++++++++++++++++ .../linux/linux-raspberrypi_4.4.bbappend | 75 ---------------------- .../linux/linux-raspberrypi_4.9.bbappend | 6 ++ 3 files changed, 78 insertions(+), 75 deletions(-) create mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend create mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend (limited to 'meta-agl-bsp/meta-raspberrypi/recipes-kernel') diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend new file mode 100644 index 000000000..1db6d4221 --- /dev/null +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -0,0 +1,72 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI_append = "\ + ${@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 + + # Enable support for TP-Link TL-W722N USB Wifi adapter + kernel_configure_variable CONFIG_ATH_CARDS m + kernel_configure_variable CONFIG_ATH9K_HTC m + + # Enable support for RTLSDR + kernel_configure_variable CONFIG_MEDIA_USB_SUPPORT y + kernel_configure_variable CONFIG_MEDIA_DIGITAL_TV_SUPPORT y + kernel_configure_variable CONFIG_DVB_USB_V2 m + kernel_configure_variable CONFIG_DVB_USB_RTL28XXU m + + # 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_DEBUG = "" +CMDLINE_append = " usbhid.mousepoll=0" + +# Add options to allow CMA to operate +CMDLINE_append = ' ${@base_conditional("ENABLE_CMA", "1", "coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}' + +KERNEL_MODULE_AUTOLOAD += "snd-bcm2835" +KERNEL_MODULE_AUTOLOAD += "hid-multitouch" + +RDEPENDS_${PN} += "kernel-module-snd-bcm2835" +PACKAGES += "kernel-module-snd-bcm2835" 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 90176c6c5..9879c6f43 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 @@ -1,9 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI_append = "\ - ${@base_conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \ -" - #------------------------------------------------------------------------- # smack patches for handling bluetooth @@ -13,72 +7,3 @@ SRC_URI_append_smack = "\ file://0003-Smack-ignore-null-signal-in-smack_task_kill.patch \ file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \ " - - - -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 - - # Enable support for TP-Link TL-W722N USB Wifi adapter - kernel_configure_variable CONFIG_ATH_CARDS m - kernel_configure_variable CONFIG_ATH9K_HTC m - - # Enable support for RTLSDR - kernel_configure_variable CONFIG_MEDIA_USB_SUPPORT y - kernel_configure_variable CONFIG_MEDIA_DIGITAL_TV_SUPPORT y - kernel_configure_variable CONFIG_DVB_USB_V2 m - kernel_configure_variable CONFIG_DVB_USB_RTL28XXU m - - # 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_DEBUG = "" -CMDLINE_append = " usbhid.mousepoll=0" - -# Add options to allow CMA to operate -CMDLINE_append = ' ${@base_conditional("ENABLE_CMA", "1", "coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}' - -KERNEL_MODULE_AUTOLOAD += "snd-bcm2835" -KERNEL_MODULE_AUTOLOAD += "hid-multitouch" - -RDEPENDS_${PN} += "kernel-module-snd-bcm2835" -PACKAGES += "kernel-module-snd-bcm2835" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend new file mode 100644 index 000000000..206a8d0c3 --- /dev/null +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend @@ -0,0 +1,6 @@ +#------------------------------------------------------------------------- +# smack patches for handling bluetooth + +SRC_URI_append_smack = "\ + file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \ +" -- cgit 1.2.3-korg