Attachment #71259 for bug #155301

View | Details | Raw Unified | Return to bug 155301
Collapse All | Expand All

Lines 1350-1355 static struct DepMsg_s depMsgs[] = { Link Here

(-)rpm-4.4.2/build/rpmfc.c (+3 lines)
1350	{ "Obsoletes", { "%{?__find_obsoletes}", NULL, NULL, NULL },	1350	{ "Obsoletes", { "%{?__find_obsoletes}", NULL, NULL, NULL },
1351	RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,	1351	RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
1352	0, -1 },	1352	0, -1 },
		1353	{ "Supplements", { "%{?__find_supplements}", NULL, NULL, NULL },
		1354	RPMTAG_ENHANCESNAME, RPMTAG_ENHANCESVERSION, RPMTAG_ENHANCESFLAGS,
		1355	0, -1 },
1353	{ NULL, { NULL, NULL, NULL, NULL }, 0, 0, 0, 0, 0 }	1356	{ NULL, { NULL, NULL, NULL, NULL }, 0, 0, 0, 0, 0 }
1354	};	1357	};
1355		1358

Lines 424-429 print (t)\ Link Here

(-)rpm-4.4.2/macros.in (+1 lines)
424	%__find_requires @RPMCONFIGDIR@/find-requires %name	424	%__find_requires @RPMCONFIGDIR@/find-requires %name
425	#%__find_conflicts ???	425	#%__find_conflicts ???
426	#%__find_obsoletes ???	426	#%__find_obsoletes ???
		427	%__find_supplements @RPMCONFIGDIR@/find-supplements %name
427		428
428	#	429	#
429	# Path to scripts to autogenerate per-interpreter package dependencies,	430	# Path to scripts to autogenerate per-interpreter package dependencies,




#!/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





#! /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

Return to bug 155301

Line 0 Link Here

(-)rpm-4.4.2/scripts/find-supplements (+15 lines)
	1	#!/bin/bash
	2
	3	# This script reads filenames from STDIN and outputs any relevant provides
	4	# information that needs to be included in the package.
	5	IFS=$'\n'
	6	filelist=($(cat))
	7
	8	#
	9	# --- Kernel module hardware identifiers
	10	# (e.g., hw(pci:v0000109Ed00000878sv00000070sd0000FF01bcsci*)
	11	[ -x /usr/lib/rpm/find-supplements.ksyms ] &&
	12	printf "%s\n" "${filelist[@]}" \| /usr/lib/rpm/find-supplements.ksyms "$@"
	13
	14	exit 0
	15

Line 0 Link Here

(-)rpm-4.4.2/scripts/find-supplements.ksyms (+20 lines)
	1	#! /bin/sh
	2
	3	IFS=$'\n'
	4
	5	case "$1" in
	6	kernel-module-*) ;; # Fedora kernel module package names start with
	7	# kernel-module.
	8	kernel-*) is_kernel_package=1 ;;
	9	esac
	10
	11	if ! [ -z "$is_kernel_package" ]; then
	12	cat > /dev/null
	13	exit 0
	14	fi
	15
	16	for module in $(grep -E '/lib/modules/.+\.ko$'); do
	17	/sbin/modinfo $module \
	18	\| sed -nr -e 's/^alias:[ \t]+([^:]+:.*)/modalias(\1)/p'
	19	done \
	20	\| sort -u