Attachment 71259 Details for Bug 155301

[patch] The first attempt to add a %__find_supplements script as in the attached patch didn't work.

find-supplements.diff (text/plain), 2.18 KB, created by Andreas Gruenbacher on 2006-03-04 19:34:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Gruenbacher

Created: 2006-03-04 19:34:58 UTC

Size: 2.18 KB

patch

obsolete

>Index: rpm-4.4.2/build/rpmfc.c
>===================================================================
>--- rpm-4.4.2.orig/build/rpmfc.c
>+++ rpm-4.4.2/build/rpmfc.c
>@@ -1350,6 +1350,9 @@ static struct DepMsg_s depMsgs[] = {
>   { "Obsoletes",	{ "%{?__find_obsoletes}", NULL, NULL, NULL },
> 	RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
> 	0, -1 },
>+  { "Supplements",	{ "%{?__find_supplements}", NULL, NULL, NULL },
>+	RPMTAG_ENHANCESNAME, RPMTAG_ENHANCESVERSION, RPMTAG_ENHANCESFLAGS,
>+	0, -1 },
>   { NULL,		{ NULL, NULL, NULL, NULL },	0, 0, 0, 0, 0 }
> };
> 
>Index: rpm-4.4.2/macros.in
>===================================================================
>--- rpm-4.4.2.orig/macros.in
>+++ rpm-4.4.2/macros.in
>@@ -424,6 +424,7 @@ print (t)\
> %__find_requires	@RPMCONFIGDIR@/find-requires %name
> #%__find_conflicts	???
> #%__find_obsoletes	???
>+%__find_supplements	@RPMCONFIGDIR@/find-supplements %name
> 
> #
> # Path to scripts to autogenerate per-interpreter package dependencies,
>Index: rpm-4.4.2/scripts/find-supplements
>===================================================================
>--- /dev/null
>+++ rpm-4.4.2/scripts/find-supplements
>@@ -0,0 +1,15 @@
>+#!/bin/bash
>+
>+# This script reads filenames from STDIN and outputs any relevant provides
>+# information that needs to be included in the package.
>+IFS=$'\n'
>+filelist=($(cat))
>+
>+#
>+# --- Kernel module hardware identifiers
>+# (e.g., hw(pci:v0000109Ed00000878sv00000070sd0000FF01bc*sc*i*)
>+[ -x /usr/lib/rpm/find-supplements.ksyms ] &&
>+    printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/find-supplements.ksyms "$@"
>+
>+exit 0
>+
>Index: rpm-4.4.2/scripts/find-supplements.ksyms
>===================================================================
>--- /dev/null
>+++ rpm-4.4.2/scripts/find-supplements.ksyms
>@@ -0,0 +1,20 @@
>+#! /bin/sh
>+
>+IFS=$'\n'
>+
>+case "$1" in
>+kernel-module-*)    ;; # Fedora kernel module package names start with
>+                       # kernel-module.
>+kernel-*)           is_kernel_package=1 ;;
>+esac
>+
>+if ! [ -z "$is_kernel_package" ]; then
>+    cat > /dev/null
>+    exit 0
>+fi
>+
>+for module in $(grep -E '/lib/modules/.+\.ko$'); do
>+    /sbin/modinfo $module \
>+    | sed -nr -e 's/^alias:[ \t]+([^:]+:.*)/modalias(\1)/p'
>+done \
>+| sort -u

Actions: View | Diff

Attachments on bug 155301: 71259