From b0fbc61bdfd4d0d99718405f6a6905f65412f9f2 Mon Sep 17 00:00:00 2001 From: yangmingtaip Date: Thu, 8 Sep 2022 20:52:55 +0800 Subject: [PATCH 01/12] add find-requires and find-requires.ksyms --- ...hen-using-kabi-outside-our-stablelis.patch | 240 ++++++++++++++++++ openEuler-rpm-config.spec | 9 +- 2 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 Give-a-warning-when-using-kabi-outside-our-stablelis.patch diff --git a/Give-a-warning-when-using-kabi-outside-our-stablelis.patch b/Give-a-warning-when-using-kabi-outside-our-stablelis.patch new file mode 100644 index 0000000..58e17e1 --- /dev/null +++ b/Give-a-warning-when-using-kabi-outside-our-stablelis.patch @@ -0,0 +1,240 @@ +From 895c930b1418798509a1f19706b6a1be188ad303 Mon Sep 17 00:00:00 2001 +From: Liu Yuntao +Date: Sat, 2 Jul 2022 13:59:25 +0800 +Subject: [PATCH] Give a warning when using kabi outside our stablelists. + +Add a script that will find requirements for your package. It can make an +additional kabi whitelist check for you, compared with rpmbuild's builtin +requirement scanner. You may add "%define _use_internal_dependency_generator 0" +in your .spec file to enable this feature. +synced from CentOS's implementation. +--- + find-requires | 38 +++++++++++ + find-requires.ksyms | 155 ++++++++++++++++++++++++++++++++++++++++++++ + macros.kmp | 3 +- + 3 files changed, 195 insertions(+), 1 deletion(-) + create mode 100644 find-requires + create mode 100644 find-requires.ksyms + +diff --git a/find-requires b/find-requires +new file mode 100644 +index 0000000..b7cd825 +--- /dev/null ++++ b/find-requires +@@ -0,0 +1,38 @@ ++#!/bin/bash ++ ++# ++# Auto-generate requirements for executables (both ELF and a.out) and library ++# sonames, script interpreters, and perl modules. ++# ++ ++ulimit -c 0 ++ ++filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` ++ ++[ -x /usr/lib/rpm/rpmdeps -a -n "$filelist" ] && \ ++ echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/rpmdeps --requires ++ ++# ++# --- Kernel module imported symbols ++# ++# Since we don't (yet) get passed the name of the package being built, we ++# cheat a little here by looking first for a kernel, then for a kmod. ++# ++ ++unset is_kmod ++ ++for f in $filelist; do ++ if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*)\.ko(\.gz|\.bz2|\.xz)?$:\2:p') ] ++ then ++ is_kmod=1; ++ elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ] ++ then ++ unset is_kmod; ++ break; ++ fi ++done ++ ++[ -x /usr/lib/rpm/openEuler/find-requires.ksyms ] && [ "$is_kmod" ] && ++ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/openEuler/find-requires.ksyms ++ ++exit 0 +diff --git a/find-requires.ksyms b/find-requires.ksyms +new file mode 100644 +index 0000000..15cc729 +--- /dev/null ++++ b/find-requires.ksyms +@@ -0,0 +1,155 @@ ++#! /bin/bash ++# ++# This script is called during external module building to create dependencies ++# both upon the linux kernel, and on additional external modules. Symbols that ++# cannot be reconciled against those provided by the kernel are assumed to be ++# provided by an external module and "ksym" replaces th regular "kernel" dep. ++ ++IFS=$'\n' ++ ++# Extract all of the symbols provided by this module. ++all_provides() { ++ for module in "$@"; do ++ tmpfile="" ++ if [ "x${module%.ko}" = "x${module}" ]; then ++ tmpfile=$(mktemp -t ${0##*/}.XXXXXX.ko) ++ proc_bin= ++ case "${module##*.}" in ++ xz) ++ proc_bin=xz ++ ;; ++ bz2) ++ proc_bin=bzip2 ++ ;; ++ gz) ++ proc_bin=gzip ++ ;; ++ esac ++ ++ [ -n "$proc_bin" ] || continue ++ ++ "$proc_bin" -d -c - < "$module" > "$tmpfile" || continue ++ module="$tmpfile" ++ fi ++ ++ if [[ -n $(nm "$module" | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p') ]]; then ++ nm "$module" \ ++ | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):0x\1 \2:p' \ ++ | awk --non-decimal-data '{printf("%s:0x%08x\n", $2, $1)}' ++ else ++ ELFRODATA=$(readelf -R .rodata "$module" | awk '/0x/{printf $2$3$4$5}') ++ if [[ -n $(readelf -h "$module" | grep "little endian") ]]; then ++ RODATA=$(echo $ELFRODATA | sed 's/\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/g') ++ else ++ RODATA=$ELFRODATA ++ fi ++ for sym in $(nm "$module" | sed -r -ne 's:^0*([0-9a-f]+) R __crc_(.+):0x\1 \2:p'); do ++ echo $sym $RODATA ++ done \ ++ | awk --non-decimal-data '{printf("%s:0x%08s\n", $2, substr($3,($1*2)+1,8))}' ++ fi ++ ++ [ -z "$tmpfile" ] || rm -f -- "$tmpfile" ++ done \ ++ | LC_ALL=C sort -k1,1 -u ++} ++ ++# Extract all of the requirements of this module. ++all_requires() { ++ for module in "$@"; do ++ set -- $(/sbin/modinfo -F vermagic "$module" | sed -e 's: .*::' -e q) ++ /sbin/modprobe --dump-modversions "$module" \ ++ | awk --non-decimal-data ' ++ BEGIN { FS = "\t" ; OFS = "\t" } ++ {printf("%s:0x%08x\n", $2, $1)}' \ ++ | sed -r -e 's:$:\t'"$1"':' ++ done \ ++ | LC_ALL=C sort -k1,1 -u ++} ++ ++# Filter out requirements fulfilled by the module itself. ++mod_requires() { ++ LC_ALL=C join -t $'\t' -j 1 -v 1 \ ++ <(all_requires "$@") \ ++ <(all_provides "$@") \ ++ | LC_ALL=C sort -k1,1 -u ++} ++ ++if ! [ -e /sbin/modinfo -a -e /sbin/modprobe ]; then ++ cat > /dev/null ++ exit 0 ++fi ++ ++check_kabi() { ++ arch=$(uname -m) ++ kabi_file="/lib/modules/kabi-current/kabi_stablelist_$arch" ++ ++ # If not installed, output a warning and return (continue) ++ if [ ! -f "$kabi_file" ]; then ++ echo "" >&2 ++ echo "********************************************************************************" >&2 ++ echo "*********************** KERNEL ABI COMPATIBILITY WARNING ***********************" >&2 ++ echo "********************************************************************************" >&2 ++ echo "The kernel ABI reference files (provided by "kernel-abi-stablelists") were not found." >&2 ++ echo "No compatibility check was performed. Please install the kABI reference files" >&2 ++ echo "and rebuild if you would like to verify compatibility with kernel ABI." >&2 ++ echo "" >&2 ++ return ++ fi ++ ++ unset non_kabi ++ for symbol in "$@"; do ++ if ! egrep "^$symbol\$" $kabi_file >/dev/null; then ++ non_kabi=("${non_kabi[@]}" "$symbol") ++ fi ++ done ++ ++ if [ ${#non_kabi[@]} -gt 0 ]; then ++ echo "" >&2 ++ echo "********************************************************************************" >&2 ++ echo "*********************** KERNEL ABI COMPATIBILITY WARNING ***********************" >&2 ++ echo "********************************************************************************" >&2 ++ echo "The following kernel symbols are not guaranteed to remain compatible with" >&2 ++ echo "future kernel updates to this RHEL release:" >&2 ++ echo "" >&2 ++ for symbol in "${non_kabi[@]}"; do ++ printf "\t$symbol\n" >&2 ++ done ++ echo "" >&2 ++ echo "openEuler recommends that you consider using only official kernel ABI symbols" >&2 ++ echo "where possible. Requests for additions to the kernel ABI can be filed with" >&2 ++ echo "your partner or customer representative (component: driver-update-program)." >&2 ++ echo "" >&2 ++ fi ++} ++ ++modules=($(grep -E '/lib/modules/.+\.ko(\.gz|\.bz2|\.xz)?$')) ++if [ ${#modules[@]} -gt 0 ]; then ++ kernel=$(/sbin/modinfo -F vermagic "${modules[0]}" | sed -e 's: .*::' -e q) ++ ++ # get all that kernel provides ++ symvers=$(mktemp -t ${0##*/}.XXXXX) ++ ++ cat /usr/src/kernels/$kernel/Module.symvers | awk ' ++ BEGIN { FS = "\t" ; OFS = "\t" } ++ { print $2 ":" $1 } ++ ' \ ++ | sed -r -e 's:$:\t'"$kernel"':' \ ++ | LC_ALL=C sort -k1,1 -u > $symvers ++ ++ # Symbols matching with the kernel get a "kernel" dependency ++ mod_req=$(mktemp -t mod_req.XXXXX) ++ mod_requires "${modules[@]}" > "$mod_req" ++ LC_ALL=C join -t $'\t' -j 1 $symvers "$mod_req" | LC_ALL=C sort -u \ ++ | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "kernel(" $1 ") = " $2 }' ++ ++ # Symbols from elsewhere get a "ksym" dependency ++ LC_ALL=C join -t $'\t' -j 1 -v 2 $symvers "$mod_req" | LC_ALL=C sort -u \ ++ | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print "ksym(" $1 ") = " $2 }' ++ ++ # Check kABI if the kernel-abi-stablelists package is installed ++ # Do this last so we can try to output this error at the end ++ kabi_check_symbols=($(LC_ALL=C join -t $'\t' -j 1 $symvers "$mod_req" | LC_ALL=C sort -u \ ++ | awk 'BEGIN { FS = "[\t:]" ; OFS = "\t" } { print $1 }')) ++ check_kabi "${kabi_check_symbols[@]}" ++fi +diff --git a/macros.kmp b/macros.kmp +index 5207045..df7e41e 100644 +--- a/macros.kmp ++++ b/macros.kmp +@@ -1,7 +1,8 @@ +-# Use these macros to differentiate between RH and other KMP implementation(s). ++# Use these macros to differentiate between openEuler and other KMP implementation(s). + + kernel_module_package_release 1 + ++__find_requires /usr/lib/rpm/openEuler/find-requires + + + #kernel_module_package [ -n name ] [ -v version ] [ -r release ] +-- +2.27.0 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 4632b1f..918e509 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 23 +Release: 24 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -18,6 +18,7 @@ Patch4: openEuler-remove-fexceptions.patch Patch5: exclude-kernel-source-and-EFI-files-in-digest-list-building.patch Patch6: add-brp-scripts-to-delete-rpath.patch Patch7: Fix-python3_version-macros-for-Python-3.10.patch +Patch8: Give-a-warning-when-using-kabi-outside-our-stablelis.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -91,6 +92,7 @@ install -p -m 755 -t %{buildroot}%{rpmvdir} config.* install -p -m 755 -t %{buildroot}%{_rpmconfigdir} brp-* install -p -m 644 -t %{buildroot}%{_rpmconfigdir} generic-* install -p -m 755 -t %{buildroot}%{rpmvdir} kmodtool.py +install -p -m 755 -t %{buildroot}%{rpmvdir} find-requires* mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d/ macros.perl macros.python macros.go macros.forge macros.kmp @@ -112,8 +114,13 @@ mkdir -p %{buildroot}%{_fileattrsdir} %exclude %{_prefix}/lib/rpm/*/__pycache__/* %{rpmvdir}/kmodtool.py %{_rpmconfigdir}/macros.d/macros.kmp +%{rpmvdir}/find-requires +%{rpmvdir}/find-requires.ksyms %changelog +* Thu Sep 8 2022 yangmingtai - 30-24 +- add find-requires and find-requires.ksyms + * Fri Jan 21 2022 Liu Zixian - 30-23 - fix python macros -- Gitee From 1b7e0fc448d5d331b8c2e8415104df0347508712 Mon Sep 17 00:00:00 2001 From: yangmingtaip Date: Wed, 12 Oct 2022 15:12:33 +0800 Subject: [PATCH 02/12] macro.kmp support -p preamble --- ...-a-bug-that-missing_-p-in-macros.kmp.patch | 37 +++++++++++++++++++ openEuler-rpm-config.spec | 6 ++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 fixed-a-bug-that-missing_-p-in-macros.kmp.patch diff --git a/fixed-a-bug-that-missing_-p-in-macros.kmp.patch b/fixed-a-bug-that-missing_-p-in-macros.kmp.patch new file mode 100644 index 0000000..7a601e9 --- /dev/null +++ b/fixed-a-bug-that-missing_-p-in-macros.kmp.patch @@ -0,0 +1,37 @@ +From 7629ad0c54cc3970e49b2f78043e0fe1b1c6474d Mon Sep 17 00:00:00 2001 +From: liujing +Date: Wed, 1 Dec 2021 00:46:20 -0500 +Subject: [PATCH] fixed a bug that missing -p in macros.kmp + +--- + macros.kmp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/macros.kmp b/macros.kmp +index be66e64..5207045 100644 +--- a/macros.kmp ++++ b/macros.kmp +@@ -5,17 +5,17 @@ kernel_module_package_release 1 + + + #kernel_module_package [ -n name ] [ -v version ] [ -r release ] +-# [ -f filelist] ++# [ -f filelist][-p preamble] + # + + %kernel_module_package_buildreqs %global kmodtool_generate_buildreqs 1 \ + kernel-devel + +-%kernel_module_package(n:v:r:f:) %{expand:%( \ ++%kernel_module_package(n:v:r:f:p) %{expand:%( \ + %define kmodtool /usr/lib/rpm/openEuler/kmodtool.py\ + %define latest_kernel $(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel` | head -n 1) \ + %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ + %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ +- python3 %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} %{-f*}%{!-f:%filelist} \ ++ python3 %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} %{-f*}%{!-f:%filelist} %{-p*}%{!-p:%preamble} \ + )} + +-- +2.27.0 + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 918e509..698dda8 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 24 +Release: 25 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -19,6 +19,7 @@ Patch5: exclude-kernel-source-and-EFI-files-in-digest-list-building.patc Patch6: add-brp-scripts-to-delete-rpath.patch Patch7: Fix-python3_version-macros-for-Python-3.10.patch Patch8: Give-a-warning-when-using-kabi-outside-our-stablelis.patch +Patch9: fixed-a-bug-that-missing_-p-in-macros.kmp.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -118,6 +119,9 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{rpmvdir}/find-requires.ksyms %changelog +* Wed Oct 12 2022 yangmingtai - 30-25 +- macro.kmp support -p preamble + * Thu Sep 8 2022 yangmingtai - 30-24 - add find-requires and find-requires.ksyms -- Gitee From f9cb759700d8eca98f0a0a8d721a0251d73d9bbe Mon Sep 17 00:00:00 2001 From: wzx Date: Mon, 24 Oct 2022 17:19:02 +0800 Subject: [PATCH 03/12] Add sw64 architecture Signed-off-by: wzx --- openEuler-rpm-config-sw.patch | 63 +++++++++++++++++++++++++++++++++++ openEuler-rpm-config.spec | 6 +++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100755 openEuler-rpm-config-sw.patch diff --git a/openEuler-rpm-config-sw.patch b/openEuler-rpm-config-sw.patch new file mode 100755 index 0000000..844a22d --- /dev/null +++ b/openEuler-rpm-config-sw.patch @@ -0,0 +1,63 @@ +diff -Naur openEuler-rpm-config.org/config.guess openEuler-rpm-config.sw/config.guess +--- openEuler-rpm-config.org/config.guess 2022-09-28 02:14:20.761824000 +0000 ++++ openEuler-rpm-config.sw/config.guess 2022-09-28 02:15:03.761824000 +0000 +@@ -915,6 +915,14 @@ + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; ++ sw_64:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ sw) UNAME_MACHINE=sw_64 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi ++ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -1459,4 +1467,4 @@ + # time-stamp-start: "timestamp='" + # time-stamp-format: "%:y-%02m-%02d" + # time-stamp-end: "'" +-# End: +\ No newline at end of file ++# End: +diff -Naur openEuler-rpm-config.org/config.sub openEuler-rpm-config.sw/config.sub +--- openEuler-rpm-config.org/config.sub 2022-09-28 02:14:20.761824000 +0000 ++++ openEuler-rpm-config.sw/config.sub 2022-09-28 02:24:48.291824000 +0000 +@@ -247,6 +247,7 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | sw_64 \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ +@@ -370,6 +371,7 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | sw_64-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ +@@ -1820,4 +1822,4 @@ + # time-stamp-start: "timestamp='" + # time-stamp-format: "%:y-%02m-%02d" + # time-stamp-end: "'" +-# End: +\ No newline at end of file ++# End: +diff -Naur openEuler-rpm-config.org/macros openEuler-rpm-config.sw/macros +--- openEuler-rpm-config.org/macros 2022-09-28 02:14:20.761824000 +0000 ++++ openEuler-rpm-config.sw/macros 2022-09-28 02:15:49.081824000 +0000 +@@ -225,7 +225,7 @@ + %pkg_vcmp() (%{expand:%%{pkg_version_cmp %1 %3}} %2 0) + + #arches macros +-%generic_arches %{ix86} x86_64 %{arm} aarch64 ++%generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 + %ldc_arches %{generic_arches} + %valgrind_arches %{generic_arches} + %nodejs_arches %{generic_arches} diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 698dda8..7556bb2 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 25 +Release: 26 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -20,6 +20,7 @@ Patch6: add-brp-scripts-to-delete-rpath.patch Patch7: Fix-python3_version-macros-for-Python-3.10.patch Patch8: Give-a-warning-when-using-kabi-outside-our-stablelis.patch Patch9: fixed-a-bug-that-missing_-p-in-macros.kmp.patch +Patch10: openEuler-rpm-config-sw.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -119,6 +120,9 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{rpmvdir}/find-requires.ksyms %changelog +* Mon Oct 24 2022 wuzx - 30-26 +- Add sw64 architecture + * Wed Oct 12 2022 yangmingtai - 30-25 - macro.kmp support -p preamble -- Gitee From 44f64ad08d6c3e61fd1578fe8306c9b29e888958 Mon Sep 17 00:00:00 2001 From: ut001695 Date: Wed, 15 Jun 2022 11:14:55 +0800 Subject: [PATCH 04/12] fix bogus date in %changelog (cherry picked from commit ca88141a49d41e2195b28de76b3bddbe4d67fc74) --- openEuler-rpm-config.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 698dda8..581f132 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -164,7 +164,7 @@ mkdir -p %{buildroot}%{_fileattrsdir} * Mon Aug 3 2020 Anakin Zhang - 30-12 - add brp-digest-list -* Wed Jun 19 2020 zhangliuyan - 30-11 +* Fri Jun 19 2020 zhangliuyan - 30-11 - add kmodtool.py macros.kmp * Wed May 6 2020 openEuler Buildteam - 30-10 -- Gitee From af47f206bf4c38452a1d334c1e9def3db1870fb9 Mon Sep 17 00:00:00 2001 From: Jingyun Hua Date: Mon, 21 Nov 2022 03:00:14 +0000 Subject: [PATCH 05/12] add loongarch64 support Signed-off-by: Jingyun Hua --- ...port-for-config.guess-and-config.sub.patch | 26 +++++++++++++ add-loongarch64-to-generic_arches.patch | 13 +++++++ openEuler-rpm-config.spec | 8 +++- ...guess-and-config.sub-for-loongarch64.patch | 39 +++++++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 add-loongarch64-support-for-config.guess-and-config.sub.patch create mode 100644 add-loongarch64-to-generic_arches.patch create mode 100644 update-config.guess-and-config.sub-for-loongarch64.patch diff --git a/add-loongarch64-support-for-config.guess-and-config.sub.patch b/add-loongarch64-support-for-config.guess-and-config.sub.patch new file mode 100644 index 0000000..9dcec43 --- /dev/null +++ b/add-loongarch64-support-for-config.guess-and-config.sub.patch @@ -0,0 +1,26 @@ +diff --git a/config.guess b/config.guess +index 0ff02d1..1caf3a6 100644 +--- a/config.guess ++++ b/config.guess +@@ -983,6 +983,9 @@ EOF + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; ++ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; +diff --git a/config.sub b/config.sub +index 6107010..aca1d40 100644 +--- a/config.sub ++++ b/config.sub +@@ -269,6 +269,7 @@ case $basic_machine in + | k1om \ + | le32 | le64 \ + | lm32 \ ++ | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ diff --git a/add-loongarch64-to-generic_arches.patch b/add-loongarch64-to-generic_arches.patch new file mode 100644 index 0000000..5a911c1 --- /dev/null +++ b/add-loongarch64-to-generic_arches.patch @@ -0,0 +1,13 @@ +diff --git a/macros b/macros +index d6b2c80..a66eb2e 100644 +--- a/macros ++++ b/macros +@@ -241,7 +241,7 @@ + %pkg_vcmp() (%{expand:%%{pkg_version_cmp %1 %3}} %2 0) + + #arches macros +-%generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 ++%generic_arches %{ix86} x86_64 %{arm} aarch64 sw_64 loongarch64 + %ldc_arches %{generic_arches} + %valgrind_arches %{generic_arches} + %nodejs_arches %{generic_arches} diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 8ca2b19..3a39508 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 26 +Release: 27 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -21,6 +21,9 @@ Patch7: Fix-python3_version-macros-for-Python-3.10.patch Patch8: Give-a-warning-when-using-kabi-outside-our-stablelis.patch Patch9: fixed-a-bug-that-missing_-p-in-macros.kmp.patch Patch10: openEuler-rpm-config-sw.patch +Patch11: update-config.guess-and-config.sub-for-loongarch64.patch +Patch12: add-loongarch64-to-generic_arches.patch +Patch13: add-loongarch64-support-for-config.guess-and-config.sub.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -120,6 +123,9 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{rpmvdir}/find-requires.ksyms %changelog +* Mon Nov 21 2022 huajingyun - 30-27 +- add loongarch64 support + * Mon Oct 24 2022 wuzx - 30-26 - Add sw64 architecture diff --git a/update-config.guess-and-config.sub-for-loongarch64.patch b/update-config.guess-and-config.sub-for-loongarch64.patch new file mode 100644 index 0000000..4e4b88a --- /dev/null +++ b/update-config.guess-and-config.sub-for-loongarch64.patch @@ -0,0 +1,39 @@ +From fe6cff21eb18cc05704db85520db57c0d58bd2d3 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Tue, 12 Apr 2022 22:31:41 +0800 +Subject: [PATCH] update config.guess and config.sub for loongarch64 + +--- + macros | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/macros b/macros +index 5c7447b..dc8c749 100644 +--- a/macros ++++ b/macros +@@ -49,6 +49,22 @@ + # ---- configure and makeinstall. + %_configure_gnuconfig_hack 1 + %_configure_libtool_hardening_hack 1 ++ ++#update config.guess and config.sub ++%_update_config_guess \ ++ [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.guess) ; do \ ++ [ -f /usr/lib/rpm/%{_vendor}/$(basename $i) ] && \ ++ %{__rm} -f $i && \ ++ %{__cp} -fv /usr/lib/rpm/%{_vendor}/$(basename $i) $i ; \ ++ done ; ++ ++%_update_config_sub \ ++ [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find . -name config.sub) ; do \ ++ [ -f /usr/lib/rpm/%{_vendor}/$(basename $i) ] && \ ++ %{__rm} -f $i && \ ++ %{__cp} -fv /usr/lib/rpm/%{_vendor}/$(basename $i) $i ; \ ++ done ; ++ + %configure \ + %{set_build_flags}; \ + [ "%_configure_gnuconfig_hack" = 1 ] && for i in $(find $(dirname %{_configure}) -name config.guess -o -name config.sub) ; do \ +-- +2.27.0 + -- Gitee From 083c7b2bfa34928f2523db30b5710edd9e8543fe Mon Sep 17 00:00:00 2001 From: yangmingtaip Date: Wed, 30 Nov 2022 20:17:47 +0800 Subject: [PATCH 06/12] support adaptive according to vendor (cherry picked from commit 9ee8eccadcbbd7af808484d6bb8f33fb8a8c680b) --- ...hen-using-kabi-outside-our-stablelis.patch | 10 +++--- add-brp-scripts-to-delete-rpath.patch | 2 +- ...nfig-sw.patch => add-sw-arch-support.patch | 0 ...the-vendor-to-generic-for-common-use.patch | 32 ++++++++++++++++--- ...-a-bug-that-missing_-p-in-macros.kmp.patch | 2 +- openEuler-rpm-config.spec | 14 +++++--- ...ceptions.patch => remove-fexceptions.patch | 0 7 files changed, 44 insertions(+), 16 deletions(-) rename openEuler-rpm-config-sw.patch => add-sw-arch-support.patch (100%) rename change-the-openEuler-to-generic-for-common-use.patch => change-the-vendor-to-generic-for-common-use.patch (76%) rename openEuler-remove-fexceptions.patch => remove-fexceptions.patch (100%) diff --git a/Give-a-warning-when-using-kabi-outside-our-stablelis.patch b/Give-a-warning-when-using-kabi-outside-our-stablelis.patch index 58e17e1..d2cba8e 100644 --- a/Give-a-warning-when-using-kabi-outside-our-stablelis.patch +++ b/Give-a-warning-when-using-kabi-outside-our-stablelis.patch @@ -56,8 +56,8 @@ index 0000000..b7cd825 + fi +done + -+[ -x /usr/lib/rpm/openEuler/find-requires.ksyms ] && [ "$is_kmod" ] && -+ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/openEuler/find-requires.ksyms ++[ -x /usr/lib/rpm/__vendor/find-requires.ksyms ] && [ "$is_kmod" ] && ++ printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/__vendor/find-requires.ksyms + +exit 0 diff --git a/find-requires.ksyms b/find-requires.ksyms @@ -184,7 +184,7 @@ index 0000000..15cc729 + printf "\t$symbol\n" >&2 + done + echo "" >&2 -+ echo "openEuler recommends that you consider using only official kernel ABI symbols" >&2 ++ echo "__vendor recommends that you consider using only official kernel ABI symbols" >&2 + echo "where possible. Requests for additions to the kernel ABI can be filed with" >&2 + echo "your partner or customer representative (component: driver-update-program)." >&2 + echo "" >&2 @@ -227,11 +227,11 @@ index 5207045..df7e41e 100644 +++ b/macros.kmp @@ -1,7 +1,8 @@ -# Use these macros to differentiate between RH and other KMP implementation(s). -+# Use these macros to differentiate between openEuler and other KMP implementation(s). ++# Use these macros to differentiate between __vendor and other KMP implementation(s). kernel_module_package_release 1 -+__find_requires /usr/lib/rpm/openEuler/find-requires ++__find_requires /usr/lib/rpm/__vendor/find-requires #kernel_module_package [ -n name ] [ -v version ] [ -r release ] diff --git a/add-brp-scripts-to-delete-rpath.patch b/add-brp-scripts-to-delete-rpath.patch index 8f9d2e4..7c52c4d 100644 --- a/add-brp-scripts-to-delete-rpath.patch +++ b/add-brp-scripts-to-delete-rpath.patch @@ -134,7 +134,7 @@ index 7cde63f..ee0c126 100644 %{?__brp_strip_static_archive} \ %{?py_auto_byte_compile:%{?__brp_python_bytecompile}} \ %{?__brp_python_hardlink} \ -+ %{?openEuler_delete_rpath:%{?__brp_chrpath}} \ ++ %{?__vendor_delete_rpath:%{?__brp_chrpath}} \ %{nil} %__spec_install_post\ diff --git a/openEuler-rpm-config-sw.patch b/add-sw-arch-support.patch similarity index 100% rename from openEuler-rpm-config-sw.patch rename to add-sw-arch-support.patch diff --git a/change-the-openEuler-to-generic-for-common-use.patch b/change-the-vendor-to-generic-for-common-use.patch similarity index 76% rename from change-the-openEuler-to-generic-for-common-use.patch rename to change-the-vendor-to-generic-for-common-use.patch index c429af2..6da802d 100644 --- a/change-the-openEuler-to-generic-for-common-use.patch +++ b/change-the-vendor-to-generic-for-common-use.patch @@ -1,15 +1,16 @@ From e9f486a8d9af5b01dcadf8432a449e434cd6886b Mon Sep 17 00:00:00 2001 From: Yangyang Shen Date: Sat, 27 Mar 2021 14:18:56 +0800 -Subject: [PATCH] change the openEuler to generic for common use +Subject: [PATCH] change the vendor to generic for common use --- openEuler-hardened-cc1 => generic-hardened-cc1 | 0 openEuler-hardened-ld => generic-hardened-ld | 0 openEuler-pie-cc1 => generic-pie-cc1 | 0 openEuler-pie-ld => generic-pie-ld | 0 - macros | 14 +++++++------- - 5 files changed, 7 insertions(+), 7 deletions(-) + macros | 16 ++++++++-------- + macros.kmp | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) rename openEuler-hardened-cc1 => generic-hardened-cc1 (100%) rename openEuler-hardened-ld => generic-hardened-ld (100%) rename openEuler-pie-cc1 => generic-pie-cc1 (100%) @@ -32,9 +33,17 @@ similarity index 100% rename from openEuler-pie-ld rename to generic-pie-ld diff --git a/macros b/macros -index b06faea..ce7cf5c 100644 +index b06faea..def87a7 100644 --- a/macros +++ b/macros +@@ -1,6 +1,6 @@ + # Per-platform rpm configuration file. + +-%_vendor openEuler ++%_vendor __vendor + %_os linux + %_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu} + @@ -52,7 +52,7 @@ %configure \ %{set_build_flags}; \ @@ -82,6 +91,19 @@ index b06faea..ce7cf5c 100644 %_fs_cflags %{?_fs_build:%{_fs_pre_cflags}} +diff --git a/macros.kmp b/macros.kmp +index be66e64..b9ebbe8 100644 +--- a/macros.kmp ++++ b/macros.kmp +@@ -12,7 +12,7 @@ kernel_module_package_release 1 + kernel-devel + + %kernel_module_package(n:v:r:f:) %{expand:%( \ +- %define kmodtool /usr/lib/rpm/openEuler/kmodtool.py\ ++ %define kmodtool /usr/lib/rpm/__vendor/kmodtool.py\ + %define latest_kernel $(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel` | head -n 1) \ + %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ + %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ -- -2.23.0 +2.33.0 diff --git a/fixed-a-bug-that-missing_-p-in-macros.kmp.patch b/fixed-a-bug-that-missing_-p-in-macros.kmp.patch index 7a601e9..457597b 100644 --- a/fixed-a-bug-that-missing_-p-in-macros.kmp.patch +++ b/fixed-a-bug-that-missing_-p-in-macros.kmp.patch @@ -24,7 +24,7 @@ index be66e64..5207045 100644 -%kernel_module_package(n:v:r:f:) %{expand:%( \ +%kernel_module_package(n:v:r:f:p) %{expand:%( \ - %define kmodtool /usr/lib/rpm/openEuler/kmodtool.py\ + %define kmodtool /usr/lib/rpm/__vendor/kmodtool.py\ %define latest_kernel $(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel` | head -n 1) \ %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 3a39508..2cd172b 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 27 +Release: 28 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -13,14 +13,14 @@ Source0: https://gitee.com/openeuler/openEuler-rpm-config/repository/arch Patch0: fix-error-message-for-kmodtool.patch Patch1: 0001-1-Add-riscv64-to-golang_arches.patch Patch2: Fix-a-typo-in-brp-digest-list.patch -Patch3: change-the-openEuler-to-generic-for-common-use.patch -Patch4: openEuler-remove-fexceptions.patch +Patch3: change-the-vendor-to-generic-for-common-use.patch +Patch4: remove-fexceptions.patch Patch5: exclude-kernel-source-and-EFI-files-in-digest-list-building.patch Patch6: add-brp-scripts-to-delete-rpath.patch Patch7: Fix-python3_version-macros-for-Python-3.10.patch Patch8: Give-a-warning-when-using-kabi-outside-our-stablelis.patch Patch9: fixed-a-bug-that-missing_-p-in-macros.kmp.patch -Patch10: openEuler-rpm-config-sw.patch +Patch10: add-sw-arch-support.patch Patch11: update-config.guess-and-config.sub-for-loongarch64.patch Patch12: add-loongarch64-to-generic_arches.patch Patch13: add-loongarch64-support-for-config.guess-and-config.sub.patch @@ -104,6 +104,9 @@ install -p -m 644 -t %{buildroot}%{_rpmconfigdir}/macros.d/ macros.perl macros.p mkdir -p %{buildroot}%{_fileattrsdir} +# Adaptive according to vendor +sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir}` + %files %dir %{rpmvdir} %{rpmvdir}/macros @@ -123,6 +126,9 @@ mkdir -p %{buildroot}%{_fileattrsdir} %{rpmvdir}/find-requires.ksyms %changelog +* Wed Nov 30 2022 yangmingtai - 30-28 +- support adaptive according to vendor + * Mon Nov 21 2022 huajingyun - 30-27 - add loongarch64 support diff --git a/openEuler-remove-fexceptions.patch b/remove-fexceptions.patch similarity index 100% rename from openEuler-remove-fexceptions.patch rename to remove-fexceptions.patch -- Gitee From 81d7bcc2858e068de20fba646da0658db3f3f646 Mon Sep 17 00:00:00 2001 From: Yang Yanchao Date: Wed, 7 Dec 2022 11:22:28 +0800 Subject: [PATCH 07/12] backport kmp feature Signed-off-by: Yang Yanchao --- backport-kmp-feature.patch | 493 +++++++++++++++++++++++++++++++++++++ openEuler-rpm-config.spec | 10 +- 2 files changed, 500 insertions(+), 3 deletions(-) create mode 100644 backport-kmp-feature.patch diff --git a/backport-kmp-feature.patch b/backport-kmp-feature.patch new file mode 100644 index 0000000..0fce883 --- /dev/null +++ b/backport-kmp-feature.patch @@ -0,0 +1,493 @@ +From 22a24809ad1192a89b9d1c795dc3b7c313488f64 Mon Sep 17 00:00:00 2001 +From: Yang Yanchao +Date: Wed, 7 Dec 2022 11:34:39 +0800 +Subject: [PATCH] backport kmp feature + +--- + kmodtool | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + kmodtool.py | 83 --------------- + macros.kmp | 85 +++++++++++---- + 3 files changed, 355 insertions(+), 105 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 <