linux-samsung-jflte: upgrade to 3.4.113
Tested boot, display, touch input, USB network OK on my SGH-I337M. Camera still broken. Didn't test other functionality.
This commit is contained in:
Alex Xu (Hello71)
Clayton Craft
parent
8cfa9176bf
commit
c97344a64b
4 changed files with 94 additions and 7 deletions
|
|
@ -2,8 +2,8 @@
|
|||
# Kernel config based on: arch/arm/configs/jf_defconfig
|
||||
|
||||
pkgname=linux-samsung-jflte
|
||||
pkgver=3.4.112
|
||||
pkgrel=13
|
||||
pkgver=3.4.113
|
||||
pkgrel=0
|
||||
pkgdesc="Samsung Galaxy S4 kernel fork"
|
||||
arch="armv7"
|
||||
_carch="arm"
|
||||
|
|
@ -15,7 +15,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
|
|||
|
||||
# Source
|
||||
_repository="android_kernel_samsung_jf"
|
||||
_commit="e8d93e03563e42d7c762d4e9a87d77115102b301"
|
||||
_commit="0b7873d52c2331383f37eb908e54940eeac07345"
|
||||
_config="config-$_flavor.$arch"
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
|
||||
|
|
@ -23,7 +23,8 @@ source="
|
|||
03-fix-video-argb-setting.patch
|
||||
gcc7-give-up-on-ilog2-const-optimizations.patch
|
||||
gcc8-fix-put-user.patch
|
||||
kernel-use-the-gnu89-standard-explicitly.patch
|
||||
deduplicate-copy_net_ns.patch
|
||||
nfqnl_ct_put.patch
|
||||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
|
||||
|
|
@ -42,9 +43,12 @@ package() {
|
|||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
|
||||
}
|
||||
|
||||
sha512sums="7b73724636d9fb2a19e6405b1c6acd9f08020cb2d8c51f209eab2dea90616f15e88e96cdea62931864a6a3f6d4ad1c0b0b9b5cae3e3a690c20f5a9dcb4b33d82 linux-samsung-jflte-e8d93e03563e42d7c762d4e9a87d77115102b301.tar.gz
|
||||
sha512sums="
|
||||
5301543d6f04c0b70ee8892cbc81e5c81965dd4e81b76282520f9bb7de8cebcb15323d8a58cc5ddaa29c7d7ef0107dcd9022bdbdd05e944516afbc256870513d linux-samsung-jflte-0b7873d52c2331383f37eb908e54940eeac07345.tar.gz
|
||||
b7595ecb480aeb93007bcd941dd131a80884db44fe714c681bdd79ac330df3ae904f8d6f53243f1bdd081949cb5f4b886e051641ea83d737e7b857b4c56dfa00 config-samsung-jflte.armv7
|
||||
e3083c260ed9c4fc0d83f43106700b6173876dbfae072f6e6696ac6785a4dc17771fbcb3e21601e04ed29a11bf0f7a2a09ad549375e0c34cea245c7f2e2bcbbd 03-fix-video-argb-setting.patch
|
||||
77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch
|
||||
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch
|
||||
ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch"
|
||||
213717aabd91c8b1fe93f113a33e8d859d29e319ae49b9c751bf4abdedc4ee3bc972a55141cf879876009001fedd055b07cae42aeffdc73535f2e99857f3a101 deduplicate-copy_net_ns.patch
|
||||
9bc646815e5064fade207b3cc62a7bfdef8edb2e8b9edf9c2110e35517001ead2f5a4725247dfcf734e1ce9f8cfdd1414338cae425ecdc4874cfcf1ead22cd05 nfqnl_ct_put.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
diff -ru a/include/net/net_namespace.h b/include/net/net_namespace.h
|
||||
--- a/include/net/net_namespace.h 2021-05-03 18:16:44.000000000 -0400
|
||||
+++ b/include/net/net_namespace.h 2021-07-23 09:30:57.134066982 -0400
|
||||
@@ -114,18 +114,21 @@
|
||||
/* Init's network namespace */
|
||||
extern struct net init_net;
|
||||
|
||||
-#ifdef CONFIG_NET
|
||||
+#ifdef CONFIG_NET_NS
|
||||
extern struct net *copy_net_ns(unsigned long flags,
|
||||
struct user_namespace *user_ns, struct net *net_ns);
|
||||
|
||||
-#else /* CONFIG_NET */
|
||||
+#else /* CONFIG_NET_NS */
|
||||
+#include <linux/sched.h>
|
||||
+#include <linux/nsproxy.h>
|
||||
static inline struct net *copy_net_ns(unsigned long flags,
|
||||
- struct user_namespace *user_ns, struct net *net_ns)
|
||||
+ struct user_namespace *user_ns, struct net *old_net)
|
||||
{
|
||||
- /* There is nothing to copy so this is a noop */
|
||||
- return net_ns;
|
||||
+ if (flags & CLONE_NEWNET)
|
||||
+ return ERR_PTR(-EINVAL);
|
||||
+ return old_net;
|
||||
}
|
||||
-#endif /* CONFIG_NET */
|
||||
+#endif /* CONFIG_NET_NS */
|
||||
|
||||
|
||||
extern struct list_head net_namespace_list;
|
||||
diff -ru a/net/core/net_namespace.c b/net/core/net_namespace.c
|
||||
--- a/net/core/net_namespace.c 2021-05-03 18:16:44.000000000 -0400
|
||||
+++ b/net/core/net_namespace.c 2021-07-23 09:29:03.454038112 -0400
|
||||
@@ -353,13 +353,6 @@
|
||||
}
|
||||
|
||||
#else
|
||||
-struct net *copy_net_ns(unsigned long flags, struct net *old_net)
|
||||
-{
|
||||
- if (flags & CLONE_NEWNET)
|
||||
- return ERR_PTR(-EINVAL);
|
||||
- return old_net;
|
||||
-}
|
||||
-
|
||||
struct net *get_net_ns_by_fd(int fd)
|
||||
{
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../.shared-patches/linux/kernel-use-the-gnu89-standard-explicitly.patch
|
||||
36
device/testing/linux-samsung-jflte/nfqnl_ct_put.patch
Normal file
36
device/testing/linux-samsung-jflte/nfqnl_ct_put.patch
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
From 674147e21195a496164e1c7ff70d0f0b45235f25 Mon Sep 17 00:00:00 2001
|
||||
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Date: Tue, 19 Jun 2012 05:25:46 +0200
|
||||
Subject: [PATCH] netfilter: fix missing symbols if
|
||||
CONFIG_NETFILTER_NETLINK_QUEUE_CT unset
|
||||
|
||||
ERROR: "nfqnl_ct_parse" [net/netfilter/nfnetlink_queue.ko] undefined!
|
||||
ERROR: "nfqnl_ct_seq_adjust" [net/netfilter/nfnetlink_queue.ko] undefined!
|
||||
ERROR: "nfqnl_ct_put" [net/netfilter/nfnetlink_queue.ko] undefined!
|
||||
ERROR: "nfqnl_ct_get" [net/netfilter/nfnetlink_queue.ko] undefined!
|
||||
|
||||
We have to use CONFIG_NETFILTER_NETLINK_QUEUE_CT in
|
||||
include/net/netfilter/nfnetlink_queue.h, not CONFIG_NF_CONNTRACK.
|
||||
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
include/net/netfilter/nfnetlink_queue.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/net/netfilter/nfnetlink_queue.h b/include/net/netfilter/nfnetlink_queue.h
|
||||
index 9f8095c108e4..86267a529514 100644
|
||||
--- a/include/net/netfilter/nfnetlink_queue.h
|
||||
+++ b/include/net/netfilter/nfnetlink_queue.h
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
struct nf_conn;
|
||||
|
||||
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
|
||||
+#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT
|
||||
struct nf_conn *nfqnl_ct_get(struct sk_buff *entskb, size_t *size,
|
||||
enum ip_conntrack_info *ctinfo);
|
||||
struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb,
|
||||
--
|
||||
2.32.0
|
||||
|
||||
Loading…
Add table
Reference in a new issue