[kernel] Prep mod-extra.sh for signed modules
Josh Boyer
jwboyer at fedoraproject.org
Tue Sep 25 17:26:22 UTC 2012
commit 7e6e483520994df2dfc131a0d87305da663e61c5
Author: Josh Boyer <jwboyer at redhat.com>
Date: Fri Sep 14 12:32:41 2012 -0400
Prep mod-extra.sh for signed modules
kernel.spec | 3 ++-
mod-extra.sh | 14 ++++++++++++++
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2f4240d..8212eaa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -2262,6 +2262,7 @@ fi
%changelog
* Tue Sep 25 2012 Josh Boyer <jwboyer at redhat.com>
- Move the modules-extra processing to a script
+- Prep mod-extra.sh for signed modules
* Tue Sep 25 2012 Josh Boyer <jwboyer at redhat.com> - 3.6.0-0.rc7.git1.2
- Update team driver from net-next from Jiri Pirko
diff --git a/mod-extra.sh b/mod-extra.sh
index 115950b..d121bd0 100755
--- a/mod-extra.sh
+++ b/mod-extra.sh
@@ -61,6 +61,20 @@ do
mv $mod $newpath
done
+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 is modules-extra.
+
+for mod in `cat ${Dir}/dep2.list`
+do
+ modfile=`basename $mod | sed -e 's/.ko/.mod/'`
+ rm .tmp_versions/$modfile
+done
+
+pushd $Dir
rm modnames dep.list dep2.list req.list req2.list
rm mod-extra.list mod-extra2.list mod-extra3.list
popd
More information about the scm-commits
mailing list