From 211b85e00108955d45e523cf39bc0cb8386a81e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A0=E6=9F=B3=E7=87=95?= Date: Wed, 16 Sep 2020 17:12:22 +0800 Subject: [PATCH 1/2] rename kmodtool.py to kmodtool. --- kmodtool.py => kmodtool | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename kmodtool.py => kmodtool (100%) diff --git a/kmodtool.py b/kmodtool similarity index 100% rename from kmodtool.py rename to kmodtool -- Gitee From cdcfa771097bd6bf2859fa0ccd0abfbcfe2093da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AB=A0=E6=9F=B3=E7=87=95?= Date: Wed, 16 Sep 2020 17:20:48 +0800 Subject: [PATCH 2/2] backport kmp feature --- generic-rpm-config.spec | 19 ++- kmodtool | 367 +++++++++++++++++++++++++++++++--------- macros.kmp | 66 ++++++-- 3 files changed, 356 insertions(+), 96 deletions(-) diff --git a/generic-rpm-config.spec b/generic-rpm-config.spec index 069dc8d..8f83da3 100644 --- a/generic-rpm-config.spec +++ b/generic-rpm-config.spec @@ -2,7 +2,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 12 +Release: 13 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -12,7 +12,7 @@ Source2: rpmrc Source3: macros Source4: config.guess Source5: config.sub -Source6: kmodtool.py +Source6: kmodtool Source10: macros.perl Source11: macros.python @@ -38,7 +38,7 @@ Provides: openblas-srpm-macros Provides: perl-srpm-macros Provides: rust-srpm-macros Provides: go-srpm-macros -Provides: kernel-rpm-macros + Obsoletes: python-rpm-macros Obsoletes: python2-rpm-macros Obsoletes: python3-rpm-macros @@ -55,6 +55,7 @@ Obsoletes: go-srpm-macros Requires: efi-srpm-macros Requires: qt5-srpm-macros +Requires: kernel-rpm-macros Requires: rpm >= 4.11.0 Requires: zip @@ -79,6 +80,7 @@ specific rpm configuration files for %{vendor}. %package -n kernel-rpm-macros Summary: Macros and scripts for building kernel module packages +Provides: kernel-rpm-macros %description -n kernel-rpm-macros Macros and scripts for building kernel module packages. @@ -93,7 +95,7 @@ install -p -m 644 -t %{buildroot}%{rpmvdir} macros rpmrc install -p -m 755 -t %{buildroot}%{rpmvdir} config.* install -p -m 755 -t %{buildroot}%{rpmvdir} brp-* install -p -m 644 -t %{buildroot}%{rpmvdir} openEuler-* -install -p -m 755 -t %{buildroot}%{rpmvdir} kmodtool.py +install -p -m 755 -t %{buildroot}%{rpmvdir} kmodtool mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d/ %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} @@ -110,12 +112,19 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{_fileattrsdir}/ %{_rpmconfigdir}/macros.d/ %{_rpmconfigdir}/macros.d/* +%exclude %{_rpmconfigdir}/macros.d/macros.kmp %files -n kernel-rpm-macros -%{rpmvdir}/kmodtool.py +%{rpmvdir}/kmodtool %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Wed Sep 16 2020 zhangliuyan - 30-13 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:backport kmp feature + * Fri Aug 21 2020 Wang Shuo - 30-12 - fix error message for kmodtool diff --git a/kmodtool b/kmodtool index 75492b9..deea245 100644 --- a/kmodtool +++ b/kmodtool @@ -1,83 +1,292 @@ -# -*- coding: UTF-8 -*- -#!/usr/bin/python3 +#!/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. -import os,subprocess,sys - -def print_verrel (): - #verrel=subprocess.getoutput("(rpm -q --qf '%{VERSION}-%{RELEASE}' `rpm -q kernel-devel` | head -n 1)") - # if (len(verrel)== 0): - verrel=subprocess.getoutput("uname -r") - return verrel - -def print_rpmtemplate(): - kmod_name = sys.argv[2] - # verrel=subprocess.getoutput("(rpm -q --qf '%{VERSION}-%{RELEASE}' `rpm -q kernel-devel` | head -n 1)") - # if (len(verrel)== 0): - verrel=subprocess.getoutput("uname -r") - - if not kmod_name: - print("Please provide the kmodule-name as first parameter.") - exit() - get_rpmtemplate(kmod_name,verrel) - - -def get_rpmtemplate(kmod_name,verrel): - print("%package -n kmod-" + kmod_name) - print("Summary: " + kmod_name + " " + "kernel module(s)") - print("Group: System Environment/Kernel") - if "%{version}": - print("Version: %{version}") - if "%{release}": - print("Release: %{release}") - print("Provides: kernel-modules =" + " " + verrel) - print("Provides: "+ kmod_name + "-kmod = %{?epoch:%{epoch}:}%{version}-%{release}") - print("Requires(post): /usr/sbin/depmod") - print("Requires(postun): /usr/sbin/depmod") - print("%description -n kmod-" + kmod_name) - print("This package provides the " + kmod_name + " kernel modules built for the Linux") - print("kernel "+ verrel + " for the %{_target_cpu} family of processors.") - print("%post -n kmod-" + kmod_name) - print("if [ -e /boot/System.map-" + verrel + " ]; then") - print(" /sbin/depmod -aeF /boot/System.map-" + verrel +" " + verrel +"> /dev/null || :") - print("fi") - if (kmp !=""): - print("modules=( $(find /lib/modules/" + verrel + "/extra/" + kmod_name + ") )") - print("""if [ -x "/sbin/weak-modules" ]; then - printf '%s\\n' "${modules[@]}" | /sbin/weak-modules --add-modules -fi""") - print("%preun -n kmod-" + kmod_name) - print("rpm -ql kmod-" + kmod_name + "| grep '\.ko$' > /var/run/rpm-kmod-" + kmod_name +"-modules") - - print("%postun -n kmod-" + kmod_name) - print("/sbin/depmod -aF /boot/System.map-" + verrel+" " + verrel + " &> /dev/null || :") - - if (kmp !=""): - print("modules=( $(cat /var/run/rpm-kmod-" + kmod_name + "-modules) )") - print("#rm /var/run/rpm-kmod-" + kmod_name + "-modules") - print("""if [ -x "/sbin/weak-modules" ]; then - printf '%s\\n' "${modules[@]}" | /sbin/weak-modules --remove-modules -fi""") - - print("%files -n kmod-" + kmod_name) - kmp_override_filelist= sys.argv[3] - if kmp_override_filelist == '%filelist': - print("%defattr(644,root,root,755)") - print("/lib/modules/" + verrel) - print("/lib/firmware/") - else: - with open(kmp_override_filelist) as f: - for line in f: - print(line, end = '') - -#for i in range(len(sys.argv)): -if (sys.argv[1] == "verrel"): - print_verrel() -if (sys.argv[1] == "rpmtemplate_kmp"): - kmp=1 - print_rpmtemplate() -else: - print("Error: Unknown option 'sys.argv[i]'.") - exit() +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 <