From: Prarit Bhargava prarit@redhat.com
redhat: Remove stale .tmp_versions code and comments
At sometime prior to the beginning of this repository, .tmp_versions was removed as a temporary data store in the rpm build. Unfortunately two references to it remain: one as a comment and one in code.
The code remnant causes false errors like
rm: cannot remove '.tmp_versions/gamecon.mod': No such file or directory rm: cannot remove '.tmp_versions/gf2k.mod': No such file or directory rm: cannot remove '.tmp_versions/grip.mod': No such file or directory rm: cannot remove '.tmp_versions/grip_mp.mod': No such file or directory rm: cannot remove '.tmp_versions/guillemot.mod': No such file or directory
for every module listed in mod-extra.list, mod-internal.list, and mod-partners.list.
The mentions of .tmp_versions are stale and should be removed.
Signed-off-by: Prarit Bhargava prarit@redhat.com
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -2449,16 +2449,10 @@ chmod -R a=rX Documentation find Documentation -type d | xargs chmod u+w %endif
-# In the modsign case, we do 3 things. 1) We check the "variant" and hard -# code the value in the following invocations. This is somewhat sub-optimal -# but we're doing this inside of an RPM macro and it isn't as easy as it -# could be because of that. 2) We restore the .tmp_versions/ directory from -# the one we saved off in BuildKernel above. This is to make sure we're -# signing the modules we actually built/installed in that variant. 3) We -# grab the arch and invoke mod-sign.sh command to actually sign the modules. -# -# We have to do all of those things _after_ find-debuginfo runs, otherwise -# that will strip the signature off of the modules. +# Module signing (modsign) +# +# This must be run _after_ find-debuginfo.sh runs, otherwise that will strip +# the signature off of the modules. # # Don't sign modules for the zfcpdump variant as it is monolithic.
diff --git a/redhat/scripts/mod/mod-denylist.sh b/redhat/scripts/mod/mod-denylist.sh index blahblah..blahblah 100755 --- a/redhat/scripts/mod/mod-denylist.sh +++ b/redhat/scripts/mod/mod-denylist.sh @@ -127,17 +127,6 @@ fi
popd
-# If we're signing modules, we can't leave the .mod files for the .ko files -# we've moved in .tmp_versions/. Remove them so the Kbuild 'modules_sign' -# target doesn't try to sign a non-existent file. This is kinda ugly, but -# so are the modules-* packages. - -while IFS= read -r mod -do - modfile=$(basename "$mod" | sed -e 's/.ko/.mod/') - rm .tmp_versions/"$modfile" -done < "$Dir"/dep2.list - if [ -z "$Dest" ]; then sed -e "s|^.|${ModDir}|g" "$Dir"/dep2.list > "$RpmDir/$ListName" echo "./$RpmDir/$ListName created."
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2255