From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a834285d1ba8cd4314cb9fd8218b0bc2bcfe68d4
Date: Sat, 15 Sep 2018 15:00:03 +0100 [thread overview]
Message-ID: <20180915140003.B84361081BD3@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 11871 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via a834285d1ba8cd4314cb9fd8218b0bc2bcfe68d4 (commit)
via 276692f3783c865cb5049d19b306fe56bdc43e60 (commit)
from 088b7f4f3f6be2ccc082d26214bbc9daf86879bc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a834285d1ba8cd4314cb9fd8218b0bc2bcfe68d4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 15 15:58:13 2018 +0200
kernel: arm: enable chacha poly
fixes: #11855
todo: add rootfiles for arm 32-bit
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 276692f3783c865cb5049d19b306fe56bdc43e60
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 15 15:49:10 2018 +0200
core124: add kernel files to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.aarch64-ipfire | 4 ++--
config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 12 ++++++------
config/kernel/kernel.config.armv5tel-ipfire-multi | 13 +++++++------
config/rootfiles/common/aarch64/linux | 3 +++
config/rootfiles/core/124/filelists/aarch64/linux | 1 +
config/rootfiles/core/124/filelists/aarch64/linux-initrd | 1 +
.../124}/filelists/armv5tel/linux-initrd-kirkwood | 0
.../121 => core/124}/filelists/armv5tel/linux-initrd-multi | 0
.../100 => core/124}/filelists/armv5tel/linux-kirkwood | 0
.../100 => core/124}/filelists/armv5tel/linux-multi | 0
.../{oldcore/100 => core/124}/filelists/i586/linux | 0
.../{oldcore/100 => core/124}/filelists/i586/linux-initrd | 0
.../{oldcore/100 => core/124}/filelists/x86_64/linux | 0
.../{oldcore/100 => core/124}/filelists/x86_64/linux-initrd | 0
14 files changed, 20 insertions(+), 14 deletions(-)
create mode 120000 config/rootfiles/core/124/filelists/aarch64/linux
create mode 120000 config/rootfiles/core/124/filelists/aarch64/linux-initrd
copy config/rootfiles/{oldcore/121 => core/124}/filelists/armv5tel/linux-initrd-kirkwood (100%)
copy config/rootfiles/{oldcore/121 => core/124}/filelists/armv5tel/linux-initrd-multi (100%)
copy config/rootfiles/{oldcore/100 => core/124}/filelists/armv5tel/linux-kirkwood (100%)
copy config/rootfiles/{oldcore/100 => core/124}/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/{oldcore/100 => core/124}/filelists/i586/linux (100%)
copy config/rootfiles/{oldcore/100 => core/124}/filelists/i586/linux-initrd (100%)
copy config/rootfiles/{oldcore/100 => core/124}/filelists/x86_64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/124}/filelists/x86_64/linux-initrd (100%)
Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index fd7073490..a2f5a5e55 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -6636,7 +6636,7 @@ CONFIG_CRYPTO_ENGINE=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -6699,7 +6699,7 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index 02645d074..f2d97c886 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.68 Kernel Configuration
+# Linux/arm 4.14.43 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1075,9 +1075,6 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1085,7 +1082,10 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -6058,7 +6058,7 @@ CONFIG_CRYPTO_TEST=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -6121,7 +6121,7 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 7e4a42ba1..6362cff2d 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.68 Kernel Configuration
+# Linux/arm 4.14.43 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1344,9 +1344,6 @@ CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_SOCKET_IPV6=m
CONFIG_NF_TABLES_IPV6=m
CONFIG_NFT_CHAIN_ROUTE_IPV6=m
-CONFIG_NFT_CHAIN_NAT_IPV6=m
-CONFIG_NFT_MASQ_IPV6=m
-CONFIG_NFT_REDIR_IPV6=m
CONFIG_NFT_REJECT_IPV6=m
CONFIG_NFT_DUP_IPV6=m
CONFIG_NFT_FIB_IPV6=m
@@ -1354,7 +1351,10 @@ CONFIG_NF_DUP_IPV6=m
CONFIG_NF_REJECT_IPV6=m
CONFIG_NF_LOG_IPV6=m
CONFIG_NF_NAT_IPV6=m
+CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NF_NAT_MASQUERADE_IPV6=m
+CONFIG_NFT_MASQ_IPV6=m
+CONFIG_NFT_REDIR_IPV6=m
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_AH=m
CONFIG_IP6_NF_MATCH_EUI64=m
@@ -5879,6 +5879,7 @@ CONFIG_DMA_ENGINE_RAID=y
CONFIG_SYNC_FILE=y
# CONFIG_SW_SYNC is not set
# CONFIG_AUXDISPLAY is not set
+CONFIG_ARM_CHARLCD=y
# CONFIG_PANEL is not set
CONFIG_UIO=m
# CONFIG_UIO_CIF is not set
@@ -7127,7 +7128,7 @@ CONFIG_CRYPTO_ENGINE=m
#
CONFIG_CRYPTO_CCM=m
CONFIG_CRYPTO_GCM=m
-# CONFIG_CRYPTO_CHACHA20POLY1305 is not set
+CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_ECHAINIV=m
@@ -7190,7 +7191,7 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-# CONFIG_CRYPTO_CHACHA20 is not set
+CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_TEA=m
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index c5351db94..1db558c81 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -99,6 +99,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/crypto/cast6_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/cast_common.ko
#lib/modules/KVER-ipfire/kernel/crypto/ccm.ko
+#lib/modules/KVER-ipfire/kernel/crypto/chacha20_generic.ko
+#lib/modules/KVER-ipfire/kernel/crypto/chacha20poly1305.ko
#lib/modules/KVER-ipfire/kernel/crypto/cmac.ko
#lib/modules/KVER-ipfire/kernel/crypto/crypto_engine.ko
#lib/modules/KVER-ipfire/kernel/crypto/cts.ko
@@ -118,6 +120,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/crypto/michael_mic.ko
#lib/modules/KVER-ipfire/kernel/crypto/pcbc.ko
#lib/modules/KVER-ipfire/kernel/crypto/pcrypt.ko
+#lib/modules/KVER-ipfire/kernel/crypto/poly1305_generic.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd128.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd160.ko
#lib/modules/KVER-ipfire/kernel/crypto/rmd256.ko
diff --git a/config/rootfiles/core/124/filelists/aarch64/linux b/config/rootfiles/core/124/filelists/aarch64/linux
new file mode 120000
index 000000000..3a2532bc7
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/aarch64/linux
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/aarch64/linux-initrd b/config/rootfiles/core/124/filelists/aarch64/linux-initrd
new file mode 120000
index 000000000..8acdb0f31
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/aarch64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood
new file mode 120000
index 000000000..39c5591b7
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 000000000..72171071e
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-multi b/config/rootfiles/core/124/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/i586/linux b/config/rootfiles/core/124/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/i586/linux-initrd b/config/rootfiles/core/124/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/x86_64/linux b/config/rootfiles/core/124/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/124/filelists/x86_64/linux-initrd b/config/rootfiles/core/124/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/124/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-09-15 14:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180915140003.B84361081BD3@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox