From ac3ad6047da007bf60d61d3c6a9dba6f43513e55 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Thu, 23 Feb 2023 21:28:41 +0100 Subject: [PATCH] linux-postmarketos-allwinner: update waydroid opts (MR 3901) Enable options required for the Android 11 image inside waydroid: * CONFIG_BPF_SYSCALL * CONFIG_CGROUP_BPF * CONFIG_PSI (already set for this kernel) * not CONFIG_PSI_DEFAULT_DISABLED (already set for this kernel) The same will be done for all devices in main and community in the following patches. Also add V=1 for all kernels I'm modifying that are below 6.2 (see issue 1990). --- device/main/linux-postmarketos-allwinner/APKBUILD | 10 ++++++---- .../config-postmarketos-allwinner.aarch64 | 15 ++++++++++++++- .../config-postmarketos-allwinner.armv7 | 14 +++++++++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index 0bd6dd471..42dff0775 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=6.2.7_git20230317 -pkgrel=0 +pkgrel=1 _tag="orange-pi-6.2-20230317-1559" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -66,10 +66,12 @@ prepare() { build() { unset LDFLAGS + # V=1: workaround for pma#1990 make ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \ CFLAGS_MODULE=-fno-pic \ - DTC_FLAGS="-@" + DTC_FLAGS="-@" \ + V=1 } package() { @@ -84,8 +86,8 @@ package() { sha512sums=" a4f55a84b0866fea78b4b2e10dd818dd2b3894e0bd29ee1e4e72c3d8afe9043e40164234dc3a9a6dd382d3d6c594b1b3f334e3002597d3ab03164907190f32b3 linux-postmarketos-allwinner-orange-pi-6.2-20230317-1559.tar.gz -c1a06ee5675a509960cff12a875b9baeb05651c7f552405c84595662866e51f64af5454d555f8f3a9bfbab56ecfd3491f9ad67f2af3483d08e19319526b09c52 config-postmarketos-allwinner.aarch64 -117ee589b1d34532c7367cf481ecbc542c0afe45e9e8625067ef60d6d570a4e99565c9e5b20178e370d09ffd4a21fdeca45a8d8031d64fd0c7e68859f4b95726 config-postmarketos-allwinner.armv7 +e1476794f45e1bb5f7c8f429f46fa3db7558189aa63f91dc508c6ea508954a8d2626a12f4b30659f3e37a362bf3ef1c21f2332a9ae2cb8ef0fcd78239d1526bb config-postmarketos-allwinner.aarch64 +82ac79f4e856900a3b75398689ce2bc483e0ddfeec0dd9a2db14473d1c8d1d4d9633878cb019878f1d3fbfefc4662542781e2d36937237aada69dbcd6e5abbb5 config-postmarketos-allwinner.armv7 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 5cd9d4233..6d955ed8c 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -91,9 +91,12 @@ CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y # # BPF subsystem # -# CONFIG_BPF_SYSCALL is not set +CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set CONFIG_BPF_JIT_DEFAULT_ON=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y +# CONFIG_BPF_PRELOAD is not set # end of BPF subsystem CONFIG_PREEMPT_BUILD=y @@ -132,9 +135,12 @@ CONFIG_PREEMPT_RCU=y CONFIG_RCU_EXPERT=y CONFIG_SRCU=y CONFIG_TREE_SRCU=y +CONFIG_TASKS_RCU_GENERIC=y # CONFIG_FORCE_TASKS_RCU is not set +CONFIG_TASKS_RCU=y # CONFIG_FORCE_TASKS_RUDE_RCU is not set # CONFIG_FORCE_TASKS_TRACE_RCU is not set +CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_FANOUT=64 @@ -142,6 +148,7 @@ CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set +# CONFIG_TASKS_TRACE_RCU_READ_MB is not set CONFIG_RCU_LAZY=y # end of RCU Subsystem @@ -187,6 +194,7 @@ CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_MISC is not set CONFIG_SOCK_CGROUP_DATA=y CONFIG_NAMESPACES=y @@ -901,6 +909,7 @@ CONFIG_XFRM_ESP=m CONFIG_XFRM_IPCOMP=y CONFIG_NET_KEY=y # CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_XDP_SOCKETS is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -1386,6 +1395,7 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y +# CONFIG_BPF_STREAM_PARSER is not set CONFIG_NET_FLOW_LIMIT=y # @@ -1494,6 +1504,7 @@ CONFIG_RFKILL_INPUT=y CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y CONFIG_NET_SELFTESTS=y +CONFIG_NET_SOCK_MSG=y CONFIG_PAGE_POOL=y # CONFIG_PAGE_POOL_STATS is not set # CONFIG_FAILOVER is not set @@ -6138,6 +6149,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # end of Certificates for signature checking +CONFIG_BINARY_PRINTF=y + # # Library routines # diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index 67088bbce..5aa00a1a2 100644 --- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -96,8 +96,10 @@ CONFIG_HAVE_EBPF_JIT=y # # BPF subsystem # -# CONFIG_BPF_SYSCALL is not set +CONFIG_BPF_SYSCALL=y # CONFIG_BPF_JIT is not set +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y +# CONFIG_BPF_PRELOAD is not set # end of BPF subsystem CONFIG_PREEMPT_BUILD=y @@ -131,9 +133,12 @@ CONFIG_RCU_EXPERT=y CONFIG_SRCU=y CONFIG_TREE_SRCU=y CONFIG_NEED_SRCU_NMI_SAFE=y +CONFIG_TASKS_RCU_GENERIC=y # CONFIG_FORCE_TASKS_RCU is not set +CONFIG_TASKS_RCU=y # CONFIG_FORCE_TASKS_RUDE_RCU is not set # CONFIG_FORCE_TASKS_TRACE_RCU is not set +CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_NEED_SEGCBLIST=y CONFIG_RCU_FANOUT=32 @@ -141,6 +146,7 @@ CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y # CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set +# CONFIG_TASKS_TRACE_RCU_READ_MB is not set CONFIG_RCU_LAZY=y # end of RCU Subsystem @@ -182,6 +188,7 @@ CONFIG_PROC_PID_CPUSET=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_BPF=y # CONFIG_CGROUP_MISC is not set CONFIG_SOCK_CGROUP_DATA=y CONFIG_NAMESPACES=y @@ -814,6 +821,7 @@ CONFIG_AF_UNIX_OOB=y # CONFIG_TLS is not set # CONFIG_XFRM_USER is not set # CONFIG_NET_KEY is not set +# CONFIG_XDP_SOCKETS is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set CONFIG_IP_ADVANCED_ROUTER=y @@ -1256,6 +1264,7 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y +# CONFIG_BPF_STREAM_PARSER is not set CONFIG_NET_FLOW_LIMIT=y # @@ -1317,6 +1326,7 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y CONFIG_NET_SELFTESTS=y +CONFIG_NET_SOCK_MSG=y CONFIG_PAGE_POOL=y # CONFIG_PAGE_POOL_STATS is not set # CONFIG_FAILOVER is not set @@ -5934,6 +5944,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # end of Certificates for signature checking +CONFIG_BINARY_PRINTF=y + # # Library routines #