folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[dev] kernel: export bpftool subpackage (#1375)

This commit is contained in:
Muhammad Falak R Wani 2021-09-13 21:58:11 +05:30 committed by GitHub
parent d478bc507d
commit e7ffde92cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SPECS-SIGNED/kernel-signed/kernel-signed.spec
View File

@ -10,7 +10,7 @@
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.10.52.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -146,6 +146,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%endif
%changelog
* Thu Sep 09 2021 Muhammad Falak <mwani@microsoft.com> - 5.10.52.1-2
- Bump release number to match kernel release
* Tue Jul 20 2021 Rachel Menge <rachelmenge@microsoft.com> - 5.10.52.1-1
- Update source to 5.10.52.1

5
SPECS/kernel-headers/kernel-headers.spec
View File

@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.10.52.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -37,6 +37,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*
%changelog
* Thu Sep 09 2021 Muhammad Falak <mwani@microsoft.com> - 5.10.52.1-2
- Bump release number to match kernel release
* Tue Jul 20 2021 Rachel Menge <rachelmenge@microsoft.com> - 5.10.52.1-1
- Update source to 5.10.52.1

5
SPECS/kernel-hyperv/kernel-hyperv.spec
View File

@ -4,7 +4,7 @@
Summary: Linux Kernel optimized for Hyper-V
Name: kernel-hyperv
Version: 5.10.52.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -267,6 +267,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_libdir}/perf/include/bpf/*
%changelog
* Thu Sep 09 2021 Muhammad Falak <mwani@microsoft.com> - 5.10.52.1-2
- Bump release number to match kernel release
* Tue Jul 20 2021 Rachel Menge <rachelmenge@microsoft.com> - 5.10.52.1-1
- Update source to 5.10.52.1

24
SPECS/kernel/kernel.spec
View File

@ -4,7 +4,7 @@
Summary: Linux Kernel
Name: kernel
Version: 5.10.52.1
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -277,6 +277,14 @@ Group: System Environment/Kernel
%description dtb
This package contains common device tree blobs (dtb)
%package -n bpftool
Summary: Inspection and simple manipulation of eBPF programs and maps
License: GPLv2
%description -n bpftool
This package contains the bpftool, which allows inspection and simple
manipulation of eBPF programs and maps.
%prep
%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
@ -320,6 +328,9 @@ cp %{SOURCE4} certs/mariner.pem
make VERBOSE=1 KBUILD_BUILD_VERSION="1" KBUILD_BUILD_HOST="CBL-Mariner" ARCH=${arch} %{?_smp_mflags}
make -C tools perf
#Compile bpftool
make -C tools/bpf/bpftool
%define __modules_install_post \
for MODULE in `find %{buildroot}/lib/modules/%{uname_r} -name *.ko` ; do \
./scripts/sign-file sha512 certs/signing_key.pem certs/signing_key.x509 $MODULE \
@ -407,6 +418,9 @@ cp scripts/module.lds %{buildroot}%{_prefix}/src/linux-headers-%{uname_r}/script
# Linux version that was affected is 4.4.26
make -C tools JOBS=1 DESTDIR=%{buildroot} prefix=%{_prefix} perf_install
# Install bpftool
make -C tools/bpf/bpftool DESTDIR=%{buildroot} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install
%triggerin -- initramfs
mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/pending
touch %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r}
@ -508,7 +522,15 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
/boot/dtb/fsl-imx8mq-evk.dtb
%endif
%files -n bpftool
%{_sbindir}/bpftool
%{_sysconfdir}/bash_completion.d/bpftool
%changelog
* Thu Sep 09 2021 Muhammad Falak <mwani@microsoft.com> - 5.10.52.1-2
- Export `bpftool` subpackage
* Tue Jul 20 2021 Rachel Menge <rachelmenge@microsoft.com> - 5.10.52.1-1
- Update source to 5.10.52.1
- Address CVE-2021-35039, CVE-2021-33909

2
toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.aarch64.rpm
kernel-headers-5.10.52.1-1.cm2.noarch.rpm
kernel-headers-5.10.52.1-2.cm2.noarch.rpm
glibc-2.28-18.cm2.aarch64.rpm
glibc-devel-2.28-18.cm2.aarch64.rpm
glibc-i18n-2.28-18.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View File

@ -1,5 +1,5 @@
filesystem-1.1-8.cm2.x86_64.rpm
kernel-headers-5.10.52.1-1.cm2.noarch.rpm
kernel-headers-5.10.52.1-2.cm2.noarch.rpm
glibc-2.28-18.cm2.x86_64.rpm
glibc-devel-2.28-18.cm2.x86_64.rpm
glibc-i18n-2.28-18.cm2.x86_64.rpm

2
toolkit/resources/manifests/package/toolchain_aarch64.txt
View File

@ -163,7 +163,7 @@ json-c-debuginfo-0.14-3.cm2.aarch64.rpm
json-c-devel-0.14-3.cm2.aarch64.rpm
kbd-2.0.4-5.cm2.aarch64.rpm
kbd-debuginfo-2.0.4-5.cm2.aarch64.rpm
kernel-headers-5.10.52.1-1.cm2.noarch.rpm
kernel-headers-5.10.52.1-2.cm2.noarch.rpm
kmod-25-6.cm2.aarch64.rpm
kmod-debuginfo-25-6.cm2.aarch64.rpm
kmod-devel-25-6.cm2.aarch64.rpm

2
toolkit/resources/manifests/package/toolchain_x86_64.txt
View File

@ -163,7 +163,7 @@ json-c-debuginfo-0.14-3.cm2.x86_64.rpm
json-c-devel-0.14-3.cm2.x86_64.rpm
kbd-2.0.4-5.cm2.x86_64.rpm
kbd-debuginfo-2.0.4-5.cm2.x86_64.rpm
kernel-headers-5.10.52.1-1.cm2.noarch.rpm
kernel-headers-5.10.52.1-2.cm2.noarch.rpm
kmod-25-6.cm2.x86_64.rpm
kmod-debuginfo-25-6.cm2.x86_64.rpm
kmod-devel-25-6.cm2.x86_64.rpm