From c26aaace8460a4641f9f66b5c6f52a694a4af0ae1124dee83a1d19e15f96cd27 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 12 Jun 2009 14:15:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=79 --- findksyms.diff | 48 +++++++++++++++++++++++++++++++----------------- rpm-python.spec | 2 +- rpm.changes | 5 +++++ rpm.spec | 8 +++++--- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/findksyms.diff b/findksyms.diff index 90f3771..2bccd1c 100644 --- a/findksyms.diff +++ b/findksyms.diff @@ -1,15 +1,13 @@ SUSE specific kernel provides/requires scripts --- - scripts/find-provides.ksyms | 23 +++++++++++++++++ - scripts/find-requires.ksyms | 59 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 82 insertions(+) + scripts/find-provides.ksyms | 41 +++++++++++++++++++++++++++++++ + scripts/find-requires.ksyms | 57 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 98 insertions(+) -Index: scripts/find-provides.ksyms -=================================================================== --- /dev/null +++ scripts/find-provides.ksyms -@@ -0,0 +1,23 @@ +@@ -0,0 +1,41 @@ +#! /bin/sh + +IFS=$'\n' @@ -17,24 +15,40 @@ Index: scripts/find-provides.ksyms +case "$1" in +kernel-module-*) ;; # Fedora kernel module package names start with + # kernel-module. -+kernel*) is_kernel_package=1 ;; ++kernel*) kernel_flavor=${1#kernel-} ;; +esac + -+if ! [ -z "$is_kernel_package" ]; then -+ cat > /dev/null -+ exit 0 -+fi -+ -+for module in $(grep -E '/lib/modules/.+\.ko$'); do -+ flavor=$(/sbin/modinfo -F vermagic "$module") ++trap 'rm -f "$tmp"' EXIT ++tmp=$(mktemp) ++while read f; do ++ test -e "$f" || continue ++ case "$f" in ++ *.debug) ++ continue ++ ;; ++ */lib/modules/*/*.ko | */lib/modules/*/*.ko.gz | */boot/vmlinu[xz]*) ++ ;; ++ *) ++ continue ++ esac ++ unzip=false ++ case "$f" in ++ *.gz | */boot/vmlinuz*) ++ unzip=true ++ esac ++ if $unzip && gzip -cd "$f" >"$tmp"; then ++ f=$tmp ++ fi ++ flavor=$(/sbin/modinfo -F vermagic "$f") + flavor=${flavor%% *} + flavor=${flavor##*-} -+ nm "$module" \ ++ if test -z "$flavor"; then ++ flavor=$kernel_flavor ++ fi ++ nm "$f" \ + | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p" +done \ +| sort -u -Index: scripts/find-requires.ksyms -=================================================================== --- /dev/null +++ scripts/find-requires.ksyms @@ -0,0 +1,57 @@ diff --git a/rpm-python.spec b/rpm-python.spec index 89a190c..c659f4f 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -24,7 +24,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 40 +Release: 41 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm.changes b/rpm.changes index 6ca8a76..e289c27 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 9 11:53:50 CEST 2009 - mmarek@suse.cz + +- findksyms.diff: also generate provides for kernel packages. + ------------------------------------------------------------------- Mon Apr 6 02:09:43 CEST 2009 - ro@suse.de diff --git a/rpm.spec b/rpm.spec index 9edf012..b15e712 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 40 +Release: 41 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -337,7 +337,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 488 +Release: 489 # bug437293 %ifarch ppc64 Obsoletes: popt-64bit @@ -365,7 +365,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 488 +Release: 489 Requires: popt = 1.7 Requires: glibc-devel # bug437293 @@ -405,6 +405,8 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Tue Jun 09 2009 mmarek@suse.cz +- findksyms.diff: also generate provides for kernel packages. * Mon Apr 06 2009 ro@suse.de - fix typo in brp-symlink (bnc#457908) * Tue Mar 31 2009 mmarek@suse.cz