main/linux-postmarketos-allwinner: add anbox support again (!1222)

fix regression caused by
https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1205
and closes
https://gitlab.com/postmarketOS/pmaports/-/issues/583.
This commit is contained in:
Antoine Fontaine 2020-05-11 17:49:04 +02:00 committed by Martijn Braam
parent 94e11e17e9
commit b6d8b5893f
No known key found for this signature in database
GPG key ID: C4280ACB000B060F
2 changed files with 31 additions and 6 deletions

View file

@ -2,7 +2,7 @@ _flavor=postmarketos-allwinner
_config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor
pkgver=5.6.0_git20200429
pkgrel=0
pkgrel=1
arch="aarch64"
pkgdesc="Kernel fork with Pine64 patches"
url="https://gitlab.com/pine64-org/linux/"
@ -65,6 +65,6 @@ dev() {
INSTALL_HDR_PATH="$subpkgdir"/usr
}
sha512sums="5c416e18ab0f798a18549cc63591d3eb29ea9e82ee9e48a34f2debfac590c516cecaa09fc1b51d0baedb330bd0f11c1e1f5868a3010591e73413b6d5397acfde linux-postmarketos-allwinner-2a6074e53b019db8a4a63cb255bc29422db3fe19.tar.gz
3a7750223417969ddb92dd7f96ba5bdca0ebd8fc5aac5a41407d348b936d6897483d761a2bd713c823c9361c52657ca10dc720dfc28c6dd36b9b929c378ad024 config-postmarketos-allwinner.aarch64
60d84d4c07dfa77ee40ba93e1fe77417a94b3dee3adfd8c06099deecee854079a52858673937601b3360245a66ad60744a1736373fc33149ddb31c911a89bca7 config-postmarketos-allwinner.aarch64
8cdfb6d8a894e610c261446663dfbe34c01612a091fa029645e86913634de4394db0d1ab7dedb190052dff82330f0ddabe31860bbf7cd6fe0cdf23e37d0a6ca6 disable-power-save.patch
5f403bb1e3e7528954adcba4429768ce26bf13382dc6325ced245babcfb5252d515bea812b9df16d0e5370c9d4e07b4e0267f4c750281faf3cb6ffb29906700c touch-dts.patch"

View file

@ -831,6 +831,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
CONFIG_NET=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
CONFIG_NET_INGRESS=y
CONFIG_SKB_EXTENSIONS=y
#
# Networking options
@ -896,11 +897,13 @@ CONFIG_IPV6_TUNNEL=m
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
CONFIG_NETFILTER=y
CONFIG_NETFILTER_ADVANCED=y
CONFIG_BRIDGE_NETFILTER=m
#
# Core Netfilter Configuration
#
CONFIG_NETFILTER_INGRESS=y
CONFIG_NETFILTER_FAMILY_BRIDGE=y
# CONFIG_NETFILTER_NETLINK_ACCT is not set
# CONFIG_NETFILTER_NETLINK_QUEUE is not set
# CONFIG_NETFILTER_NETLINK_LOG is not set
@ -999,6 +1002,7 @@ CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set
# CONFIG_NETFILTER_XT_MATCH_OSF is not set
# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
@ -1079,6 +1083,7 @@ CONFIG_IP6_NF_MANGLE=m
CONFIG_NF_DEFRAG_IPV6=y
# CONFIG_NF_CONNTRACK_BRIDGE is not set
# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_BPFILTER is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
@ -1086,11 +1091,17 @@ CONFIG_NF_DEFRAG_IPV6=y
# CONFIG_TIPC is not set
# CONFIG_ATM is not set
# CONFIG_L2TP is not set
# CONFIG_BRIDGE is not set
CONFIG_STP=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
# CONFIG_NET_DSA is not set
# CONFIG_VLAN_8021Q is not set
CONFIG_VLAN_8021Q=m
# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_VLAN_8021Q_MVRP is not set
# CONFIG_DECNET is not set
CONFIG_LLC=m
# CONFIG_LLC2 is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
@ -1470,7 +1481,7 @@ CONFIG_WIREGUARD=m
# CONFIG_NETCONSOLE is not set
CONFIG_TUN=y
# CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_VETH is not set
CONFIG_VETH=m
# CONFIG_NLMON is not set
#
@ -4863,7 +4874,21 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
CONFIG_SQUASHFS=m
# CONFIG_SQUASHFS_FILE_CACHE is not set
CONFIG_SQUASHFS_FILE_DIRECT=y
# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
# CONFIG_SQUASHFS_DECOMP_MULTI is not set
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_LZ4 is not set
# CONFIG_SQUASHFS_LZO is not set
CONFIG_SQUASHFS_XZ=y
# CONFIG_SQUASHFS_ZSTD is not set
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set