diff --git a/30.tar.gz b/30.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4e34bc69960eae731facc066c41a91ee4d4606f6 Binary files /dev/null and b/30.tar.gz differ diff --git a/Fix-a-typo-in-brp-digest-list.patch b/Fix-a-typo-in-brp-digest-list.patch new file mode 100644 index 0000000000000000000000000000000000000000..305237dddba06174b289eb9eb494b53d718247c2 --- /dev/null +++ b/Fix-a-typo-in-brp-digest-list.patch @@ -0,0 +1,26 @@ +From a82057c590f958d10898c2e5f7211241be3dfd7a Mon Sep 17 00:00:00 2001 +From: Roberto Sassu +Date: Fri, 26 Feb 2021 09:00:06 +0100 +Subject: [PATCH] Fix a typo in brp-digest-list + +Rename RPM_PACKAGE_NAM to RPM_PACKAGE_NAME. +--- + brp-digest-list | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/brp-digest-list b/brp-digest-list +index 435b962..c3b2156 100644 +--- a/brp-digest-list ++++ b/brp-digest-list +@@ -86,7 +86,7 @@ if [[ "$(basename $BIN_PKG_FILES)" =~ "digest-list-tools" && \ + + export BRP_PESIGN_FILES="$2/etc/ima/digest_lists/*" + export RPM_BUILD_ROOT +- export RPM_PACKAGE_NAM="digest-list-tools" ++ export RPM_PACKAGE_NAME="digest-list-tools" + export RPM_SOURCE_DIR="$(rpm --eval %_topdir)/SOURCES" + + if [ -f "/usr/lib/rpm/brp-suse.d/brp-99-pesign" ]; then +-- +2.26.2 + diff --git a/backport-kmp-feature.patch b/backport-kmp-feature.patch new file mode 100644 index 0000000000000000000000000000000000000000..c295cf7f9c732c556d807df734141cf0d074c6df --- /dev/null +++ b/backport-kmp-feature.patch @@ -0,0 +1,492 @@ +From fc3fcb70da79726d0b6a1f92aff8982275753e2b Mon Sep 17 00:00:00 2001 +From: yangyanchao +Date: Fri, 26 Mar 2021 15:01:30 +0800 +Subject: [PATCH] backport kmp feature + +Signed-off-by: yangyanchao +--- + kmodtool | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + kmodtool.py | 83 ----------------- + macros.kmp | 83 ++++++++++++----- + 3 files changed, 354 insertions(+), 104 deletions(-) + create mode 100644 kmodtool + delete mode 100644 kmodtool.py + +diff --git a/kmodtool b/kmodtool +new file mode 100644 +index 0000000..c3217e6 +--- /dev/null ++++ b/kmodtool +@@ -0,0 +1,292 @@ ++#!/usr/bin/bash ++ ++# kmodtool - Helper script for building kernel module RPMs ++# Copyright (c) 2003-2006 Ville Skyttä , ++# Thorsten Leemhuis ++# Jon Masters ++# ++# Permission is hereby granted, free of charge, to any person obtaining ++# a copy of this software and associated documentation files (the ++# "Software"), to deal in the Software without restriction, including ++# without limitation the rights to use, copy, modify, merge, publish, ++# distribute, sublicense, and/or sell copies of the Software, and to ++# permit persons to whom the Software is furnished to do so, subject to ++# the following conditions: ++# ++# The above copyright notice and this permission notice shall be ++# included in all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++shopt -s extglob ++ ++myprog="kmodtool" ++myver="0.10.10_kmp2" ++knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)|xen) ++kmod_name= ++kver= ++verrel= ++variant= ++kmp= ++ ++get_verrel () ++{ ++ verrel=${1:-$(uname -r)} ++ verrel=${verrel%%$knownvariants} ++} ++ ++print_verrel () ++{ ++ get_verrel $@ ++ echo "${verrel}" ++} ++ ++get_variant () ++{ ++ get_verrel $@ ++ variant=${1:-$(uname -r)} ++ variant=${variant##$verrel} ++ variant=${variant:-'""'} ++} ++ ++print_variant () ++{ ++ get_variant $@ ++ echo "${variant}" ++} ++ ++get_filelist() { ++ local IFS=$'\n' ++ filelist=($(cat)) ++ ++ if [ ${#filelist[@]} -gt 0 ]; ++ then ++ for ((n = 0; n < ${#filelist[@]}; n++)); ++ do ++ line="${filelist[n]}" ++ line=$(echo "$line" \ ++ | sed -e "s/%verrel/$verrel/g" \ ++ | sed -e "s/%variant/$variant/g" \ ++ | sed -e "s/%dashvariant/$dashvariant/g" \ ++ | sed -e "s/%dotvariant/$dotvariant/g" \ ++ | sed -e "s/\.%1/$dotvariant/g" \ ++ | sed -e "s/\-%1/$dotvariant/g" \ ++ | sed -e "s/%2/$verrel/g") ++ echo "$line" ++ done ++ else ++ echo "%defattr(644,root,root,755)" ++ echo "/lib/modules/${verrel}${dotvariant}" ++ fi ++} ++ ++get_rpmtemplate () ++{ ++ local variant="${1}" ++ local dashvariant="${variant:+-${variant}}" ++ case "$verrel" in ++ *.el*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; ++ *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; ++ *) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; ++ esac ++ ++ echo "%package -n kmod-${kmod_name}${dashvariant}" ++ ++ if [ -z "$kmp_provides_summary" ]; then ++ echo "Summary: ${kmod_name} kernel module(s)" ++ fi ++ ++ if [ -z "$kmp_provides_group" ]; then ++ echo "Group: System Environment/Kernel" ++ fi ++ ++ if [ ! -z "$kmp_version" ]; then ++ echo "Version: %{kmp_version}" ++ fi ++ ++ if [ ! -z "$kmp_release" ]; then ++ echo "Release: %{kmp_release}" ++ fi ++ ++ if [ ! -z "$kmp" ]; then ++ echo "%global _use_internal_dependency_generator 0" ++ fi ++ ++ cat <= %{?epoch:%{epoch}:}%{version} ++# ++ ++ cat < /dev/null || : ++fi ++EOF ++ ++ if [ ! -z "$kmp" ]; then ++ cat < /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules ++EOF ++ ++ fi ++ ++ cat < /dev/null || : ++EOF ++ ++ if [ ! -z "$kmp" ]; then ++ cat <&2 ++ exit 2 ++ elif [ -z "${kver}" ] ; then ++ echo "Please provide the kver as second parameter." >&2 ++ exit 2 ++ elif [ -z "${verrel}" ] ; then ++ echo "Couldn't find out the verrel." >&2 ++ exit 2 ++ fi ++ ++ for variant in "$@" ; do ++ if [ "default" == "$variant" ]; ++ then ++ get_rpmtemplate "" ++ else ++ get_rpmtemplate "${variant}" ++ fi ++ done ++} ++ ++usage () ++{ ++ cat <