From a3c1e22dd97be5820944017e9e3051c362793712 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 27 Oct 2017 20:41:44 +0000 Subject: [PATCH] kconfig_check: disable CONFIG_PFT (#830) This caused builds to fail with a modern GCC at least once, and while it originally was meant as security feature by Qualcomm, "it is unsupported by Qualcomm, and opens up to a wide range of potential attack surfaces that has not been audited by anyone." --- aports/device/linux-fairphone-fp2/APKBUILD | 4 ++-- aports/device/linux-fairphone-fp2/config-fairphone-fp2.armhf | 2 +- aports/device/linux-lg-d285/APKBUILD | 4 ++-- aports/device/linux-lg-d285/config-lg-d285.armhf | 2 +- aports/device/linux-lg-d855/APKBUILD | 4 ++-- aports/device/linux-lg-d855/config-lg-d855.armhf | 2 +- pmb/config/__init__.py | 1 + 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/aports/device/linux-fairphone-fp2/APKBUILD b/aports/device/linux-fairphone-fp2/APKBUILD index d71b472f..af106125 100644 --- a/aports/device/linux-fairphone-fp2/APKBUILD +++ b/aports/device/linux-fairphone-fp2/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=4 +pkgrel=5 arch="armhf" pkgdesc="LineageOS kernel for Fairphone 2" url="https://github.com/LineageOS/android_kernel_fairphone_msm8974" @@ -124,7 +124,7 @@ package() { } sha512sums="acddc069c3e8aa5b58c82eddc6e335946695e618fe5756e81a730cbcfbba0fd256b6e46024c46a66f8551d67608edd6d55b5a7cfa8ea98b064ca1ddaa1d7238d 8c73c363d1cd11624ddda9a1ef08b9dc7a5569e4.zip -47181bba7ecc2e9b927140a95456741ab29808f9abbba80529e380ff72d7731a516bd63f381e0b840386ddc5f4c2f95bb44ae5171fa4fc6bcc79052133f93ce0 config-fairphone-fp2.armhf +ab13d17b292081ecaa607e52b424eedea3e2c02678e5b329f3c8b5267cc844b4c40e7cd7244ede0d4fa4d5722b9e0a1cfd23498b34859b5702534d51954dc41a config-fairphone-fp2.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch 5c49f6ff6773a7dc3067d2b1359648fe7a9f758b6c068d6fa69d9aaf24a291ba8022c960317d926aabc11d020a71b20c4e81a6fcf9b21ef66d9b6d065bae23e9 00_Input-lifebook-use-static-inline-instead-of-inline-i.patch diff --git a/aports/device/linux-fairphone-fp2/config-fairphone-fp2.armhf b/aports/device/linux-fairphone-fp2/config-fairphone-fp2.armhf index 5ba7b8d1..a068de30 100644 --- a/aports/device/linux-fairphone-fp2/config-fairphone-fp2.armhf +++ b/aports/device/linux-fairphone-fp2/config-fairphone-fp2.armhf @@ -3345,7 +3345,7 @@ CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y # CONFIG_IPA is not set CONFIG_MSM_AVTIMER=y -CONFIG_PFT=y +# CONFIG_PFT is not set # CONFIG_SSM is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y diff --git a/aports/device/linux-lg-d285/APKBUILD b/aports/device/linux-lg-d285/APKBUILD index 52047d9e..8e6caec5 100644 --- a/aports/device/linux-lg-d285/APKBUILD +++ b/aports/device/linux-lg-d285/APKBUILD @@ -15,7 +15,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=2 +pkgrel=3 arch="armhf" pkgdesc="LineageOS kernel for LG L65" url="https://github.com/LineageOS/android_kernel_lge_msm8226" @@ -113,7 +113,7 @@ package() { } sha512sums="d201e20557edea08947f10be1465560d292522f07099e2f8927164766da57e4f8a2c3fcd3e3ed427e856a86afe4fb3a4233753e19d4b7cb96b8258c6355be9f0 linux-lg-d285-75a583b12772acf3a6e7422cf781ddd7a9e9a5c5.tar.gz -bcc9fd9f48a1eab07d2a928241860d032edf44cf019834b8ccf24adf604cbcebcd66b73326830b7ab970a25b723b3a708e0baecd308374496f90491919a64266 config-lg-d285.armhf +d0fb124cb11162149dbaff3c492fef2385ea3e3a5e41b230f71490922ab8290775e2b32dab747a5b5a03a137b758ddf685942f8e32897b86258654e643ba808d config-lg-d285.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch diff --git a/aports/device/linux-lg-d285/config-lg-d285.armhf b/aports/device/linux-lg-d285/config-lg-d285.armhf index 7ed53187..2234d146 100644 --- a/aports/device/linux-lg-d285/config-lg-d285.armhf +++ b/aports/device/linux-lg-d285/config-lg-d285.armhf @@ -3316,7 +3316,7 @@ CONFIG_QPNP_REVID=y # CONFIG_QPNP_COINCELL is not set # CONFIG_IPA is not set CONFIG_MSM_AVTIMER=y -CONFIG_PFT=y +# CONFIG_PFT is not set # CONFIG_SSM is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y diff --git a/aports/device/linux-lg-d855/APKBUILD b/aports/device/linux-lg-d855/APKBUILD index dcf68a4c..c0eecc9c 100644 --- a/aports/device/linux-lg-d855/APKBUILD +++ b/aports/device/linux-lg-d855/APKBUILD @@ -21,7 +21,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; esac -pkgrel=8 +pkgrel=9 arch="armhf" pkgdesc="LG G3 kernel from LineageOS" url="https://github.com/LineageOS/android_kernel_lge_g3" @@ -102,6 +102,6 @@ package() { } sha512sums="a2e7c0575a677846f734804a462729ca97505101e9090231aeeae5c863b9d1a65d227f04a302157ee9579336be4f8b589f77cb7916ee7d8fc8b8d7fb97295374 linux-lg-d855-efce7b0879c76224f5bf37d8a1025eaed99192b0.tar.gz -60ec310f16e2b7b72b7d4e210139b03ed1ea2fd99fd42edd290609e65fdb339eb175def0d157c07a10e52b6e654af8184dc9524ad0e41b8a2d0d6ef95e54a93b config-lg-d855.armhf +03b01823f41490456aa618b8fc77c9e2093680ea8b54c3c425eb6bb41c3e66e1cf0d39bfcd130bd26a97610b1b8cd04393853d5e1b1f8203dd70b5bae46306c9 config-lg-d855.armhf d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch" diff --git a/aports/device/linux-lg-d855/config-lg-d855.armhf b/aports/device/linux-lg-d855/config-lg-d855.armhf index ab44d09b..87fab56b 100644 --- a/aports/device/linux-lg-d855/config-lg-d855.armhf +++ b/aports/device/linux-lg-d855/config-lg-d855.armhf @@ -3229,7 +3229,7 @@ CONFIG_QPNP_REVID=y CONFIG_QPNP_COINCELL=y # CONFIG_IPA is not set # CONFIG_MSM_AVTIMER is not set -CONFIG_PFT=y +# CONFIG_PFT is not set # CONFIG_SSM is not set # CONFIG_VIBRATOR_PM8974_HAPTIC is not set CONFIG_CLKDEV_LOOKUP=y diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index eaa97435..6e79d6d1 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -156,6 +156,7 @@ necessary_kconfig_options = { "DEVTMPFS": True, "DEVTMPFS_MOUNT": False, "DM_CRYPT": True, + "PFT": False, "SYSVIPC": True, "VT": True }