This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
c5dac071df
commit
55eea812d8
@ -1,7 +1,10 @@
|
||||
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
|
||||
+++ scripts/find-provides.ksyms
|
||||
@@ -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"
|
||||
+done \
|
||||
+| sort -u
|
||||
Index: scripts/find-requires.ksyms
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ scripts/find-requires.ksyms
|
||||
@@ -0,0 +1,59 @@
|
||||
@ -48,7 +49,7 @@ Index: scripts/find-requires.ksyms
|
||||
+ nm "$module"
|
||||
+ done \
|
||||
+ | sed -r -ne 's:^0*([0-9a-f]+) A __crc_(.+):\1\t\2:p' \
|
||||
+ | sort -k2 -u
|
||||
+ | sort -t $'\t' -k2 -u
|
||||
+}
|
||||
+
|
||||
+all_requires() {
|
||||
@ -59,7 +60,7 @@ Index: scripts/find-requires.ksyms
|
||||
+ | sed -r -e 's:^0x0*::' -e 's:$:\t'"$1"':'
|
||||
+ fi
|
||||
+ done \
|
||||
+ | sort -k2 -u
|
||||
+ | sort -t $'\t' -k2 -u
|
||||
+}
|
||||
+
|
||||
+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$'))
|
||||
+if [ ${#modules[@]} -gt 0 ]; then
|
||||
+ 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 <(
|
||||
+ # Filter out requirements that we fulfill ourself.
|
||||
@ -81,7 +82,7 @@ Index: scripts/find-requires.ksyms
|
||||
+ BEGIN { FS = "\t" ; OFS = "\t" }
|
||||
+ { print $3 "/" $2 "/" $1 }
|
||||
+ ' \
|
||||
+ | sort -u) \
|
||||
+ | sort -t $'\t' -k 1,1 -u) \
|
||||
+ | sort -u \
|
||||
+ | awk '
|
||||
+ { FS = "\t" ; OFS = "\t" }
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# 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
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -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: 22
|
||||
Release: 23
|
||||
Requires: rpm = %{version}
|
||||
%py_requires
|
||||
Source99: rpm.spec
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
11
rpm.spec
11
rpm.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# 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
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -27,7 +27,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions
|
||||
AutoReqProv: on
|
||||
Summary: The RPM Package Manager
|
||||
Version: 4.4.2.3
|
||||
Release: 22
|
||||
Release: 23
|
||||
Source: rpm-%{version}.tar.bz2
|
||||
Source1: RPM-HOWTO.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
|
||||
Group: System/Libraries
|
||||
Version: 1.7
|
||||
Release: 470
|
||||
Release: 471
|
||||
#
|
||||
|
||||
%description -n popt
|
||||
@ -354,7 +354,7 @@ Summary: C Library for Parsing Command Line Parameters
|
||||
License: LGPL v2.1 or later
|
||||
Group: System/Libraries
|
||||
Version: 1.7
|
||||
Release: 470
|
||||
Release: 471
|
||||
Requires: popt = 1.7
|
||||
Requires: glibc-devel
|
||||
|
||||
@ -389,6 +389,9 @@ Authors:
|
||||
%doc %{_mandir}/man3/popt.3*
|
||||
|
||||
%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
|
||||
- add popt-devel and rpm-devel to baselibs config (bnc#445037)
|
||||
* Thu Dec 11 2008 ro@suse.de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user