Commit Graph

61 Commits

Author SHA1 Message Date
Jianping Liu 5634366348 dist: release 6.6.34-8
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-06-17 16:39:01 +08:00
Jianping Liu 8e0d7786d7 dist: release 6.6.33-7
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-06-13 10:31:43 +08:00
Jianping Liu 38f4fdb968 dist: using "tk_private=1" to judge private release
Users may use kernel parameters which described in
Documentation/admin-guide/kernel-parameters.txt, to decouple from the
existing kernel parameters, add and use "tk_private=1" to judge private
release.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-05-27 10:56:55 +08:00
Jianping Liu a11e94beb2 dist: remove usb-storage.ko and nouveau.ko when install private release
For security reason, we don't need usb-storage.ko in private release.
Modprobe usb-storage.ko will cause /dev/sdx shift when BMC supply a usb
storage device, which will cause boot fail if some customer haven't using
UUID in /etc/fstab.

Inner customer will use commercial nvidia driver, which don't need kernel's
origin nouveau.ko.

For security reason, we don't need cfg80211.ko in private release; server
don't use wireless.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-05-26 18:05:48 +08:00
Jianping Liu 3179f252be dist: revert "add a modules-private rpm subpackage"
Private rpms are compiled as mod-xxx.rpm, and we do not need
kernel-modules-private*.rpm now.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-05-26 14:39:18 +08:00
mengensun d0e6e037be Kconfig: add more modules
we do some research on default kconfig of the same same industry
add some modules to curernt kernel.

Reviewed-by: frankjpliu <frankjpliu@tencent.com>
Reviewed-by: aurelianliu <aurelianliu@tencent.com>
Signed-off-by: mengensun <megnensun@tencent.com>
2024-05-26 06:30:49 +00:00
Kairui Song b06f941caa dist: don't parse kernel version unless needed
RPM version parsing need to search for git tag, which is slow if the
repo is skewed. Skip that if not needed.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-05-24 17:42:04 +08:00
Kairui Song db277b0d22 dist: optimize version parsing
Upstream: no

A minor optimization.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-05-24 17:35:24 +08:00
Kairui Song 7c237644c8 dist: stop using --show-toplevel for speed up
Dist folder struct is very stable now, no need to use git for retrieving
top dir path.

This alse clean up git usage so dist will be able to build out of repo
in the future.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-05-24 16:43:15 +08:00
Jianping Liu 54f6658540 dist: delete 5.17.0-0.20220314git47581bb4d9ae.rc7-tks in changelog
We are using linux 6.6; do not write
5.17.0-0.20220314git47581bb4d9ae.rc7-tks in changelog.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-05-22 16:44:11 +08:00
Jianping Liu 256aa06fb3 dist: release 6.6.31-6
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-05-21 17:13:48 +08:00
Jianping Liu 3c31f56c99 dist: release 6.6.30-5
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-05-17 15:59:27 +08:00
Kairui Song b5f9a9b6b5 dist: create a dummy key if keypkg disabled
Upstream: no

Some script may check [ -f PRIV_KEY ], a dangling symbol will fail that.

A hooked sign-file might be used so a dummy file can help it to work.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-05-15 12:12:38 +00:00
Jianping Liu 70618277b9 dist: release 6.6.30-4
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-05-13 18:59:25 +08:00
Jianping Liu 8c278a4725 dist: release 6.6.30-3
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-05-11 21:31:34 +08:00
Jianping Liu f97aaab320 dist: fix filter-modules error when make dist-rpm
When run "make dist-rpm", there are errors as below:
filter-modules.sh: Failed to filter out external modules, broken depmod:
depmod: WARNING: /drivers/misc/cardreader/rtsx_pci.ko needs unknown symbol mfd_add_devices
depmod: WARNING: /drivers/misc/cardreader/rtsx_pci.ko needs unknown symbol mfd_remove_devices
depmod: WARNING: /drivers/misc/cardreader/rtsx_usb.ko needs unknown symbol mfd_add_devices
depmod: WARNING: /drivers/misc/cardreader/rtsx_usb.ko needs unknown symbol mfd_remove_devices
depmod: WARNING: /drivers/vfio/pci/mlx5/mlx5-vfio-pci.ko needs unknown symbol mlx5_db_free
depmod: WARNING: /drivers/vfio/pci/mlx5/mlx5-vfio-pci.ko needs unknown symbol mlx5_core_destroy_mkey
depmod: WARNING: /drivers/vfio/pci/mlx5/mlx5-vfio-pci.ko needs unknown symbol mlx5_vf_get_core_dev
depmod: WARNING: /drivers/vfio/pci/mlx5/mlx5-vfio-pci.ko needs unknown symbol mlx5_core_alloc_pd
......

