Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
pmaports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
postmarketOS
pmaports
Commits
880212e3
Verified
Commit
880212e3
authored
3 years ago
by
spameier
Committed by
Alexey Minnekhanov
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
samsung-kminilte: switch kernel to a more recent downstream repository (MR 2781)
parent
49af61ef
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
device/testing/linux-samsung-kminilte/0003-netfilter-symbols.patch
+29
-0
29 additions, 0 deletions
...sting/linux-samsung-kminilte/0003-netfilter-symbols.patch
device/testing/linux-samsung-kminilte/APKBUILD
+10
-6
10 additions, 6 deletions
device/testing/linux-samsung-kminilte/APKBUILD
with
39 additions
and
6 deletions
device/testing/linux-samsung-kminilte/0003-netfilter-symbols.patch
0 → 100644
+
29
−
0
View file @
880212e3
commit 80cc1852c7e85441a8fecb35513cb4d33a0d202e
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Tue Jun 19 05:25:46 2012 +0200
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>
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,
This diff is collapsed.
Click to expand it.
device/testing/linux-samsung-kminilte/APKBUILD
+
10
−
6
View file @
880212e3
...
...
@@ -2,12 +2,12 @@
pkgname
=
linux-samsung-kminilte
pkgver
=
3.4.113
pkgrel
=
8
pkgrel
=
9
pkgdesc
=
"Samsung Galaxy S5 Mini kernel fork"
arch
=
"armv7"
_carch
=
"arm"
_flavor
=
"samsung-kminilte"
url
=
"https://github.com/
cm-3470
/android_kernel_samsung_kminilte"
url
=
"https://github.com/
Spookcity
/android_kernel_samsung_kminilte"
license
=
"GPL2"
options
=
"!strip !check !tracedeps pmb:cross-native"
makedepends
=
"perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev gcc6"
...
...
@@ -23,13 +23,14 @@ fi
# Source
_repository
=
"android_kernel_samsung_kminilte"
_commit
=
"
7a8c010f226189116dcf2301d338555ae0d270c3
"
_commit
=
"
19064009217860c08c7167ba8be23fa9bde44fce
"
_config
=
"config-
$_flavor
.
$arch
"
source
=
"
$pkgname
-
$_commit
.tar.gz::https://github.com/
cm-3470
/
$_repository
/archive/
$_commit
.tar.gz
$pkgname
-
$_commit
.tar.gz::https://github.com/
Spookcity
/
$_repository
/archive/
$_commit
.tar.gz
$_config
0001-drivers-leds-rt5033_fled-fix-use-of-usleep.patch
0002-drivers-leds-flashlight-add-support-for-setting-mode.patch
0003-netfilter-symbols.patch
"
builddir
=
"
$srcdir
/
$_repository
-
$_commit
"
...
...
@@ -48,7 +49,10 @@ package() {
downstreamkernel_package
"
$builddir
"
"
$pkgdir
"
"
$_carch
"
"
$_flavor
"
}
sha512sums
=
"351b043822d9fc25a002f07a490422341fd03671d661bb949085ef8d69042f1ae528f80ade7076aba3eaffec80f65c09fdbb600ffe04063c69d876c22a53709b linux-samsung-kminilte-7a8c010f226189116dcf2301d338555ae0d270c3.tar.gz
sha512sums
=
"
55cc9a7d1c2381bea2f4d4fc2282653d41d501e838610edd0ccf8acad9a01e05299d2c3301c55f9073db91f78a791708902ad28e5c8b7026bd6574bac395df89 linux-samsung-kminilte-19064009217860c08c7167ba8be23fa9bde44fce.tar.gz
1751ca36d837691afd26c13ab1ffcedc36c11ec4a5635c5da278eb8dc397da43b683ff8a82e83cc72fd8efcb1dd2f0e30e4f1cc5af89c9800ec6c9437fbe48b7 config-samsung-kminilte.armv7
873e4ff64521f685b7948e7a55aba4a95e3c0086b54c8e1440f67630c49a6b17b10c71837ba44d0bdb9afb05ff3ee8c0c890f0053fb79cd733aa76aed53579c2 0001-drivers-leds-rt5033_fled-fix-use-of-usleep.patch
fb30ea67620fc0dae62943b512662e0f3a49b7509d5f3cddda4c1552fe365535ac414f4ae960356f18228ce49d5c362c512cec7a9b671ffe96408f91b1b9fdee 0002-drivers-leds-flashlight-add-support-for-setting-mode.patch"
fb30ea67620fc0dae62943b512662e0f3a49b7509d5f3cddda4c1552fe365535ac414f4ae960356f18228ce49d5c362c512cec7a9b671ffe96408f91b1b9fdee 0002-drivers-leds-flashlight-add-support-for-setting-mode.patch
5214a850d496bed9e17575bd0b52e9e4415bcbd5a89863f924c5bfed848f684c0a95e8d10c9ef93c0e00149f034cf5e897d1b268be35676a600b3ee6e1917501 0003-netfilter-symbols.patch
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment