commit module-init-tools for openSUSE:Factory
Hello community, here is the log from the commit of package module-init-tools for openSUSE:Factory checked in at Mon Aug 30 13:05:25 CEST 2010. -------- --- module-init-tools/module-init-tools.changes 2010-06-28 08:50:44.000000000 +0200 +++ module-init-tools/module-init-tools.changes 2010-08-27 14:47:26.000000000 +0200 @@ -2 +2,34 @@ -Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de +Fri Aug 27 14:39:29 CEST 2010 - mmarek@suse.cz + +- Revert the last specfile change, it was wrong +- commit d2b34c6 + +------------------------------------------------------------------- +Wed Aug 25 14:34:24 CEST 2010 - mmarek@suse.cz + +- Remove the doc/modprobe.d.sgml symlink before build, it confuses + docbook2man. +- commit 2dd227d + +------------------------------------------------------------------- +Fri Jul 23 17:02:41 CEST 2010 - mmarek@suse.cz + +- weak-modules2: Do not consider other flavors when adding + or removing KMPs (bnc#624386). +- commit d575483 + +------------------------------------------------------------------- +Fri Jul 23 16:59:11 CEST 2010 - mmarek@suse.cz + +- weak-modules2: Do not create incompatible symlinks hidden by modules + in updates/ or extra/ (bnc#624386). +- commit 6a395e3 + +------------------------------------------------------------------- +Fri Jul 23 16:38:26 CEST 2010 - mmarek@suse.cz + +- weak-modules2: Simplify usage of kmp_is_present() +- commit cd4f25a + +------------------------------------------------------------------- +Mon Jun 28 08:38:35 CEST 2010 - jengelh@medozas.de @@ -4,0 +38 @@ +- commit 8725c89 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.szMEE1/_old 2010-08-30 13:04:38.000000000 +0200 +++ /var/tmp/diff_new_pack.szMEE1/_new 2010-08-30 13:04:38.000000000 +0200 @@ -21,7 +21,7 @@ Name: module-init-tools BuildRequires: zlib-devel Version: 3.12 -Release: 2 +Release: 5 License: GPLv2+ Group: System/Kernel # for grepping /etc/SUSE-release @@ -71,7 +71,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -rm doc/modprobe.d.sgml %build autoreconf --force --install ++++++ module-init-tools-manpages.diff ++++++ --- /var/tmp/diff_new_pack.szMEE1/_old 2010-08-30 13:04:38.000000000 +0200 +++ /var/tmp/diff_new_pack.szMEE1/_new 2010-08-30 13:04:38.000000000 +0200 @@ -10,7 +10,7 @@ +.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng <steve@ggi-project.org>. -+.TH "MODPROBE" "8" "02 June 2010" "" "" ++.TH "MODPROBE" "8" "27 August 2010" "" "" + .SH NAME modprobe \- program to add and remove modules from the Linux Kernel @@ -300,7 +300,7 @@ +.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> +.\" Please send any bug reports, improvements, comments, patches, +.\" etc. to Steve Cheng <steve@ggi-project.org>. -+.TH "MODPROBE.CONF" "5" "02 June 2010" "" "" ++.TH "MODPROBE.CONF" "5" "27 August 2010" "" "" + .SH NAME modprobe.d, modprobe.conf \- Configuration directory/file for modprobe ++++++ module-init-tools-suse.diff ++++++ --- /var/tmp/diff_new_pack.szMEE1/_old 2010-08-30 13:04:38.000000000 +0200 +++ /var/tmp/diff_new_pack.szMEE1/_new 2010-08-30 13:04:38.000000000 +0200 @@ -48,17 +48,6 @@ </variablelist> </refsect1> <refsect1> - -# HACK - patch(1) is unable to delete the symlink, do this in the specfile -# instead -#diff --git a/doc/modprobe.d.sgml b/doc/modprobe.d.sgml -#deleted file mode 120000 -#index ab88a6d..0000000 -#--- a/doc/modprobe.d.sgml -#+++ /dev/null -#@@ -1 +0,0 @@ -#-modprobe.conf.sgml -#\ No newline at end of file diff --git a/doc/modprobe.sgml b/doc/modprobe.sgml index 85330e1..31da55c 100644 --- a/doc/modprobe.sgml ++++++ weak-modules2 ++++++ --- /var/tmp/diff_new_pack.szMEE1/_old 2010-08-30 13:04:39.000000000 +0200 +++ /var/tmp/diff_new_pack.szMEE1/_new 2010-08-30 13:04:39.000000000 +0200 @@ -1,10 +1,45 @@ #! /bin/bash -# FIXME: move the entire depmod / mkinitrd logic from the kernel and kmp -# %post scripts here -- how? - ############################################################################## - +# How it works: +# * Kernels install modules below /lib/modules/$krel/kernel/. +# * KMPs install modules below /lib/modules/$krel/updates/ or .../extra/. +# * Symbolic links to modules of compatible KMPs are created under +# /lib/modules/$krel/weak-updates/{updates,extra}/... (the original path +# below /lib/modules/$other_krel is used). +# * Depmod searches the directories in this order: updates/, extra/, +# weak-updates/, kernel/ (see /etd/depmod.conf or +# /etc/depmod.d/00-system.conf for details). +# * Compatibility of a kernel with a KMP is defined as: The KMP is built +# for the same flavor as the kernel and after adding the KMP modules to +# the kernel, depmod -e -E Module.symvers reports no errors about +# missing symbols or different symbol checksums. See the +# has_unresolved_symbols() function for details. +# +# * At KMP install time (function add_kmp()), we create symbolic links +# for all kernels that this KMP is compatible with. We skip kernels that +# already contain symbolic links to a newer KMP of the same name, +# contain the KMP itself or another version in updates/ or extra/ or +# have overlapping module names with other KMPs in the respective +# kernel (this should not happen). +# * At kernel install time (functions add_kernel()), we create symbolic +# links for each compatible KMP, unless the KMP or a different one with +# overlapping module names is present in updates/ or extra/ (KMP build +# against $krel can be installed before a kernel with that version). +# When multiple KMPs of the same name are compatbile, we chose the one +# with the highest version number. This is repeated when subsequent +# subpackages (main or -extra) of that kernel are installed. +# * At KMP removal time (function remove_kmp()), the modules and their +# symlinks are removed and, where possible, replaced by symlinks to the +# newest of the remaining compatible version of that KMP. +# * [NOT IMPLEMENTED] When a kernel subpackage is removed, symlinks to +# KMPs that become incompatible are removed as well. This is not +# implemented, because removing the main subpackage and only keeping +# the -base package AND having KMPs installed is not an expected +# scenario, and implementing this would only slow down kernel updates. +# * When the kernel is removed (function remove_kernel()), it's +# weak-updates directory is also removed. +# # naming conventions used in this script: # $kmp: name-version-release of a kmp, e.g kqemu-kmp-default-1.3.0pre11_2.6.25.16_0.1-7.1 # $kmpshort: name of a kmp, e.g kqemu-kmp-default @@ -19,6 +54,7 @@ # modules-$kmp: list of modules in $kmp (full paths) # basenames-$kmp: list of basenames of modules in $kmp # kmps: list of kmps, newest first +# log() { [ -n "$opt_verbose" ] && echo "$@" >&2 @@ -49,10 +85,13 @@ echo /lib/modules/$krel/weak-updates/${module#/lib/modules/*/} } -# Is a kmp already linked to from this kernel? +# Is a kmp already present in or linked to from this kernel? kmp_is_present() { local kmp=$1 krel=$2 + if [ $krel = "$(cat $tmpdir/krel-$kmp)" ]; then + return 0 + fi local module symlink while read module; do symlink=$(symlink_to_module $module $krel) @@ -136,14 +175,18 @@ # KMPs can only be added if none of the module basenames overlap basenames_are_unique() { - local kmp=$1 krel=$2 basedir=$3 + local kmp=$1 krel=$2 basedir=$3 dir - local weak_updates=$basedir/lib/modules/$krel/weak-updates/ - - [ -d "$weak_updates" ] || return 0 - [ -z "$(comm -1 -2 $tmpdir/basenames-$kmp \ - <(find "$weak_updates" -not -type d -printf '%f\n' \ - | sort -u))" ] + for dir in $basedir/lib/modules/$krel/{weak-updates,updates,extra}/; do + if [ ! -d "$dir" ]; then + continue + fi + if [ -n "$(comm -1 -2 $tmpdir/basenames-$kmp \ + <(find "$dir" -not -type d -printf '%f\n' | sort -u))" ]; then + return 1 + fi + done + return 0 } # Can a kmp be replaced by a different version of the same kmp in a kernel? @@ -336,8 +379,7 @@ kmp=${kmps[n]} [ -n "$kmp" ] || continue - if [ $krel = "$(cat $tmpdir/krel-$kmp)" ] || \ - kmp_is_present $kmp $krel; then + if kmp_is_present $kmp $krel; then log "Package $kmp does not need to be added to kernel $krel" kmps[n]='' continue @@ -402,10 +444,15 @@ local dir krel status for dir in /lib/modules/*; do krel=${dir#/lib/modules/} + case "$krel" in + *-$flavor) + ;; + *) + continue + esac [ -d $dir -a -f /boot/System.map-$krel ] || continue - if [ $krel = "$(cat $tmpdir/krel-$kmp)" ] || \ - kmp_is_present $kmp $krel; then + if kmp_is_present $kmp $krel; then log "Package $kmp does not need to be added to kernel $krel" run_depmod_and_mkinitrd "$krel" <$tmpdir/basenames-$kmp || \ status=1 @@ -444,15 +491,17 @@ local dir krel status for dir in /lib/modules/*; do krel=${dir#/lib/modules/} + case "$krel" in + *-$flavor) + ;; + *) + continue + esac [ -d $dir -a -f /boot/System.map-$krel ] || continue - if [ $krel = "$(cat $tmpdir/krel-$kmp)" ]; then - # rpm -e removed some /lib/modules/$krel/updates/*.ko - run_depmod_and_mkinitrd "$krel" <$tmpdir/basenames-$kmp || status=1 - continue - fi - if kmp_is_present $kmp $krel; then - remove_kmp_modules "$kmp" "$krel" + if [ $krel != "$(cat $tmpdir/krel-$kmp)" ]; then + remove_kmp_modules "$kmp" "$krel" + fi local other_kmp while read other_kmp; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de