Add mfd-core and mlx5_core to "overrides", which will let them back into
kernel-core*.rpm, and sovle "broken depmod" as above.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-05-11 20:46:30 +08:00
Jianping Liu 66aa0861d1 dist: release 6.6.30-2
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-05-11 20:27:02 +08:00
Jianping Liu f67246a0d7 dist: not split out modules-public and modules-public-removable-media rpm
OC release need keep consistent with the community's conventions.
Spliting out modules-public and modules-public-removable-media rpm is
inconsistent with the community's conventions.

Revert:
commit 4faa03afdc ("dist: add a modules-public rpm subpackage")
commit 83c70cfab6 ("dist: rename modules-removable-media to
modules-public-removable-media")

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-05-09 16:26:44 +08:00
Jianping Liu 5071b58e39 config: enable CONFIG_DEBUG_INFO_BTF in eks config
eks container image build needing CONFIG_DEBUG_INFO_BTF, add it.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-04-18 19:45:33 +08:00
Kairui Song 1ffa857af8 dist: ensure release start with decimal number
Upstream: no

RPM NVR expects a decimal starting release. Previously dist build try to
respect git tag as much as possible, but for this case we need to be
careful about breaking RPM specs.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-04-18 02:25:53 +00:00
Kairui Song afd9d2d0b6 dist: sanitize usage of unamer
Upstream: no

Clean up how unamer is being formatted, ensure it's set in
lib-version.sh and else where can simply use it.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-04-18 02:25:53 +00:00
Kairui Song e9ee1b9837 dist: add missing place holder for loongarch64 kabi
Upstream: no

Ensure local build can pass.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-04-18 02:25:53 +00:00
Jianping Liu 1a77a55752 dist: release 6.6.26-1
Upstream: no

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-04-17 11:35:28 +08:00
Jianping Liu d2d3d7be5f dist: using --topo-order when run git log
git log --topo-order will keep the real merge order, and make the changelog
more readable.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-04-17 09:56:19 +08:00
Jianping Liu b7c1d03b83 dist: revert "do not include tl and arch info in uname -r"
lorax image need arch info in /boot/vmlinuz-* file name, so, revert
the commit "do not include tl and arch info in uname -r".

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-04-16 15:50:38 +08:00
Jianping Liu 1020a22959 dist: avoid "make dist-rpm" warnning
When run "make dist-rpm", there are warnnings as below:
Generating kernel RPM spec: /data/tencentos/tkernel5/dist/rpm/SOURCES/kernel.spec
warning: Macro expanded in comment on line 377: %{rpm_name}-debuginfo-common

To avoid warnning, do not using MICRO in annotations.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-04-13 13:10:46 +08:00
Jianping Liu 5f0491ad7c Loongarch: support loongarch and add kvm support for loongarch
Merge pull request !128 from lixianglai/next
2024-04-12 20:51:12 +08:00
Ming Wang 5ae49db3f0 dist: loongarch: add make dist support for loongarch
Upstream: no

Adds LoongArch64 processor architecture support in the Makefile.
Also add a soft link to the loongson3_defconfig config file.

Signed-off-by: Ming Wang <wangming01@loongson.cn>
2024-04-12 20:49:37 +08:00
linuszeng 4658d1f284 configs: enable config of X86_PAT for nvidia driver
The following errors are showing up when compiling nvidia driver:

/home/builder/rpmbuild/BUILD/gpu_src/kernel/nvidia/nv-pat.c: In function 'nv_disable_caches':
/home/builder/rpmbuild/BUILD/gpu_src/kernel/nvidia/nv-pat.c:66:5: error: implicit declaration of function '__flush_tlb'; did you
 mean '__flush_tlb_all'? [-Werror=implicit-function-declaration]
   66 |     __flush_tlb();
      |     ^~~~~~~~~~~
      |     __flush_tlb_all
cc1: some warnings being treated as errors

Solve these issues by:
enable CONFIG_X86_PAT

Signed-off-by: Zeng Jingxiang <linuszeng@tencent.com>
2024-04-12 11:01:07 +00:00
Jianping Liu a70ca9fd71 dist: skip btf dump file if no /sys/kernel/btf/vmlinux
If using CONFIG="eks-release", will no CONFIG_DEBUG_INFO_BTF.
If no CONFIG_DEBUG_INFO_BTF and no /sys/kernel/btf/vmlinux in build env,
make dist-rpm will fail, fixt it.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-04-10 16:32:01 +08:00
Jianping Liu 2159f357c8 dist: only disable ofed if not generic-release
EKS need perf rpm, so only disable ofed if not generic-release.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-04-08 14:04:47 +08:00
Jianping Liu 680e6d50a3 dist: add a modules-private rpm subpackage
TK have some kernel modules (such rue.ko) only used in private release version,
split them into modules-private subpackage.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-04-08 13:18:38 +08:00
Jianping Liu 8db2e845c2 dist: do not include tl and arch info in uname -r
Eg: change the output of "uname -r" from "6.6.20-0001.rc3.tl4.x86_64"
to "6.6.20-0001.rc3".

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-04-08 12:46:13 +08:00
Kairui Song 11710e59be dist: tencent: allow independeny distribution of debuginfo
Upstream: no

For some reason, we don't distribute debuginfo-common easily (and I have
no say in it) since it contains source code. So let's break the dependency
chain. This will cause trouble for crash debugging but that's what we
want.

