- integrate patches into upstream CVS.
This commit is contained in:
Jeremy Katz
parent
9c725c836e
commit
afe42b0556
|
|
@ -1 +1 @@
|
|||
redhat-rpm-config-8.0.45.tar.gz
|
||||
redhat-rpm-config-8.1.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,95 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# If using normal root, avoid changing anything.
|
||||
if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# If zip is not installed, we can't repack the jars.
|
||||
if [ ! -x /usr/bin/zip ]; then
|
||||
exit 0
|
||||
fi
|
||||
if [ ! -x /usr/bin/unzip ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
JARS=`find $RPM_BUILD_ROOT -type f -name \*.jar`
|
||||
if [ ! -z "$JARS" ]; then
|
||||
|
||||
# make $RPM_BUILD_ROOT/tmp if it doesn't exist
|
||||
rmtmp=0
|
||||
if [ ! -x "$RPM_BUILD_ROOT/tmp" ]; then
|
||||
mkdir -p $RPM_BUILD_ROOT/tmp
|
||||
rmtmp=1
|
||||
fi
|
||||
|
||||
# unpack every jar, set the date of the files and directories and
|
||||
# repack the jar
|
||||
for j in $JARS ; do
|
||||
JARNAME=`basename $j`
|
||||
TMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp $JARNAME.tmpdir.XXXXXXXXXX` || exit 1
|
||||
JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp $JARNAME.jardir.XXXXXXXXXX` || exit 1
|
||||
TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp $JARNAME.timeref.XXXXXXXXXX` || exit 1
|
||||
|
||||
pushd $TMPDIR > /dev/null
|
||||
/usr/bin/unzip -qq -o $j
|
||||
rm -f $j
|
||||
|
||||
# Create the directories first.
|
||||
for d in `find -type d | LC_ALL=C sort`; do
|
||||
mkdir -p $JARDIR/$d
|
||||
done
|
||||
|
||||
# Get the modtime from the newest ChangeLog. If the project
|
||||
# doesn't have a ChangeLog, Jan 1, 1970 will be used.
|
||||
DATE="1970-01-01 UTC"
|
||||
|
||||
if [ -z $_PACKAGE_BUILD_DIR ]; then
|
||||
_PACKAGE_BUILD_DIR=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION
|
||||
fi
|
||||
|
||||
if [ -d $_PACKAGE_BUILD_DIR ]; then
|
||||
CHANGELOGS=`find $_PACKAGE_BUILD_DIR -type f -name ChangeLog`
|
||||
if [ ! -z "$CHANGELOGS" ]; then
|
||||
for c in $CHANGELOGS; do
|
||||
TMPDATE=`stat -c %y $c | cut -d " " -f 1-2`
|
||||
if [ `date --date="$TMPDATE" +%s` -gt `date --date="$DATE" +%s` ]; then
|
||||
DATE="$TMPDATE"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
# move the contents over to the a new directory in order and set
|
||||
# the times.
|
||||
for f in `find -type f | LC_ALL=C sort`; do
|
||||
cp $f $JARDIR/$f
|
||||
touch --date="$DATE" $JARDIR/$f
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
# Set the times of the directories.
|
||||
touch --date="$DATE" `find $JARDIR -type d`
|
||||
|
||||
# make the jar
|
||||
pushd $JARDIR > /dev/null
|
||||
|
||||
if [ -n "`find -not -name '.'`" ]; then
|
||||
find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -q -X -9 $j -@
|
||||
else
|
||||
# Put the empty jar back
|
||||
touch $j
|
||||
fi
|
||||
popd > /dev/null
|
||||
|
||||
# Cleanup.
|
||||
rm -rf $TMPDIR
|
||||
rm -rf $JARDIR
|
||||
rm -f $TIMEREF
|
||||
done
|
||||
|
||||
# remove $RPM_BUILD_ROOT/tmp if we created it
|
||||
if [ $rmtmp -eq 1 ]; then
|
||||
rm -rf $RPM_BUILD_ROOT/tmp
|
||||
fi
|
||||
fi
|
||||
258
kmodtool
258
kmodtool
|
|
@ -1,258 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# kmodtool - Helper script for building kernel module RPMs
|
||||
# Copyright (c) 2003-2006 Ville Skyttä <ville.skytta@iki.fi>,
|
||||
# Thorsten Leemhuis <fedora@leemhuis.info>
|
||||
# Jon Masters <jcm@redhat.com>
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining
|
||||
# a copy of this software and associated documentation files (the
|
||||
# "Software"), to deal in the Software without restriction, including
|
||||
# without limitation the rights to use, copy, modify, merge, publish,
|
||||
# distribute, sublicense, and/or sell copies of the Software, and to
|
||||
# permit persons to whom the Software is furnished to do so, subject to
|
||||
# the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be
|
||||
# included in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
shopt -s extglob
|
||||
|
||||
myprog="kmodtool"
|
||||
myver="0.10.10_kmp2"
|
||||
knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)|xen)
|
||||
kmod_name=
|
||||
kver=
|
||||
verrel=
|
||||
variant=
|
||||
kmp=
|
||||
|
||||
get_verrel ()
|
||||
{
|
||||
verrel=${1:-$(uname -r)}
|
||||
verrel=${verrel%%$knownvariants}
|
||||
}
|
||||
|
||||
print_verrel ()
|
||||
{
|
||||
get_verrel $@
|
||||
echo "${verrel}"
|
||||
}
|
||||
|
||||
get_variant ()
|
||||
{
|
||||
get_verrel $@
|
||||
variant=${1:-$(uname -r)}
|
||||
variant=${variant##$verrel}
|
||||
variant=${variant:-'""'}
|
||||
}
|
||||
|
||||
print_variant ()
|
||||
{
|
||||
get_variant $@
|
||||
echo "${variant}"
|
||||
}
|
||||
|
||||
get_rpmtemplate ()
|
||||
{
|
||||
local variant="${1}"
|
||||
local dashvariant="${variant:+-${variant}}"
|
||||
case "$verrel" in
|
||||
*.el*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
|
||||
*.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
|
||||
*) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;;
|
||||
esac
|
||||
|
||||
echo "%package -n kmod-${kmod_name}${dashvariant}"
|
||||
|
||||
if [ -z "$kmp_provides_summary" ]; then
|
||||
echo "Summary: ${kmod_name} kernel module(s)"
|
||||
fi
|
||||
|
||||
if [ -z "$kmp_provides_group" ]; then
|
||||
echo "Group: System Environment/Kernel"
|
||||
fi
|
||||
|
||||
if [ ! -z "$kmp" ]; then
|
||||
echo "Version: %{kmp_version}"
|
||||
echo "Release: %{kmp_release}"
|
||||
fi
|
||||
|
||||
if [ ! -z "$kmp" ]; then
|
||||
echo "%global _use_internal_dependency_generator 0"
|
||||
fi
|
||||
|
||||
cat <<EOF
|
||||
Provides: kernel-modules = ${verrel}${variant}
|
||||
Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
EOF
|
||||
|
||||
if [ -z "$kmp" ]; then
|
||||
echo "Requires: ${kdep}"
|
||||
fi
|
||||
|
||||
cat <<EOF
|
||||
Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version}
|
||||
Requires(post): /sbin/depmod
|
||||
Requires(postun): /sbin/depmod
|
||||
EOF
|
||||
|
||||
if [ "no" != "$kmp_nobuildreqs" ]
|
||||
then
|
||||
echo "BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}"
|
||||
fi
|
||||
|
||||
if [ "" != "$kmp_override_preamble" ]
|
||||
then
|
||||
cat "$kmp_override_preamble"
|
||||
fi
|
||||
|
||||
cat <<EOF
|
||||
%description -n kmod-${kmod_name}${dashvariant}
|
||||
This package provides the ${kmod_name} kernel modules built for the Linux
|
||||
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
|
||||
%post -n kmod-${kmod_name}${dashvariant}
|
||||
if [ -e "/boot/System.map-${verrel}${variant}" ]; then
|
||||
/sbin/depmod -aeF "/boot/System.map-${verrel}${variant}" "${verrel}${variant}" > /dev/null || :
|
||||
fi
|
||||
EOF
|
||||
|
||||
if [ ! -z "$kmp" ]; then
|
||||
cat <<EOF
|
||||
modules=( \$(rpm -ql kmod-${kmod_name}${dashvariant} | grep '\.ko$') )
|
||||
if [ -x "/sbin/weak-modules" ]; then
|
||||
printf '%s\n' "\${modules[@]}" \
|
||||
| /sbin/weak-modules --add-modules
|
||||
fi
|
||||
%preun -n kmod-${kmod_name}${dashvariant}
|
||||
find /lib/modules/${verrel}${variant}/extra/${kmod_name} | grep '\.ko$' \
|
||||
> /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
cat <<EOF
|
||||
%postun -n kmod-${kmod_name}${dashvariant}
|
||||
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
|
||||
EOF
|
||||
|
||||
if [ ! -z "$kmp" ]; then
|
||||
cat <<EOF
|
||||
modules=( \$(cat /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules) )
|
||||
#rm /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules
|
||||
if [ -x "/sbin/weak-modules" ]; then
|
||||
printf '%s\n' "\${modules[@]}" \
|
||||
| /sbin/weak-modules --remove-modules
|
||||
fi
|
||||
EOF
|
||||
fi
|
||||
|
||||
echo "%files -n kmod-${kmod_name}${dashvariant}"
|
||||
|
||||
if [ "" == "$kmp_override_filelist" ];
|
||||
then
|
||||
echo "%defattr(644,root,root,755)"
|
||||
echo "/lib/modules/${verrel}${variant}/"
|
||||
else
|
||||
cat "$kmp_override_filelist"
|
||||
fi
|
||||
}
|
||||
|
||||
print_rpmtemplate ()
|
||||
{
|
||||
kmod_name="${1}"
|
||||
shift
|
||||
kver="${1}"
|
||||
get_verrel "${1}"
|
||||
shift
|
||||
if [ -z "${kmod_name}" ] ; then
|
||||
echo "Please provide the kmodule-name as first parameter." >&2
|
||||
exit 2
|
||||
elif [ -z "${kver}" ] ; then
|
||||
echo "Please provide the kver as second parameter." >&2
|
||||
exit 2
|
||||
elif [ -z "${verrel}" ] ; then
|
||||
echo "Couldn't find out the verrel." >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
for variant in "$@" ; do
|
||||
if [ "default" == "$variant" ];
|
||||
then
|
||||
get_rpmtemplate ""
|
||||
else
|
||||
get_rpmtemplate "${variant}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
usage ()
|
||||
{
|
||||
cat <<EOF
|
||||
You called: ${invocation}
|
||||
|
||||
Usage: ${myprog} <command> <option>+
|
||||
Commands:
|
||||
verrel <uname>
|
||||
- Get "base" version-release.
|
||||
variant <uname>
|
||||
- Get variant from uname.
|
||||
rpmtemplate <mainpgkname> <uname> <variants>
|
||||
- Return a template for use in a source RPM
|
||||
rpmtemplate_kmp <mainpgkname> <uname> <variants>
|
||||
- Return a template for use in a source RPM with KMP dependencies
|
||||
version
|
||||
- Output version number and exit.
|
||||
EOF
|
||||
}
|
||||
|
||||
invocation="$(basename ${0}) $@"
|
||||
while [ "${1}" ] ; do
|
||||
case "${1}" in
|
||||
verrel)
|
||||
shift
|
||||
print_verrel $@
|
||||
exit $?
|
||||
;;
|
||||
variant)
|
||||
shift
|
||||
print_variant $@
|
||||
exit $?
|
||||
;;
|
||||
rpmtemplate)
|
||||
shift
|
||||
print_rpmtemplate "$@"
|
||||
exit $?
|
||||
;;
|
||||
rpmtemplate_kmp)
|
||||
shift
|
||||
kmp=1
|
||||
print_rpmtemplate "$@"
|
||||
exit $?
|
||||
;;
|
||||
version)
|
||||
echo "${myprog} ${myver}"
|
||||
exit 0
|
||||
;;
|
||||
*)
|
||||
echo "Error: Unknown option '${1}'." >&2
|
||||
usage >&2
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Local variables:
|
||||
# mode: sh
|
||||
# sh-indentation: 2
|
||||
# indent-tabs-mode: nil
|
||||
# End:
|
||||
# ex: ts=2 sw=2 et
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
|
||||
--- redhat-rpm-config-8.0.45_orig/macros 2007-04-03 00:01:18.000000000 -0400
|
||||
+++ redhat-rpm-config-8.0.45/macros 2007-04-03 00:03:44.000000000 -0400
|
||||
@@ -8,6 +8,10 @@
|
||||
%_gnu -gnu
|
||||
%_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
|
||||
|
||||
+%fedora 8
|
||||
+%dist .fc8
|
||||
+%fc8 1
|
||||
+
|
||||
#==============================================================================
|
||||
# ---- configure macros. note that most of these are inherited
|
||||
# from the defaults.
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
diff -ruP redhat-rpm-config-8.0.45/find-provides redhat-rpm-config-8.0.45-MOD/find-provides
|
||||
--- redhat-rpm-config-8.0.45/find-provides 2006-07-30 13:57:59.000000000 -0500
|
||||
+++ redhat-rpm-config-8.0.45-MOD/find-provides 2007-02-26 10:17:14.000000000 -0600
|
||||
@@ -71,6 +71,14 @@
|
||||
echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/find-provides.libtool | sort -u
|
||||
|
||||
#
|
||||
+# --- any other extra find-provides scripts
|
||||
+for i in /usr/lib/rpm/redhat/find-provides.d/*.prov
|
||||
+do
|
||||
+ [ -x $i ] &&
|
||||
+ (echo $filelist | tr '[:blank:]' \\n | $i | sort -u)
|
||||
+done
|
||||
+
|
||||
+#
|
||||
# --- pkgconfig
|
||||
[ -x /usr/lib/rpm/redhat/find-provides.pkgconfig ] &&
|
||||
echo $filelist | tr '[:blank:]' \\n | /usr/lib/rpm/redhat/find-provides.pkgconfig | sort -u
|
||||
diff -ruP redhat-rpm-config-8.0.45/find-provides.d/modalias.prov redhat-rpm-config-8.0.45-MOD/find-provides.d/modalias.prov
|
||||
--- redhat-rpm-config-8.0.45/find-provides.d/modalias.prov 1969-12-31 18:00:00.000000000 -0600
|
||||
+++ redhat-rpm-config-8.0.45-MOD/find-provides.d/modalias.prov 2007-02-26 10:19:18.000000000 -0600
|
||||
@@ -0,0 +1,76 @@
|
||||
+#! /bin/sh
|
||||
+
|
||||
+# heavily based upon find-suggests.ksyms by Andreas Gruenbacher <agruen@suse.de>.
|
||||
+# with modifications by Michael Brown <Michael_E_Brown@dell.com>
|
||||
+#
|
||||
+# -- added module versioning info to modalias() symbols
|
||||
+# -- removed code which inspects spec files.
|
||||
+
|
||||
+IFS=$'\n'
|
||||
+
|
||||
+#
|
||||
+# Initially, dont generate modalias() lines for kernel package. This needs
|
||||
+# additional discussion. Would like to eventually add them for
|
||||
+# completeness, so that we can determine when drivers are folded into
|
||||
+# mainline kernel.
|
||||
+#
|
||||
+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
|
||||
+
|
||||
+print_modaliases() {
|
||||
+ declare class=$1 variants=$2 pos=$3
|
||||
+ if [ -n "$variants" ]; then
|
||||
+ echo "${class:0:pos}[$variants]${class:pos+1}"
|
||||
+ else
|
||||
+ [ -z "$class" ] || echo "$class"
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
+combine_modaliases() {
|
||||
+ declare tag class variants pos n
|
||||
+ read class
|
||||
+ while read tag; do
|
||||
+ for ((n=0; n<${#class}; n++)); do
|
||||
+ if [ "*" != "${class:n:1}" -a \
|
||||
+ "${class:0:n}" = "${tag:0:n}" -a \
|
||||
+ "${class:n+1}" = "${tag:n+1}" ] &&
|
||||
+ ( [ -z "$pos" ] || [ $n = $pos ] ); then
|
||||
+ variants="${variants:-${class:n:1}}${tag:n:1}"
|
||||
+ pos=$n
|
||||
+ break
|
||||
+ fi
|
||||
+ done
|
||||
+ if [ $n -eq ${#class} ]; then
|
||||
+ print_modaliases "$class" "$variants" "$pos"
|
||||
+ variants=
|
||||
+ pos=
|
||||
+ class=$tag
|
||||
+ fi
|
||||
+ done
|
||||
+ print_modaliases "$class" "$variants" "$pos"
|
||||
+}
|
||||
+
|
||||
+for module in $(grep -E '/lib/modules/.+\.ko$') $*; do
|
||||
+ # | head -n1 because some modules have *two* version tags. *cough*b44*cough*
|
||||
+ modver=$(/sbin/modinfo -F version "$module"| head -n1)
|
||||
+ modver=${modver// /_}
|
||||
+
|
||||
+ # only add version tag if it has a version
|
||||
+ if [ -n "$modver" ]; then
|
||||
+ /sbin/modinfo -F alias "$module" \
|
||||
+ | sed -nre "s,(.+),modalias(\\1) = $modver,p"
|
||||
+ else
|
||||
+ /sbin/modinfo -F alias "$module" \
|
||||
+ | sed -nre "s,(.+),modalias(\\1),p"
|
||||
+ fi
|
||||
+done \
|
||||
+| sort -u \
|
||||
+| combine_modaliases
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
diff -urNp redhat-rpm-config-8.0.45_orig/find-requires redhat-rpm-config-8.0.45/find-requires
|
||||
--- redhat-rpm-config-8.0.45_orig/find-requires 2006-07-30 14:58:01.000000000 -0400
|
||||
+++ redhat-rpm-config-8.0.45/find-requires 2007-04-03 00:00:18.000000000 -0400
|
||||
@@ -5,11 +5,6 @@
|
||||
# sonames, script interpreters, and perl modules.
|
||||
#
|
||||
|
||||
-if [ "$1" ]
|
||||
-then
|
||||
- package_name = "$1"
|
||||
-fi
|
||||
-
|
||||
ulimit -c 0
|
||||
|
||||
#
|
||||
@@ -144,21 +139,18 @@ done | sort -u
|
||||
# cheat a little here by looking first for a kernel, then for a kmod.
|
||||
#
|
||||
|
||||
-is_kmod=1
|
||||
+unset is_kmod
|
||||
+
|
||||
for f in $filelist; do
|
||||
if [ $(echo "$f" | sed -r -ne 's:^.*/lib/modules/(.*)/(.*).ko$:\2:p') ]
|
||||
then
|
||||
- is_kernel=1;
|
||||
- fi
|
||||
- if [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
|
||||
+ is_kmod=1;
|
||||
+ elif [ $(echo "$f" | sed -r -ne 's:^.*/boot/(.*):\1:p') ]
|
||||
then
|
||||
- unset is_kmod;
|
||||
+ unset is_kmod;
|
||||
+ break;
|
||||
fi
|
||||
done
|
||||
-if [ ! "$is_kernel" ] || [ "$package_name" == "kernel" ]
|
||||
-then
|
||||
- unset is_kmod
|
||||
-fi
|
||||
|
||||
[ -x /usr/lib/rpm/redhat/find-requires.ksyms ] && [ "$is_kmod" ] &&
|
||||
printf "%s\n" "${filelist[@]}" | /usr/lib/rpm/redhat/find-requires.ksyms
|
||||
diff -urNp redhat-rpm-config-8.0.45_orig/symset-table redhat-rpm-config-8.0.45/symset-table
|
||||
--- redhat-rpm-config-8.0.45_orig/symset-table 2006-06-12 22:48:59.000000000 -0400
|
||||
+++ redhat-rpm-config-8.0.45/symset-table 2007-04-03 00:00:18.000000000 -0400
|
||||
@@ -19,6 +19,11 @@ for symsets in /boot/symsets-*.tar.gz; d
|
||||
| tar xf -
|
||||
done
|
||||
|
||||
+for symsets in /usr/src/kernels/*/symsets-*.tar.gz; do
|
||||
+ zcat $symsets \
|
||||
+ | tar xf -
|
||||
+done
|
||||
+
|
||||
for symsets in *; do
|
||||
krel=${symsets#symsets-}
|
||||
for symset in $symsets/*; do
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
|
||||
--- redhat-rpm-config-8.0.45_orig/macros 2005-08-16 20:27:33.000000000 -0400
|
||||
+++ redhat-rpm-config-8.0.45/macros 2007-04-02 23:59:19.000000000 -0400
|
||||
@@ -86,6 +86,7 @@
|
||||
/usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
|
||||
/usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} \
|
||||
/usr/lib/rpm/brp-python-bytecompile \
|
||||
+ /usr/lib/rpm/redhat/brp-java-repack-jars \
|
||||
%{nil}
|
||||
|
||||
# /usr/lib/rpm/redhat/brp-implant-ident-static
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
diff -urNp redhat-rpm-config-8.0.45_orig/macros redhat-rpm-config-8.0.45/macros
|
||||
--- redhat-rpm-config-8.0.45_orig/macros 2007-04-03 00:00:03.000000000 -0400
|
||||
+++ redhat-rpm-config-8.0.45/macros 2007-04-03 00:01:18.000000000 -0400
|
||||
@@ -157,3 +157,67 @@ unset DISPLAY\
|
||||
|
||||
# Disable lookups
|
||||
%_hkp_keyserver %{nil}
|
||||
+
|
||||
+# Use these macros to differentiate between RH and other KMP implementation(s).
|
||||
+redhat_kernel_module_package 1
|
||||
+kernel_module_package_release 1
|
||||
+
|
||||
+#kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ]
|
||||
+# [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...
|
||||
+
|
||||
+%kernel_module_package_buildreqs %global kmodtool_generate_buildreqs 1 \
|
||||
+ kernel-devel
|
||||
+
|
||||
+%kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \
|
||||
+ %define kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \
|
||||
+ %define kmp_version %{-v*}%{!-v:%{version}} \
|
||||
+ %define kmp_release %{-r*}%{!-r:%{release}} \
|
||||
+ %define latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1) \
|
||||
+ %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
|
||||
+ %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \
|
||||
+ flavors="default" \
|
||||
+ if [ "i686" == "%{_target_cpu}" ] \
|
||||
+ then
|
||||
+ flavors="$flavors smp" \
|
||||
+ fi
|
||||
+ if [ "i686" == "%{_target_cpu}" ] || [ "x86_64" == "%{_target_cpu}" ] \
|
||||
+ then \
|
||||
+ xenver=$(rpm -q kernel-xen-devel-%{kverrel}|head -n 1)\
|
||||
+ kdver=$(rpm -q kernel-kdump-devel-%{kverrel}|head -n 1)\
|
||||
+ if [ "kernel-xen-devel-%{kverrel}" == "$xenver" ] \
|
||||
+ then \
|
||||
+ flavors="$flavors xen" \
|
||||
+ fi \
|
||||
+ if [ "kernel-kdump-devel-%{kverrel}" == "$kdver" ] \
|
||||
+ then \
|
||||
+ flavors="$flavors kdump" \
|
||||
+ fi \
|
||||
+ fi \
|
||||
+ if [ -z "%*" ]; then \
|
||||
+ flavors_to_build=$flavors \
|
||||
+ elif [ -z "%{-x}" ]; then \
|
||||
+ flavors_to_build="%*" \
|
||||
+ else \
|
||||
+ flavors_to_build=" $flavors "\
|
||||
+ echo "[$flavors_to_build]" >/tmp/tmp.txt
|
||||
+ for i in %* \
|
||||
+ do \
|
||||
+ flavors_to_build=${flavors_to_build//$i /}
|
||||
+ done \
|
||||
+ fi \
|
||||
+ echo "%%global flavors_to_build ${flavors_to_build:-%%nil}" \
|
||||
+ echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}-")%_target_cpu" \
|
||||
+ if [ ! -z "%{-f*}" ] \
|
||||
+ then \
|
||||
+ filelist="%{-f*}" \
|
||||
+ fi \
|
||||
+ if [ ! -z "%{-p*}" ] \
|
||||
+ then \
|
||||
+ preamble="%{-p*}" \
|
||||
+ fi \
|
||||
+ if [ -z "%{kmodtool_generate_buildreqs}" ] \
|
||||
+ then \
|
||||
+ nobuildreqs="yes" \
|
||||
+ fi \
|
||||
+ kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
|
||||
+)}
|
||||
|
|
@ -1,17 +1,10 @@
|
|||
Summary: Red Hat specific rpm configuration files.
|
||||
Name: redhat-rpm-config
|
||||
Version: 8.0.45
|
||||
Release: 16.fc8
|
||||
Version: 8.1.0
|
||||
Release: 1.fc8
|
||||
License: GPL
|
||||
Group: Development/System
|
||||
Source: redhat-rpm-config-%{version}.tar.gz
|
||||
Source1: brp-java-repack-jars
|
||||
Source2: kmodtool
|
||||
Patch0: redhat-rpm-config-java.patch
|
||||
Patch1: redhat-rpm-config-find-requires.patch
|
||||
Patch2: redhat-rpm-config-kmp.patch
|
||||
Patch3: redhat-rpm-config-fedora-version-fc71.patch
|
||||
Patch4: redhat-rpm-config-find-provides.patch
|
||||
BuildArch: noarch
|
||||
#Requires: rpmbuild(VendorConfig) <= 4.1
|
||||
#Requires: mktemp
|
||||
|
|
@ -33,15 +26,16 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm
|
|||
|
||||
# fix perms of config.{guess,sub}
|
||||
chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/config.{guess,sub}
|
||||
chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/brp*
|
||||
|
||||
(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH0})
|
||||
(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH1})
|
||||
(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH2})
|
||||
(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH3})
|
||||
(cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat ; patch -p1 -i %{PATCH4})
|
||||
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
|
||||
install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/rpm/redhat/
|
||||
chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/find-*.d/*.prov
|
||||
cat >> ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/macros << EOF
|
||||
|
||||
#
|
||||
# dist macros
|
||||
%%fedora 8
|
||||
%%dist .fc8
|
||||
%%fc8 1
|
||||
EOF
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
|
@ -51,6 +45,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%{_prefix}/lib/rpm/redhat
|
||||
|
||||
%changelog
|
||||
* Tue Jun 19 2007 Jeremy Katz <katzj@redhat.com> - 8.1.0-1.fc8
|
||||
- integrate patches into upstream CVS.
|
||||
|
||||
* Fri May 18 2007 Jesse Keating <jkeating@redhat.com> 8.0.45-16
|
||||
- Update macros for F8
|
||||
- hardcode dist in release string, as we provide it. chicken/egg.
|
||||
|
|
|
|||
Loading…
Reference in New Issue