diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:09:55 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:09:55 +0100 |
| commit | b1ef18278ba295fcddd30751d8294e76e638724e (patch) | |
| tree | c04e42280fe27b7c73195b0cba36b73faae44400 /core | |
| parent | 70a7c30b8196a4398cf755b93507516d0f83be56 (diff) | |
| parent | 665c195f3812e8a410095ac2ffa5a692116870e2 (diff) | |
| download | packages-b1ef18278ba295fcddd30751d8294e76e638724e.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core')
| -rw-r--r-- | core/linux/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/linux/config.i486 | 5 | ||||
| -rw-r--r-- | core/linux/config.i686 | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 6310e45b..f0b8eb50 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,12 +1,12 @@ -# upstream git revision: 45f74c7ee0c0d228f516a775817769db3192f978 +# upstream git revision: 2e669a90e89f01c68b7b0faf7f6084aabca61c3f source_i686=('config.i686') source_i486=('config.i486') # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '986918689166b88f03579bda4a5a964ec4a1db18423b89981ba58da7e35e8e89' ]; then - sha256sums_i686=('bd4295f9ccd4e19755c589e711791b7937de3f5685a29de2b30f6b193acc0bc9') - sha256sums_i486=('124ae6377726257edae0312eba64fe70758d321c7997e90e021ad3676441c1fe') + if [ "${sha256sums[${i}]}" = 'e7fa30bb2de12d1a2488423e27c00f26d55668e310e69aaf93673c1afd89dbaf' ]; then + sha256sums_i686=('4af6c8a227ff11512fc11c8654d8148224caef9fcfd26f7927a319abb38a18e9') + sha256sums_i486=('3ef8623d68b0615003e0603b63cc6f74c4904926c5b920155d6cd06650cb3c8c') fi done diff --git a/core/linux/config.i486 b/core/linux/config.i486 index ad6b63d2..ab8bc501 100644 --- a/core/linux/config.i486 +++ b/core/linux/config.i486 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.2-arch1 Kernel Configuration +# Linux/x86 4.19.4-arch1 Kernel Configuration # # @@ -1529,6 +1529,7 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_GARP=m CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y @@ -1546,7 +1547,7 @@ CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_TRAILER=y CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m diff --git a/core/linux/config.i686 b/core/linux/config.i686 index 0715271b..950853bd 100644 --- a/core/linux/config.i686 +++ b/core/linux/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.2-arch1 Kernel Configuration +# Linux/x86 4.19.4-arch1 Kernel Configuration # # @@ -1560,6 +1560,7 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=m +CONFIG_GARP=m CONFIG_MRP=m CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y @@ -1576,7 +1577,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y # CONFIG_DECNET is not set CONFIG_LLC=m |