diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | 0005-898490c010b.patch | 198 | ||||
| -rw-r--r-- | 60-linux.hook | 12 | ||||
| -rw-r--r-- | 90-linux.hook | 11 | ||||
| -rw-r--r-- | PKGBUILD | 61 | ||||
| -rw-r--r-- | config | 25 | ||||
| -rw-r--r-- | linux-lts.preset | 14 |
7 files changed, 247 insertions, 110 deletions
@@ -1,7 +1,5 @@ -# Generated by mksrcinfo v8 -# Thu May 21 00:52:18 UTC 2020 pkgbase = linux-lts414 - pkgver = 4.14.181 + pkgver = 4.14.336 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -13,48 +11,40 @@ pkgbase = linux-lts414 makedepends = libelf options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.181.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.336.xz source = config - source = 60-linux.hook - source = 90-linux.hook - source = linux-lts.preset source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch source = 0004-export_kernel_fpu_functions.patch + source = 0005-898490c010b.patch + validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 + validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E md5sums = bacdb9ffdcd922aa069a5e1520160e24 - md5sums = 5bab09f3b69cb50565e2e8589054f2d2 - md5sums = e0400bf4a229af8a187f00a926cb3e96 - md5sums = ce6c81ad1ad1f8b333fd6077d47abdaf - md5sums = a85bfae59eb537b973c388ffadb281ff - md5sums = a329f9581060d555dc7358483de9760a + md5sums = c7ce7c564746338afcd1e4c8d8e52e89 + md5sums = b482d22d72ba46de5db13584c889ab42 md5sums = 53523555d234de3b2fde749096ba9948 md5sums = 95204750f94a5f6d2d19e021736265d5 md5sums = f7d76cdef5cf4ac6a49115fc4f1f35d5 + md5sums = b7e3c03892c1c45aa19e11aff82b388c sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7 - sha256sums = f892715b50dc4da0448877f61177ce6748d3616658c71704db9450f2eb0e54c3 - sha256sums = 837f66e63c96701962a483f23de6b2b4bcc33dac2a697ffbdcf155c0adb864fb - sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 - sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 - sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 + sha256sums = c577893e1bbb8f5c36b7207f6d7f3165cd64c069d977d1b720c10e5917a821e7 + sha256sums = 1d1992babef5f1c35911dd6b3818b3684628fc21b97bc9975791892bccb50b20 sha256sums = 36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98 sha256sums = b6c56ff2dffebe164941ac3428351e158c9c059e884057ecfc215eeea12e76eb sha256sums = caba7945805b1ade42e42d2f981ccdd8791c76f39166212f7970a78057582474 + sha256sums = 8efff55ae9dd776ff4ac109e736e8040858f441ae1900435bdeb9f366a53d68f pkgname = linux-lts414 pkgdesc = The Linux-lts414 kernel and modules - install = linux-lts.install depends = coreutils depends = linux-firmware depends = kmod - depends = mkinitcpio>=0.7 + depends = initramfs optdepends = crda: to set the correct wireless channels of your country - provides = linux=4.14.181 - backup = etc/mkinitcpio.d/linux-lts414.preset + optdepends = linux-firmware-uncompressed: hardware support pkgname = linux-lts414-headers pkgdesc = Header files and scripts for building modules for Linux-lts414 kernel - provides = linux-headers=4.14.181 pkgname = linux-lts414-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-lts414 kernel - diff --git a/0005-898490c010b.patch b/0005-898490c010b.patch new file mode 100644 index 000000000000..aef9fe9f55bb --- /dev/null +++ b/0005-898490c010b.patch @@ -0,0 +1,198 @@ +From 898490c010b5d2e499e03b7e815fc214209ac583 Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov <gladkov.alexey@gmail.com> +Date: Mon, 29 Apr 2019 18:11:14 +0200 +Subject: [PATCH] moduleparam: Save information about built-in modules in + separate file + +Problem: + +When a kernel module is compiled as a separate module, some important +information about the kernel module is available via .modinfo section of +the module. In contrast, when the kernel module is compiled into the +kernel, that information is not available. + +Information about built-in modules is necessary in the following cases: + +1. When it is necessary to find out what additional parameters can be +passed to the kernel at boot time. + +2. When you need to know which module names and their aliases are in +the kernel. This is very useful for creating an initrd image. + +Proposal: + +The proposed patch does not remove .modinfo section with module +information from the vmlinux at the build time and saves it into a +separate file after kernel linking. So, the kernel does not increase in +size and no additional information remains in it. Information is stored +in the same format as in the separate modules (null-terminated string +array). Because the .modinfo section is already exported with a separate +modules, we are not creating a new API. + +It can be easily read in the userspace: + +$ tr '\0' '\n' < modules.builtin.modinfo +ext4.softdep=pre: crc32c +ext4.license=GPL +ext4.description=Fourth Extended Filesystem +ext4.author=Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others +ext4.alias=fs-ext4 +ext4.alias=ext3 +ext4.alias=fs-ext3 +ext4.alias=ext2 +ext4.alias=fs-ext2 +md_mod.alias=block-major-9-* +md_mod.alias=md +md_mod.description=MD RAID framework +md_mod.license=GPL +md_mod.parmtype=create_on_open:bool +md_mod.parmtype=start_dirty_degraded:int +... + +Co-Developed-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> +Signed-off-by: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org> +Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com> +Acked-by: Jessica Yu <jeyu@kernel.org> +Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> +--- + .gitignore | 1 + + Documentation/dontdiff | 1 + + Documentation/kbuild/kbuild.txt | 5 +++++ + Makefile | 2 ++ + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/module.h | 1 + + include/linux/moduleparam.h | 12 +++++------- + scripts/link-vmlinux.sh | 3 +++ + 8 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/.gitignore b/.gitignore +index e7bb6c6edbae40..2fb1765c33b0a2 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -58,6 +58,7 @@ modules.builtin + /vmlinuz + /System.map + /Module.markers ++/modules.builtin.modinfo + + # + # RPM spec file (make rpm-pkg) +diff --git a/Documentation/dontdiff b/Documentation/dontdiff +index ef25a066d9525a..512fa0239ebf6b 100644 +--- a/Documentation/dontdiff ++++ b/Documentation/dontdiff +@@ -178,6 +178,7 @@ mktables + mktree + modpost + modules.builtin ++modules.builtin.modinfo + modules.order + modversions.h* + nconf +diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt +index 8a3830b39c7d48..9c230ea719634e 100644 +--- a/Documentation/kbuild/kbuild.txt ++++ b/Documentation/kbuild/kbuild.txt +@@ -11,6 +11,11 @@ modules.builtin + This file lists all modules that are built into the kernel. This is used + by modprobe to not fail when trying to load something builtin. + ++modules.builtin.modinfo ++-------------------------------------------------- ++This file contains modinfo from all modules that are built into the kernel. ++Unlike modinfo of a separate module, all fields are prefixed with module name. ++ + + Environment variables + +diff --git a/Makefile b/Makefile +index 85dd977f42324f..9a8b3f94633d7c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1308,6 +1308,7 @@ _modinst_: + fi + @cp -f $(objtree)/modules.order $(MODLIB)/ + @cp -f $(objtree)/modules.builtin $(MODLIB)/ ++ @cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/ + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst + + # This depmod is only for convenience to give the initial +@@ -1348,6 +1349,7 @@ endif # CONFIG_MODULES + + # Directories & files removed with 'make clean' + CLEAN_DIRS += $(MODVERDIR) ++CLEAN_FILES += modules.builtin.modinfo + + # Directories & files removed with 'make mrproper' + MRPROPER_DIRS += include/config usr/include include/generated \ +diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h +index f8f6f04c445379..bbb9e332f2fe6c 100644 +--- a/include/asm-generic/vmlinux.lds.h ++++ b/include/asm-generic/vmlinux.lds.h +@@ -844,6 +844,7 @@ + EXIT_CALL \ + *(.discard) \ + *(.discard.*) \ ++ *(.modinfo) \ + } + + /** +diff --git a/include/linux/module.h b/include/linux/module.h +index 5bf5dcd91009ee..5f7007430d3563 100644 +--- a/include/linux/module.h ++++ b/include/linux/module.h +@@ -253,6 +253,7 @@ extern typeof(name) __mod_##type##__##name##_device_table \ + #define MODULE_VERSION(_version) MODULE_INFO(version, _version) + #else + #define MODULE_VERSION(_version) \ ++ MODULE_INFO(version, _version); \ + static struct module_version_attribute ___modver_attr = { \ + .mattr = { \ + .attr = { \ +diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h +index ba36506db4fb71..5ba250d9172ac9 100644 +--- a/include/linux/moduleparam.h ++++ b/include/linux/moduleparam.h +@@ -10,23 +10,21 @@ + module name. */ + #ifdef MODULE + #define MODULE_PARAM_PREFIX /* empty */ ++#define __MODULE_INFO_PREFIX /* empty */ + #else + #define MODULE_PARAM_PREFIX KBUILD_MODNAME "." ++/* We cannot use MODULE_PARAM_PREFIX because some modules override it. */ ++#define __MODULE_INFO_PREFIX KBUILD_MODNAME "." + #endif + + /* Chosen so that structs with an unsigned long line up. */ + #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long)) + +-#ifdef MODULE + #define __MODULE_INFO(tag, name, info) \ + static const char __UNIQUE_ID(name)[] \ + __used __attribute__((section(".modinfo"), unused, aligned(1))) \ +- = __stringify(tag) "=" info +-#else /* !MODULE */ +-/* This struct is here for syntactic coherency, it is not used */ +-#define __MODULE_INFO(tag, name, info) \ +- struct __UNIQUE_ID(name) {} +-#endif ++ = __MODULE_INFO_PREFIX __stringify(tag) "=" info ++ + #define __MODULE_PARM_TYPE(name, _type) \ + __MODULE_INFO(parmtype, name##type, #name ":" _type) + +diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh +index dc0e8c5a140239..e4383e0f476eb8 100755 +--- a/scripts/link-vmlinux.sh ++++ b/scripts/link-vmlinux.sh +@@ -193,6 +193,9 @@ modpost_link vmlinux.o + # modpost vmlinux.o to check for section mismatches + ${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o + ++info MODINFO modules.builtin.modinfo ++${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo ++ + kallsymso="" + kallsyms_vmlinux="" + if [ -n "${CONFIG_KALLSYMS}" ]; then diff --git a/60-linux.hook b/60-linux.hook deleted file mode 100644 index b33873c854fb..000000000000 --- a/60-linux.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/modules/%KERNVER%/* -Target = usr/lib/modules/%EXTRAMODULES%/* - -[Action] -Description = Updating %PKGBASE% module dependencies... -When = PostTransaction -Exec = /usr/bin/depmod %KERNVER% diff --git a/90-linux.hook b/90-linux.hook deleted file mode 100644 index be0d886539f4..000000000000 --- a/90-linux.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Target = boot/vmlinuz-%PKGBASE% -Target = usr/lib/initcpio/* - -[Action] -Description = Updating %PKGBASE% initcpios... -When = PostTransaction -Exec = /usr/bin/mkinitcpio -p %PKGBASE% @@ -3,7 +3,7 @@ set -u pkgbase="linux-lts414" -pkgver="4.14.181" +pkgver="4.14.336" _srcname="linux-${pkgver%.*}" pkgrel='1' arch=('x86_64') @@ -16,39 +16,38 @@ source=( "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" 'config' # the main kernel config file - '60-linux.hook' # pacman hook for depmod - '90-linux.hook' # pacman hook for initramfs regeneration - 'linux-lts.preset' # standard config files for mkinitcpio ramdisk # disable USER_NS for non-root users by default '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' # https://bugs.archlinux.org/task/56711 '0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch' # https://github.com/NixOS/nixpkgs/pull/61076 '0004-export_kernel_fpu_functions.patch' + # add modules.builtin.modinfo + '0005-898490c010b.patch' # https://pkgbuild.com/~bgyorgy/files/898490c010b.patch ) +if ! :; then + source+=("${source[0]/.xz/.sign}") + source+=("${source[1]/.xz/.sign}") # patch>=4.14.59 are not signed +fi validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds@linux-foundation.org> '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg@kroah.com> ) # https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc md5sums=('bacdb9ffdcd922aa069a5e1520160e24' - '5bab09f3b69cb50565e2e8589054f2d2' - 'e0400bf4a229af8a187f00a926cb3e96' - 'ce6c81ad1ad1f8b333fd6077d47abdaf' - 'a85bfae59eb537b973c388ffadb281ff' - 'a329f9581060d555dc7358483de9760a' + 'c7ce7c564746338afcd1e4c8d8e52e89' + 'b482d22d72ba46de5db13584c889ab42' '53523555d234de3b2fde749096ba9948' '95204750f94a5f6d2d19e021736265d5' - 'f7d76cdef5cf4ac6a49115fc4f1f35d5') + 'f7d76cdef5cf4ac6a49115fc4f1f35d5' + 'b7e3c03892c1c45aa19e11aff82b388c') sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7' - 'f892715b50dc4da0448877f61177ce6748d3616658c71704db9450f2eb0e54c3' - '837f66e63c96701962a483f23de6b2b4bcc33dac2a697ffbdcf155c0adb864fb' - 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' - '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' - 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' + 'c577893e1bbb8f5c36b7207f6d7f3165cd64c069d977d1b720c10e5917a821e7' + '1d1992babef5f1c35911dd6b3818b3684628fc21b97bc9975791892bccb50b20' '36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98' 'b6c56ff2dffebe164941ac3428351e158c9c059e884057ecfc215eeea12e76eb' - 'caba7945805b1ade42e42d2f981ccdd8791c76f39166212f7970a78057582474') + 'caba7945805b1ade42e42d2f981ccdd8791c76f39166212f7970a78057582474' + '8efff55ae9dd776ff4ac109e736e8040858f441ae1900435bdeb9f366a53d68f') _kernelname=${pkgbase#linux} @@ -66,6 +65,7 @@ prepare() { cd "${_srcname}" # add upstream patch + test -s "${srcdir}/patch-${pkgver}" || (cd "${srcdir}"; xz -dkf "${srcdir}/patch-${pkgver}.xz") # temporary fix for file-5.40 https://bugs.archlinux.org/task/70261 patch -Nup1 -i "${srcdir}/patch-${pkgver}" set +u; msg2 "Complete: patch-${pkgver}"; set -u chmod +x tools/objtool/sync-check.sh # GNU patch doesn't support git-style file mode @@ -164,11 +164,10 @@ _package() { set -u pkgdesc="The ${pkgbase/linux/Linux} kernel and modules" #[ "${pkgbase}" = "linux" ] && groups=('base') - depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') + depends=('coreutils' 'linux-firmware' 'kmod' 'initramfs') optdepends=('crda: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") - install=linux-lts.install - provides=("linux=${pkgver}") + optdepends+=('linux-firmware-uncompressed: hardware support') + #provides=("linux=${pkgver}") # not permitted by order of Arch TU cd "${_srcname}" @@ -179,11 +178,13 @@ _package() { mkdir -p "${pkgdir}"/{boot,usr/lib/modules} make -j1 "${_makeopts[@]}" LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install - cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # systemd expects to find the kernel here to allow hibernation # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344 - ln -sr "${pkgdir}/boot/vmlinuz-${pkgbase}" "${pkgdir}/usr/lib/modules/${_kernver}/vmlinuz" + cp arch/x86/boot/bzImage "${pkgdir}/usr/lib/modules/${_kernver}/vmlinuz" + + # Used by mkinitcpio to name the kernel + echo "$pkgbase" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules/${_kernver}/pkgbase" # make room for external modules local _extramodules="extramodules-${_basekernel}${_kernelname:--lts}" @@ -208,27 +209,13 @@ _package() { s|%KERNVER%|${_kernver}|g s|%EXTRAMODULES%|${_extramodules}|g " - - # hack to allow specifying an initially nonexisting install file - sed "${_subst}" "${startdir}/${install}" > "${startdir}/${install}.pkg" - true && install=${install}.pkg - - # install mkinitcpio preset file - sed "${_subst}" ../linux-lts.preset | - install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - - # install pacman hooks - sed "${_subst}" ../60-linux.hook | - install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook" - sed "${_subst}" ../90-linux.hook | - install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" set +u } _package-headers() { set -u pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel" - provides=("linux-headers=${pkgver}") + #provides=("linux-headers=${pkgver}") # not permitted by order of Arch TU cd ${_srcname} local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build" @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.154-1 Kernel Configuration +# Linux/x86 4.14.329-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -232,6 +232,7 @@ CONFIG_BPF_JIT_ALWAYS_ON=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y +# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set CONFIG_USERFAULTFD=y CONFIG_PCI_QUIRKS=y CONFIG_MEMBARRIER=y @@ -287,6 +288,7 @@ CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y CONFIG_HAVE_CLK=y @@ -352,6 +354,7 @@ CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_REFCOUNT=y # CONFIG_REFCOUNT_FULL is not set +CONFIG_ARCH_USE_MEMREMAP_PROT=y # # GCOV-based kernel profiling @@ -557,7 +560,6 @@ CONFIG_X86_DIRECT_GBPAGES=y CONFIG_ARCH_HAS_MEM_ENCRYPT=y CONFIG_AMD_MEM_ENCRYPT=y # CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set -CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y @@ -693,6 +695,7 @@ CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y +# CONFIG_GDS_FORCE_MITIGATION is not set # # Power management and ACPI options @@ -946,6 +949,7 @@ CONFIG_NET_EGRESS=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m CONFIG_UNIX=y +CONFIG_UNIX_SCM=y CONFIG_UNIX_DIAG=m CONFIG_TLS=m CONFIG_XFRM=y @@ -986,6 +990,7 @@ CONFIG_INET_AH=m CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_IPCOMP=m +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m @@ -1450,7 +1455,6 @@ CONFIG_NET_DSA_TAG_QCA=y CONFIG_VLAN_8021Q=m # CONFIG_VLAN_8021Q_GVRP is not set CONFIG_VLAN_8021Q_MVRP=y -# CONFIG_DECNET is not set CONFIG_LLC=m CONFIG_LLC2=m # CONFIG_IPX is not set @@ -1522,14 +1526,11 @@ CONFIG_DEFAULT_NET_SCH="fq" # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m # CONFIG_CLS_U32_PERF is not set # CONFIG_CLS_U32_MARK is not set -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_BPF=m @@ -2015,6 +2016,7 @@ CONFIG_PNPACPI=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m @@ -2029,7 +2031,6 @@ CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SKD=m -CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=16384 @@ -2735,7 +2736,7 @@ CONFIG_MLXFW=m CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m # CONFIG_KS8851 is not set -CONFIG_KS8851_MLL=m +# CONFIG_KS8851_MLL is not set CONFIG_KSZ884X_PCI=m CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set @@ -3362,7 +3363,6 @@ CONFIG_MISDN_NETJET=m CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m CONFIG_ISDN_HDLC=m -# CONFIG_NVM is not set # # Input device support @@ -3798,6 +3798,8 @@ CONFIG_TCG_CRB=m CONFIG_TELCLOCK=m CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set +CONFIG_RANDOM_TRUST_CPU=y +CONFIG_RANDOM_TRUST_BOOTLOADER=y # # I2C support @@ -3924,6 +3926,7 @@ CONFIG_SPI_PXA2XX_PCI=m # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_SPI_SLAVE is not set +CONFIG_SPI_DYNAMIC=y CONFIG_SPMI=m # CONFIG_HSI is not set CONFIG_PPS=m @@ -5390,9 +5393,6 @@ CONFIG_HDMI=y # Console display driver support # CONFIG_VGA_CONSOLE=y -CONFIG_VGACON_SOFT_SCROLLBACK=y -CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 -# CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set CONFIG_DUMMY_CONSOLE=y CONFIG_DUMMY_CONSOLE_COLUMNS=80 CONFIG_DUMMY_CONSOLE_ROWS=25 @@ -6122,7 +6122,6 @@ CONFIG_USB_IDMOUSE=m CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m CONFIG_USB_SISUSBVGA=m -# CONFIG_USB_SISUSBVGA_CON is not set CONFIG_USB_LD=m CONFIG_USB_TRANCEVIBRATOR=m CONFIG_USB_IOWARRIOR=m diff --git a/linux-lts.preset b/linux-lts.preset deleted file mode 100644 index 66709a8c1537..000000000000 --- a/linux-lts.preset +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the '%PKGBASE%' package - -ALL_config="/etc/mkinitcpio.conf" -ALL_kver="/boot/vmlinuz-%PKGBASE%" - -PRESETS=('default' 'fallback') - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-%PKGBASE%.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-%PKGBASE%-fallback.img" -fallback_options="-S autodetect" |