Signed-off-by: Kairui Song <kasong@tencent.com>
Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-04-07 16:49:55 +08:00
linuszeng 5a0da8cdef configs: enable config of TEXT_UNEVICTABLE for memcg granularity
This enables CONFIG_TEXT_UNEVICTABLE on x86 and arm64

Backport-reason: Add code segment unevictable feature support [PATCH 8/8]

Signed-off-by: Xin Hao <vernhao@tencent.com>
2024-04-03 17:59:25 +08:00
Kairui Song 690dae3cfe dist: disable non kernel pkg on non default config
Upstream: no

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-04-03 16:58:46 +08:00
Kairui Song 432d074030 dist: add eks base config
Copied from 0017 with EMM enabled and tidyup with defconfig.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-04-03 15:36:21 +08:00
linuszeng 390cfbd393 dist: kernel.template.spec: add lz4 build request
Upstream: no

Signed-off-by: Zeng Jingxiang <linuszeng@tencent.com>
2024-04-03 15:36:20 +08:00
Yongliang Gao 0c01b9d8fb kabi: provide kabi check/update/create commands for local users
Upstream: no

Provides kabi check/update/create commands for local users:
1. Check whether TencentOS Kennel KABI is compatible
2. Update TencentOS Kennel KABI file
3. Create TencentOS Kennel KABI file

Signed-off-by: Yongliang Gao <leonylgao@tencent.com>
Reviewed-by: Jianping Liu <frankjpliu@tencent.com>
2024-03-26 14:10:56 +08:00
costinchen ea51a4e717 spec: add support for secureboot by signing the vmlinuz.
spec: add dependency on libtool to build on koji.

Signed-off-by: Sinong Chen <costinchen@tencent.com>
Reviewed-by: Jianping Liu <frankjpliu@tencent.com>
2024-03-15 21:56:46 +08:00
Jianping Liu 4faa03afdc dist: add a modules-public rpm subpackage
TK have some kernel modules (such nvidia.ko) only uesd in public release verison,
split them into modules-public subpackage.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-03-15 12:12:14 +08:00
Jianping Liu 83c70cfab6 dist: rename modules-removable-media to modules-public-removable-media
Modules in kernle*modules-removable-media*.rpm are the drivers for removable
media. Using them will rise attack risck, and they are not used in private
release, only used in public release. So, rename it.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Yongliang Gao <leonylgao@tencent.com>
2024-03-15 12:06:30 +08:00
Jianping Liu 2596824741 dist: tks: add a removable media modules pkg
Tk4 have this sub package, try to be compatible, and use
filter-modules.sh instead which does a depmod check after splitting, to
avoid depmod failure after some modules are split into subpackage.

Signed-off-by: Kairui Song <kasong@tencent.com>
Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-03-15 11:55:08 +08:00
Jianping Liu abfc2d853b dist: clear the content about Module.kabi_* file
master branch need keep kabi compatible, so, clear the content about
Module.kabi_* file.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
2024-03-04 14:20:22 +08:00
Jianping Liu 36e05b10d8 Makefile, dist: add "make tencentconfig" support
Tkci depending on "make tencentconfig", add it. And this is compatible
with TK4.

Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
Reviewed-by: Jason Xing <kernelxing@tencent.com>
Reviewed-by: aurelianliu <aurelianliu@tencent.com>
2024-03-04 13:25:26 +08:00
Kairui Song f1384ba706 dist: fix build failure after tarname change
Upstream: no
Signed-off-by: Kairui Song <kasong@tencent.com>
2024-03-02 03:21:59 +08:00
Kairui Song d22cdce1d6 dist: -core should also provides kernel
Upstream: no

Some scripts depend on this.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-03-01 18:45:32 +08:00
Kairui Song 0fe106267c dist: use a fixed tar base name for spec
Upstream: no

Dynamic tar name is causing trouble if distro want to bump suffix
version and rebuild, so fix tarname here.

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-03-01 17:34:05 +08:00
Kairui Song 9952a6aca6 config: update configs for better compatibility
Upstream: no

Signed-off-by: Kairui Song <kasong@tencent.com>
2024-03-01 17:07:24 +08:00
Aichun Shi 51051c65b9 x86: configs: Add Intel In Field Scan(IFS) kernel config
Upstream: no

Intel-SIG: no upstream x86: configs: Add Intel In Field Scan(IFS) kernel config
Backport to support IFS SAF & Array BIST on GNR & SRF

Signed-off-by: Aichun Shi <aichun.shi@intel.com>
2024-01-25 09:40:47 +08:00