testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=70

Browse Source
This commit is contained in:
OBS User unknown 2009-01-08 13:33:30 +00:00 committed by Git OBS Bridge
parent c5dac071df
commit 55eea812d8
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
findksyms.diff
View File

@ -1,7 +1,10 @@
SUSE specific kernel provides/requires scripts SUSE specific kernel provides/requires scripts
Index: scripts/find-provides.ksyms ---
=================================================================== scripts/find-provides.ksyms | 23 +++++++++++++++++
scripts/find-requires.ksyms | 59 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+)
--- /dev/null --- /dev/null
+++ scripts/find-provides.ksyms +++ scripts/find-provides.ksyms
@@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
@ -28,8 +31,6 @@ Index: scripts/find-provides.ksyms
+ | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p" + | sed -r -ne "s/^0*([0-9a-f]+) A __crc_(.+)/ksym($flavor:\\2) = \\1/p"
+done \ +done \
+| sort -u +| sort -u
Index: scripts/find-requires.ksyms
===================================================================
--- /dev/null --- /dev/null
+++ scripts/find-requires.ksyms +++ scripts/find-requires.ksyms
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
@ -48,7 +49,7 @@ Index: scripts/find-requires.ksyms
+ nm "$module" + nm "$module"
+ done \ + done \
+ | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \ + | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \
+ | sort -k2 -u + | sort -t $'\t' -k2 -u
+} +}
+ +
+all_requires() { +all_requires() {
@ -59,7 +60,7 @@ Index: scripts/find-requires.ksyms
+ | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':' + | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':'
+ fi + fi
+ done \ + done \
+ | sort -k2 -u + | sort -t $'\t' -k2 -u
+} +}
+ +
+if ! [ -z "$is_kernel_package" -a -e /sbin/modinfo -a -e /sbin/modprobe ]; then +if ! [ -z "$is_kernel_package" -a -e /sbin/modinfo -a -e /sbin/modprobe ]; then
@ -70,7 +71,7 @@ Index: scripts/find-requires.ksyms
+modules=($(grep -E '/lib/modules/.+\.ko$')) +modules=($(grep -E '/lib/modules/.+\.ko$'))
+if [ ${#modules[@]} -gt 0 ]; then +if [ ${#modules[@]} -gt 0 ]; then
+ symset_table=$(mktemp -t ${0##*/}.XXXXX) + symset_table=$(mktemp -t ${0##*/}.XXXXX)
+ /usr/lib/rpm/symset-table | sort > $symset_table + /usr/lib/rpm/symset-table | sort -t $'\t' -k 1,1 > $symset_table
+ +
+ join -t $'\t' -j 1 -a 2 $symset_table <( + join -t $'\t' -j 1 -a 2 $symset_table <(
+ # Filter out requirements that we fulfill ourself. + # Filter out requirements that we fulfill ourself.
@ -81,7 +82,7 @@ Index: scripts/find-requires.ksyms
+ BEGIN { FS = "\t" ; OFS = "\t" } + BEGIN { FS = "\t" ; OFS = "\t" }
+ { print $3 "/" $2 "/" $1 } + { print $3 "/" $2 "/" $1 }
+ ' \ + ' \
+ | sort -u) \ + | sort -t $'\t' -k 1,1 -u) \
+ | sort -u \ + | sort -u \
+ | awk ' + | awk '
+ { FS = "\t" ; OFS = "\t" } + { FS = "\t" ; OFS = "\t" }

4
rpm-python.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package rpm-python (Version 4.4.2.3) # spec file for package rpm-python (Version 4.4.2.3)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -24,7 +24,7 @@ License: GPL v2 or later
Group: System/Packages Group: System/Packages
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
Version: 4.4.2.3 Version: 4.4.2.3
Release: 22 Release: 23
Requires: rpm = %{version} Requires: rpm = %{version}
%py_requires %py_requires
Source99: rpm.spec Source99: rpm.spec

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 5 15:37:07 CET 2009 - mmarek@suse.cz
- findksyms.diff: make sure that the input files for join are
sorted properly (bnc#450714)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 19 15:26:30 CET 2008 - mls@suse.de Fri Dec 19 15:26:30 CET 2008 - mls@suse.de

11
rpm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package rpm (Version 4.4.2.3) # spec file for package rpm (Version 4.4.2.3)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
AutoReqProv: on AutoReqProv: on
Summary: The RPM Package Manager Summary: The RPM Package Manager
Version: 4.4.2.3 Version: 4.4.2.3
Release: 22 Release: 23
Source: rpm-%{version}.tar.bz2 Source: rpm-%{version}.tar.bz2
Source1: RPM-HOWTO.tar.bz2 Source1: RPM-HOWTO.tar.bz2
Source2: RPM-Tips.html.tar.bz2 Source2: RPM-Tips.html.tar.bz2
@ -331,7 +331,7 @@ Summary: A C library for parsing command line parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 470 Release: 471
# #
%description -n popt %description -n popt
@ -354,7 +354,7 @@ Summary: C Library for Parsing Command Line Parameters
License: LGPL v2.1 or later License: LGPL v2.1 or later
Group: System/Libraries Group: System/Libraries
Version: 1.7 Version: 1.7
Release: 470 Release: 471
Requires: popt = 1.7 Requires: popt = 1.7
Requires: glibc-devel Requires: glibc-devel
@ -389,6 +389,9 @@ Authors:
%doc %{_mandir}/man3/popt.3* %doc %{_mandir}/man3/popt.3*
%changelog %changelog
* Mon Jan 05 2009 mmarek@suse.cz
- findksyms.diff: make sure that the input files for join are
sorted properly (bnc#450714)
* Fri Dec 19 2008 mls@suse.de * Fri Dec 19 2008 mls@suse.de
- add popt-devel and rpm-devel to baselibs config (bnc#445037) - add popt-devel and rpm-devel to baselibs config (bnc#445037)
* Thu Dec 11 2008 ro@suse.de * Thu Dec 11 2008 ro@suse.de