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 3.x development tree".
The branch, master has been updated via 29c70149e3a04f360d5f013ee58b11cd13018aca (commit) via c1d71b465bd414f05ad3e897f7389ffc5e9bc46e (commit) via a8e51819e5e4517f2cbffc6874a7c49cc9f1145b (commit) via d80cb086ccd489efa1eea5c5a149039855dcf0c8 (commit) via 451f443882874e5d8df279a53db125b9aafa2ece (commit) from bec0a77219ba4bc3cbf18f2140df6eab8090a6b6 (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 29c70149e3a04f360d5f013ee58b11cd13018aca Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 30 00:20:09 2018 +0000
kernel: Align ARM configuration with remaining architectures
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c1d71b465bd414f05ad3e897f7389ffc5e9bc46e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 30 00:09:41 2018 +0000
kernel: Use host's spinlocks when running in PV mode
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a8e51819e5e4517f2cbffc6874a7c49cc9f1145b Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 30 00:06:39 2018 +0000
kernel: configure: Allow passing --arch= to edit a certain configuration
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d80cb086ccd489efa1eea5c5a149039855dcf0c8 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 29 23:52:27 2018 +0000
kernel: Make all crypto acceleration a module
This will allow a slightly smaller kernel on many systems that do not have any support for any crypto acceleration.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 451f443882874e5d8df279a53db125b9aafa2ece Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 29 23:45:56 2018 +0000
kernel: Disable some unused network protocols
This disables BATMAN (which has been dropped some time ago from userspace), L2TP and ebtables.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: kernel/README.md | 10 ++++--- kernel/config-arm-generic | 12 --------- kernel/config-arm32-generic | 19 ++++++------- kernel/config-arm64-generic | 10 +++---- kernel/config-generic | 65 +++++++++++++-------------------------------- kernel/config-x86-generic | 24 +++++------------ kernel/kernel.nm | 2 +- kernel/scripts/configure | 21 ++++++++++++--- 8 files changed, 63 insertions(+), 100 deletions(-)
Difference in files: diff --git a/kernel/README.md b/kernel/README.md index 5c629f824..26a3f79a7 100644 --- a/kernel/README.md +++ b/kernel/README.md @@ -35,13 +35,15 @@ Like oldconfig, but automatically answers all options with the default value.
#### menuconfig
-If you want to edit the configuration using the kernel's config editor, you can -do it for the main architecture (which is x86_64 right now). All other configuration -files will be updated afterwards and potentially prompted for options that diverge -for other architectures. +If you want to edit the configuration using the kernel's config editor. All +configuration files will be updated afterwards and potentially prompted for options +that diverge for different architectures.
(pakfire-shell)> scripts/configure menuconfig
+Appending the --arch= argument allows you to edit a specific architecture. +Default is x86_64. + #### listnewconfig
This will list all unset options. diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 8221b82ac..8ca1a8835 100644 --- a/kernel/config-arm-generic +++ b/kernel/config-arm-generic @@ -51,7 +51,6 @@ CONFIG_PCIEASPM_DEFAULT=y # # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_HW_PERF_EVENTS=y -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_HARDEN_BRANCH_PREDICTOR=y
# @@ -761,17 +760,6 @@ CONFIG_ARM_PMU=y # CONFIG_MESON_MX_EFUSE=m
-# -# Crypto core or helper -# -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_SIMD=m - -# -# Block modes -# -CONFIG_CRYPTO_LRW=m - # # Library routines # diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index 528b2cd96..d05c9d68e 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -305,12 +305,12 @@ CONFIG_ARM_ERRATA_754327=y CONFIG_ARM_ERRATA_764369=y CONFIG_ARM_ERRATA_775420=y CONFIG_ARM_ERRATA_798181=y -# CONFIG_ARM_ERRATA_773022 is not set -# CONFIG_ARM_ERRATA_818325_852422 is not set -# CONFIG_ARM_ERRATA_821420 is not set -# CONFIG_ARM_ERRATA_825619 is not set -# CONFIG_ARM_ERRATA_852421 is not set -# CONFIG_ARM_ERRATA_852423 is not set +CONFIG_ARM_ERRATA_773022=y +CONFIG_ARM_ERRATA_818325_852422=y +CONFIG_ARM_ERRATA_821420=y +CONFIG_ARM_ERRATA_825619=y +CONFIG_ARM_ERRATA_852421=y +CONFIG_ARM_ERRATA_852423=y CONFIG_KRAIT_L2_ACCESSORS=y
# @@ -361,21 +361,18 @@ CONFIG_NR_CPUS=4 CONFIG_ARM_PSCI=y CONFIG_ARCH_NR_GPIO=1024 CONFIG_HZ_FIXED=0 -CONFIG_HZ_100=y # CONFIG_HZ_200 is not set -# CONFIG_HZ_300 is not set # CONFIG_HZ_500 is not set -CONFIG_HZ=100 CONFIG_THUMB2_KERNEL=y CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y CONFIG_ARM_PATCH_IDIV=y CONFIG_AEABI=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_HIGHMEM=y -# CONFIG_HIGHPTE is not set +CONFIG_HIGHPTE=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set +CONFIG_ARM_MODULE_PLTS=y CONFIG_FORCE_MAX_ZONEORDER=12 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index 621ae0d15..7bb595ca5 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -120,9 +120,6 @@ CONFIG_NODES_SHIFT=2 CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y CONFIG_HOLES_IN_ZONE=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_300=y -CONFIG_HZ=300 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y @@ -138,7 +135,7 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_SW_TTBR0_PAN=y
# # ARMv8.1 architectural features @@ -152,7 +149,7 @@ CONFIG_ARM64_VHE=y # ARMv8.2 architectural features # CONFIG_ARM64_UAO=y -# CONFIG_ARM64_PMEM is not set +CONFIG_ARM64_PMEM=y CONFIG_ARM64_RAS_EXTN=y CONFIG_ARM64_CNP=y CONFIG_ARM64_SVE=y @@ -232,6 +229,7 @@ CONFIG_ACPI_HED=m CONFIG_ACPI_CUSTOM_METHOD=m # CONFIG_ACPI_BGRT is not set CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y +# CONFIG_ACPI_NFIT is not set # CONFIG_ACPI_APEI is not set CONFIG_ACPI_WATCHDOG=y # CONFIG_PMIC_OPREGION is not set @@ -781,6 +779,8 @@ CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y CONFIG_ARCH_HAS_DMA_MMAP_PGPROT=y CONFIG_UCS2_STRING=y CONFIG_SG_SPLIT=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
# # Compile-time checks and compiler options diff --git a/kernel/config-generic b/kernel/config-generic index 50559e007..f44d360e2 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -68,6 +68,7 @@ CONFIG_PREEMPT_NONE=y CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_HAVE_SCHED_AVG_IRQ=y CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_TASKSTATS=y @@ -210,6 +211,7 @@ CONFIG_SMP=y CONFIG_PARAVIRT=y CONFIG_XEN=y CONFIG_XEN_DOM0=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y
@@ -217,8 +219,11 @@ CONFIG_SCHED_MC=y # Performance monitoring # CONFIG_SECCOMP=y +# CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set +CONFIG_HZ_300=y # CONFIG_HZ_1000 is not set +CONFIG_HZ=300 CONFIG_SCHED_HRTICK=y CONFIG_HOTPLUG_CPU=y
@@ -943,27 +948,7 @@ CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_TABLES_BRIDGE=y CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_LOG_BRIDGE=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_NFLOG=m +# CONFIG_BRIDGE_NF_EBTABLES is not set CONFIG_BPFILTER=y CONFIG_BPFILTER_UMH=m # CONFIG_IP_DCCP is not set @@ -983,13 +968,8 @@ CONFIG_ATM_CLIP=m # CONFIG_ATM_LANE is not set CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set -CONFIG_L2TP_V3=y -CONFIG_L2TP_IP=m -CONFIG_L2TP_ETH=m +# CONFIG_L2TP is not set CONFIG_STP=y -CONFIG_GARP=y CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y @@ -1005,7 +985,7 @@ CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=y -CONFIG_VLAN_8021Q_GVRP=y +# CONFIG_VLAN_8021Q_GVRP is not set # CONFIG_VLAN_8021Q_MVRP is not set # CONFIG_DECNET is not set CONFIG_LLC=y @@ -1103,15 +1083,7 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -CONFIG_BATMAN_ADV=m -# CONFIG_BATMAN_ADV_BATMAN_V is not set -CONFIG_BATMAN_ADV_BLA=y -CONFIG_BATMAN_ADV_DAT=y -CONFIG_BATMAN_ADV_NC=y -CONFIG_BATMAN_ADV_MCAST=y -CONFIG_BATMAN_ADV_DEBUGFS=y -# CONFIG_BATMAN_ADV_DEBUG is not set -# CONFIG_BATMAN_ADV_TRACING is not set +# CONFIG_BATMAN_ADV is not set # CONFIG_OPENVSWITCH is not set CONFIG_VSOCKETS=m CONFIG_VSOCKETS_DIAG=m @@ -1135,7 +1107,7 @@ CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y CONFIG_BPF_JIT=y -# CONFIG_BPF_STREAM_PARSER is not set +CONFIG_BPF_STREAM_PARSER=y CONFIG_NET_FLOW_LIMIT=y
# @@ -2011,7 +1983,6 @@ CONFIG_PPP_MULTILINK=y CONFIG_PPPOATM=m CONFIG_PPPOE=m CONFIG_PPTP=m -CONFIG_PPPOL2TP=m CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m # CONFIG_SLIP is not set @@ -5587,6 +5558,7 @@ CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y # CONFIG_CRYPTO_USER is not set # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_PCRYPT=m @@ -5594,6 +5566,7 @@ CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=y CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m CONFIG_CRYPTO_ENGINE=m
# @@ -5614,12 +5587,13 @@ CONFIG_CRYPTO_ECHAINIV=m # Block modes # CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CFB=y CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=y CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_OFB=y -CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_PCBC is not set CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_KEYWRAP=m
@@ -5699,11 +5673,10 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_USER_API=y -CONFIG_CRYPTO_USER_API_HASH=y -CONFIG_CRYPTO_USER_API_SKCIPHER=y -CONFIG_CRYPTO_USER_API_RNG=y -CONFIG_CRYPTO_USER_API_AEAD=y +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +# CONFIG_CRYPTO_USER_API_RNG is not set +# CONFIG_CRYPTO_USER_API_AEAD is not set CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_DEV_CHELSIO=m diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 23f224516..6b3ae388d 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -85,7 +85,8 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT_XXL=y # CONFIG_PARAVIRT_DEBUG is not set -# CONFIG_PARAVIRT_SPINLOCKS is not set +CONFIG_PARAVIRT_SPINLOCKS=y +# CONFIG_QUEUED_LOCK_STAT is not set CONFIG_XEN_PV=y CONFIG_XEN_PV_SMP=y CONFIG_XEN_PVHVM=y @@ -96,7 +97,6 @@ CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_PVH is not set CONFIG_KVM_GUEST=y # CONFIG_KVM_DEBUG_FS is not set -CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y # CONFIG_JAILHOUSE_GUEST is not set # CONFIG_MK8 is not set @@ -187,9 +187,6 @@ CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y CONFIG_EFI=y CONFIG_EFI_STUB=y # CONFIG_EFI_MIXED is not set -# CONFIG_HZ_100 is not set -CONFIG_HZ_300=y -CONFIG_HZ=300 # CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set CONFIG_CRASH_DUMP=y @@ -262,7 +259,7 @@ CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m # CONFIG_ACPI_BGRT is not set # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set -CONFIG_ACPI_NFIT=m +# CONFIG_ACPI_NFIT is not set CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y @@ -1568,9 +1565,7 @@ CONFIG_INTEL_TXT=y # # Crypto core or helper # -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_GLUE_HELPER_X86=y +CONFIG_CRYPTO_GLUE_HELPER_X86=m
# # Authenticated Encryption with Associated Data @@ -1582,15 +1577,10 @@ CONFIG_CRYPTO_GLUE_HELPER_X86=y # CONFIG_CRYPTO_MORUS1280_SSE2 is not set # CONFIG_CRYPTO_MORUS1280_AVX2 is not set
-# -# Block modes -# -CONFIG_CRYPTO_LRW=y - # # Digest # -CONFIG_CRYPTO_CRC32C_INTEL=y +CONFIG_CRYPTO_CRC32C_INTEL=m CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_POLY1305_X86_64=m @@ -1602,8 +1592,8 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m # # Ciphers # -CONFIG_CRYPTO_AES_X86_64=y -CONFIG_CRYPTO_AES_NI_INTEL=y +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m CONFIG_CRYPTO_BLOWFISH_X86_64=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 747880d02..5dce3cf73 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@
name = kernel version = 4.20 -release = 1.1 +release = 5 thisapp = linux-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org diff --git a/kernel/scripts/configure b/kernel/scripts/configure index c06a0b4d5..2d45dd16e 100755 --- a/kernel/scripts/configure +++ b/kernel/scripts/configure @@ -164,8 +164,11 @@ function merge_config() {
# This function runs an interactive "make oldconfig". function make_config() { - local arch="x86_64" - local kernel_arch="x86" + local arch="${1}" + shift + + # Detect kernel arch + local kernel_arch="$(get_kernel_arch "${arch}")" local flavour="default"
local config_in=$(mktemp) @@ -293,6 +296,7 @@ function diff_configs() { rm -rf ${tmpdir} }
+ARCH="x86_64" KERNEL_DIR="$(search_kernel_dir)"
# Parse commandline. @@ -309,7 +313,16 @@ while [ $# -gt 0 ]; do ;; listnewconfig|menuconfig|merge|oldconfig|olddefconfig) action=${arg} - break + ;; + + # Parse switches + --arch=*) + ARCH="${arg#*=}" + + if ! get_platform "${ARCH}" &>/dev/null; then + echo "Unknown architecture: ${ARCH}" >&2 + exit 2 + fi ;; esac done @@ -330,7 +343,7 @@ case "${action}" in exit $? ;; listnewconfig|menuconfig|oldconfig|olddefconfig) - make_config "${action}" + make_config "${ARCH}" "${action}" exit $? ;; esac
hooks/post-receive -- IPFire 3.x development tree