1
0
forked from pool/kernel-source
OBS User unknown 2009-03-24 19:26:04 +00:00 committed by Git OBS Bridge
parent f36efaf4f2
commit faafcb6f8a
39 changed files with 732 additions and 655 deletions

View File

@ -1,3 +1,3 @@
2009-03-17 12:11:53 +0100 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:97ed789c2524b22d2f246480fa0915c5377e3dc5092ad629c385fea26eeebd29 oid sha256:b052773bca87ff1f3efa11b6881b14f6d83b1fdc3169dea376fb1e9e3c92cfee
size 185132 size 185156

View File

@ -2,7 +2,6 @@
# these are updated by the spec file # these are updated by the spec file
sourcedir=${0%/*} sourcedir=${0%/*}
builddir="$sourcedir/../BUILD"
filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX) filelist=$(mktemp -t ${0##*/}.XXXXXXXXXX)
trap "rm -f $filelist" EXIT trap "rm -f $filelist" EXIT
@ -11,34 +10,19 @@ flavor=${1##*-}
/usr/lib/rpm/find-provides "$@" <"$filelist" /usr/lib/rpm/find-provides "$@" <"$filelist"
# HACK: find out what subpackage is this and just print the symsets (
# computed in %build. We need to do it this way because the provided grep '\.ko$' "$filelist" | \
# symsets are computed from the modules AND the reference symsets, which xargs -r $sourcedir/symsets.pl --list-exported-symbols;
# we don't see here. grep '/Module\.symvers$' "$filelist" | while read f; do
subpack= $sourcedir/symsets.pl --list-exported-symbols --symvers-file="$f"
done
samemodules() ) | awk -v flavor="$flavor" '
{ {
cmp -s <(sed -rn 's:.*/([^/]*\.ko)$:\1:p' "$1" | sort) \ sub(/^0x0*/, "", $1);
<(sed -rn 's:.*/([^/]*\.ko)$:\1:p' "$2" | sort) if (!$1)
} $1 = "0";
printf "ksym(%s:%s) = %s\n", flavor, $2, $1
if ! grep -q '\.ko$' "$filelist"; then }'
# no modules, no symsets
exit 0
fi
if samemodules "$builddir"/base-modules "$filelist"; then
subpack=base
elif samemodules "$builddir"/main-modules "$filelist"; then
subpack=main
elif samemodules "$builddir"/unsupported-modules "$filelist"; then
subpack=extra
else
echo "find-provides: failed to determine which subpackage is this" >&2
exit 1
fi
ls "$builddir/$subpack-symsets" | sed -rn 's/^(.+)\.([a-z0-9]{16})/kernel('$flavor':\1) = \2/p'
exit 0 exit 0

View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
prefix=rc8. prefix=
suffix= suffix=
commit=808de9df commit=4bf28205
[ -n "$suffix" ] || suffix=$2 [ -n "$suffix" ] || suffix=$2
while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do while [ "$suffix" != "${suffix#[^0-9]*.}" ]; do
suffix=${suffix#[^0-9]*.} suffix=${suffix#[^0-9]*.}

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-debug Name: kernel-debug
Summary: A Debug Version of the Kernel Summary: A Debug Version of the Kernel
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -130,7 +130,7 @@ Provides: kernel = 2.6.29-%source_rel
%endif %endif
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -213,12 +213,12 @@ Only use this kernel when investigating problems.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-debug-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-debug-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -235,12 +235,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -275,7 +275,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-debug KERNELRELEASE=2.6.29-$RELEASE-debug
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -290,7 +290,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -342,7 +342,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -501,8 +501,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \ ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \
@ -566,37 +566,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-debug.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-debug.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-debug/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -623,13 +592,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -730,8 +692,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -773,8 +735,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -802,8 +764,8 @@ Only use this kernel when investigating problems.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-debug-man %files -n kernel-debug-man
@ -812,6 +774,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-default Name: kernel-default
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -146,7 +146,7 @@ Obsoletes: k_deflt k_numa k_smp smp kernel-smp
%endif %endif
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -228,12 +228,12 @@ The standard kernel for both uniprocessor and multiprocessor systems.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-default-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-default-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -250,12 +250,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -290,7 +290,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-default KERNELRELEASE=2.6.29-$RELEASE-default
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -305,7 +305,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -357,7 +357,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -516,8 +516,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-default} \ ln -s /usr/src/linux-${KERNELRELEASE%%-default} \
@ -581,37 +581,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-default.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-default.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-default/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -638,13 +607,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -744,8 +706,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -786,8 +748,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -814,8 +776,8 @@ The standard kernel for both uniprocessor and multiprocessor systems.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-default-man %files -n kernel-default-man
@ -824,6 +786,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-kdump Name: kernel-kdump
Summary: kernel for kdump Summary: kernel for kdump
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -124,7 +124,7 @@ Provides: kernel = 2.6.29-%source_rel
%ifarch ppc64 %ifarch ppc64
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -209,12 +209,12 @@ crashed kernel.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-kdump-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-kdump-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -231,12 +231,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -271,7 +271,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-kdump KERNELRELEASE=2.6.29-$RELEASE-kdump
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -286,7 +286,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -338,7 +338,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -497,8 +497,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \ ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \
@ -562,37 +562,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-kdump.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-kdump.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-kdump/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -619,13 +588,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -728,8 +690,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -773,8 +735,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -804,8 +766,8 @@ crashed kernel.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-kdump-man %files -n kernel-kdump-man
@ -814,6 +776,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-pae Name: kernel-pae
Summary: Kernel with PAE Support Summary: Kernel with PAE Support
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -121,7 +121,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = 2.6.29-%source_rel Provides: kernel = 2.6.29-%source_rel
Provides: k_smp4G kernel-bigsmp Provides: k_smp4G kernel-bigsmp
Obsoletes: k_smp4G kernel-bigsmp Obsoletes: k_smp4G kernel-bigsmp
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -210,12 +210,12 @@ that support it, regardless of the amount of main memory.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-pae-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-pae-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -232,12 +232,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -272,7 +272,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-pae KERNELRELEASE=2.6.29-$RELEASE-pae
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -287,7 +287,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -339,7 +339,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -498,8 +498,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-pae} \ ln -s /usr/src/linux-${KERNELRELEASE%%-pae} \
@ -563,37 +563,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-pae.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-pae.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-pae/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -620,13 +589,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -733,8 +695,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -782,8 +744,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -817,8 +779,8 @@ that support it, regardless of the amount of main memory.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-pae-man %files -n kernel-pae-man
@ -827,6 +789,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-ppc64 Name: kernel-ppc64
Summary: Kernel for ppc64 Systems Summary: Kernel for ppc64 Systems
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -126,7 +126,7 @@ Obsoletes: kernel-pmac64 kernel-pseries64 kernel-iseries64
%ifarch ppc64 %ifarch ppc64
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -222,12 +222,12 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-ppc64-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-ppc64-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -244,12 +244,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -284,7 +284,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-ppc64 KERNELRELEASE=2.6.29-$RELEASE-ppc64
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -299,7 +299,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -351,7 +351,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -510,8 +510,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \ ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \
@ -575,37 +575,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-ppc64.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-ppc64.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-ppc64/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -632,13 +601,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -752,8 +714,8 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -808,8 +770,8 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -850,8 +812,8 @@ Authors:
Tom Gall <tom_gall@vnet.ibm.com> Tom Gall <tom_gall@vnet.ibm.com>
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-ppc64-man %files -n kernel-ppc64-man
@ -860,6 +822,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-ps3 Name: kernel-ps3
Summary: kernel for ps3 bootloader Summary: kernel for ps3 bootloader
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -119,7 +119,7 @@ Conflicts: lvm2 < 2.02.33
Conflicts: libc.so.6()(64bit) Conflicts: libc.so.6()(64bit)
%endif %endif
Provides: kernel = 2.6.29-%source_rel Provides: kernel = 2.6.29-%source_rel
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -204,12 +204,12 @@ final system.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-ps3-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-ps3-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -226,12 +226,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -266,7 +266,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-ps3 KERNELRELEASE=2.6.29-$RELEASE-ps3
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -281,7 +281,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -333,7 +333,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -492,8 +492,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-ps3} \ ln -s /usr/src/linux-${KERNELRELEASE%%-ps3} \
@ -557,37 +557,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-ps3.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-ps3.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-ps3/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -614,13 +583,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -720,8 +682,8 @@ needs to be as small as possible.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -762,8 +724,8 @@ needs to be as small as possible.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -793,8 +755,8 @@ final system.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-ps3-man %files -n kernel-ps3-man
@ -803,6 +765,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-s390 Name: kernel-s390
Summary: The Standard Kernel Summary: The Standard Kernel
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -121,7 +121,7 @@ Conflicts: libc.so.6()(64bit)
Provides: kernel = 2.6.29-%source_rel Provides: kernel = 2.6.29-%source_rel
Provides: kernel-32bit k_deflt Provides: kernel-32bit k_deflt
Obsoletes: kernel-32bit k_deflt Obsoletes: kernel-32bit k_deflt
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -203,12 +203,12 @@ The standard kernel.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-s390-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-s390-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -225,12 +225,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -265,7 +265,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-s390 KERNELRELEASE=2.6.29-$RELEASE-s390
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -280,7 +280,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -332,7 +332,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -491,8 +491,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \ ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \
@ -556,37 +556,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-s390.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-s390.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-s390/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -613,13 +582,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -719,8 +681,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -761,8 +723,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -789,8 +751,8 @@ The standard kernel.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-s390-man %files -n kernel-s390-man
@ -799,6 +761,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -30,7 +30,7 @@ Url: http://www.kernel.org/
Name: kernel-source Name: kernel-source
Summary: The Linux Kernel Sources Summary: The Linux Kernel Sources
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources
AutoReqProv: off AutoReqProv: off
@ -44,7 +44,7 @@ Provides: kernel-source = 2.6.29-%source_rel
Provides: linux lx_suse lx_sus22 lx_sus24 Provides: linux lx_suse lx_sus22 lx_sus24
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source1: source-pre.sh Source1: source-pre.sh
Source2: source-post.sh Source2: source-post.sh
Source3: kernel-source.rpmlintrc Source3: kernel-source.rpmlintrc
@ -116,13 +116,13 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "Please get a copy of linux-2.6.28.tar.bz2 from" \ echo "Please get a copy of linux-2.6.29.tar.bz2 from" \
"ftp://ftp.kernel.org/pub/linux/kernel/v2.6/." "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/."
fi fi
echo "Architecture symbol(s): %symbols" echo "Architecture symbol(s): %symbols"
@ -135,7 +135,7 @@ RELEASE=%source_rel
while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do while [ "$RELEASE" != "${RELEASE#[^0-9]*.}" ]; do
RELEASE=${RELEASE#[^0-9]*.} RELEASE=${RELEASE#[^0-9]*.}
done done
KERNELRELEASE=2.6.29-rc8-$RELEASE KERNELRELEASE=2.6.29-$RELEASE
case kernel-source in case kernel-source in
(*-rt) (*-rt)
variant=-rt variant=-rt
@ -155,9 +155,9 @@ cd $RPM_BUILD_ROOT/usr/src
ln -sf linux$variant linux$variant # dummy symlink ln -sf linux$variant linux$variant # dummy symlink
mkdir linux-obj mkdir linux-obj
# Unpack the vanilla kernel sources # Unpack the vanilla kernel sources
bzip2 -cd %_sourcedir/linux-2.6.28.tar.bz2 \ bzip2 -cd %_sourcedir/linux-2.6.29.tar.bz2 \
| tar xf - | tar xf -
mv linux-2.6.28 linux-$KERNELRELEASE$variant mv linux-2.6.29 linux-$KERNELRELEASE$variant
cd linux-$KERNELRELEASE$variant cd linux-$KERNELRELEASE$variant
chmod -x arch/arm/mach-at91/board-yl-9200.c # executable by accident (fixed in 2.6.27) chmod -x arch/arm/mach-at91/board-yl-9200.c # executable by accident (fixed in 2.6.27)
%_sourcedir/guards $variant_symbols %symbols < %_sourcedir/series.conf \ %_sourcedir/guards $variant_symbols %symbols < %_sourcedir/series.conf \
@ -291,6 +291,21 @@ done
%files -f kernel-source.files %files -f kernel-source.files
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -29,7 +29,7 @@ Url: http://www.kernel.org/
Name: kernel-syms Name: kernel-syms
Summary: Kernel Symbol Versions (modversions) Summary: Kernel Symbol Versions (modversions)
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: Development/Sources Group: Development/Sources
AutoReqProv: off AutoReqProv: off
@ -91,8 +91,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
@ -136,9 +136,6 @@ for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
cp -p $file $(dirname $RPM_BUILD_ROOT$symvers) cp -p $file $(dirname $RPM_BUILD_ROOT$symvers)
done done
done done
for symsets in /boot/symsets-*-$flavor.tar.gz; do
cp -p --parents $symsets $RPM_BUILD_ROOT/
done
for file in /lib/modules/*-$flavor/build; do for file in /lib/modules/*-$flavor/build; do
cp -pd --parents $file $RPM_BUILD_ROOT/ cp -pd --parents $file $RPM_BUILD_ROOT/
done done
@ -147,10 +144,24 @@ done
%files %files
%defattr(-, root, root) %defattr(-, root, root)
/usr/src/linux-*-obj /usr/src/linux-*-obj
/boot/symsets-*-*.tar.gz
/lib/modules/*/build /lib/modules/*/build
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-trace Name: kernel-trace
Summary: The Realtime Linux Kernel Summary: The Realtime Linux Kernel
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -127,7 +127,7 @@ Provides: kernel = 2.6.29-%source_rel
%endif %endif
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -215,12 +215,12 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-trace-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-trace-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -237,12 +237,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -277,7 +277,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-trace KERNELRELEASE=2.6.29-$RELEASE-trace
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -292,7 +292,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -344,7 +344,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -503,8 +503,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-trace} \ ln -s /usr/src/linux-${KERNELRELEASE%%-trace} \
@ -568,37 +568,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-trace.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-trace.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-trace/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -625,13 +594,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -735,8 +697,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -781,8 +743,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -815,8 +777,8 @@ Authors:
see /usr/src/linux/CREDITS for more details. see /usr/src/linux/CREDITS for more details.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-trace-man %files -n kernel-trace-man
@ -825,6 +787,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-vanilla Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.29 Version: 2.6.29
Release: 5 Release: 6
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -143,7 +143,7 @@ Obsoletes: kernel-64bit k_deflt
%endif %endif
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -225,12 +225,12 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-vanilla-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-vanilla-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -247,12 +247,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -287,7 +287,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-vanilla KERNELRELEASE=2.6.29-$RELEASE-vanilla
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -302,7 +302,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -354,7 +354,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -513,8 +513,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-vanilla} \ ln -s /usr/src/linux-${KERNELRELEASE%%-vanilla} \
@ -578,37 +578,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-vanilla.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-vanilla.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-vanilla/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -635,13 +604,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -739,8 +701,8 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -779,8 +741,8 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -807,8 +769,8 @@ The standard kernel - without any SUSE patches
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-vanilla-man %files -n kernel-vanilla-man
@ -817,6 +779,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Mar 24 15:37:54 CET 2009 - jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
-------------------------------------------------------------------
Fri Mar 20 09:41:41 CET 2009 - jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
-------------------------------------------------------------------
Wed Mar 18 15:10:32 CET 2009 - mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
-------------------------------------------------------------------
Tue Mar 17 16:14:08 CET 2009 - mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de Tue Mar 17 07:56:40 CET 2009 - knikanth@suse.de

View File

@ -63,7 +63,7 @@
Name: kernel-xen Name: kernel-xen
Summary: The Xen Kernel Summary: The Xen Kernel
Version: 2.6.29 Version: 2.6.29
Release: 3 Release: 4
License: GPL v2 only License: GPL v2 only
Group: System/Kernel Group: System/Kernel
Url: http://www.kernel.org/ Url: http://www.kernel.org/
@ -124,7 +124,7 @@ Provides: kernel = 2.6.29-%source_rel
%ifarch x86_64 %ifarch x86_64
%endif %endif
%endif %endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2
Source10: preun.sh Source10: preun.sh
Source11: postun.sh Source11: postun.sh
Source12: pre.sh Source12: pre.sh
@ -209,12 +209,12 @@ unprivileged ("xenU") kernel.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%prep %prep
if ! [ -e %_sourcedir/linux-2.6.28.tar.bz2 ]; then if ! [ -e %_sourcedir/linux-2.6.29.tar.bz2 ]; then
echo "The kernel-xen-2.6.29.nosrc.rpm package does not contain the" \ echo "The kernel-xen-2.6.29.nosrc.rpm package does not contain the" \
"complete sources. Please install kernel-source-2.6.29.src.rpm." "complete sources. Please install kernel-source-2.6.29.src.rpm."
exit 1 exit 1
@ -231,12 +231,12 @@ supported_conf() {
comm -2 -3 <(supported_conf base $how) <(supported_conf base) \ comm -2 -3 <(supported_conf base $how) <(supported_conf base) \
| sed -e 's:$: '"$how"':' | sed -e 's:$: '"$how"':'
done done
} | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.28/Module.supported } | sed -e 's,.*/,,' -e 's,\.ko$,,' > linux-2.6.29/Module.supported
# Create grep pattern file for the modules to end up in the base package # Create grep pattern file for the modules to end up in the base package
comm -2 -3 <(supported_conf base) <(supported_conf) \ comm -2 -3 <(supported_conf base) <(supported_conf) \
| sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \ | sed -e 's:.*/::' -e 's:^:\\/:' -e 's:$:\.ko$:' \
> %my_builddir/grep-for-base-modules > %my_builddir/grep-for-base-modules
cd linux-2.6.28 cd linux-2.6.29
# Apply the patches needed for this architecture. # Apply the patches needed for this architecture.
%if ! %build_vanilla %if ! %build_vanilla
for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do for patch in $(%_sourcedir/guards %symbols < %_sourcedir/series.conf); do
@ -271,7 +271,7 @@ cat ../config/%cpu_arch_flavor \
cpu_arch_flavor="%cpu_arch_flavor" cpu_arch_flavor="%cpu_arch_flavor"
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
cpu_arch=${cpu_arch_flavor%/*} cpu_arch=${cpu_arch_flavor%/*}
KERNELRELEASE=2.6.29-rc8-$RELEASE-xen KERNELRELEASE=2.6.29-$RELEASE-xen
EOF EOF
%if 0%{?__debug_package:1} %if 0%{?__debug_package:1}
cat >> ../.rpm-defs <<EOF cat >> ../.rpm-defs <<EOF
@ -286,7 +286,7 @@ chmod +x %my_builddir/find-provides
%build %build
source .rpm-defs source .rpm-defs
cd linux-2.6.28 cd linux-2.6.29
cp .config .config.orig cp .config .config.orig
%if %{tolerate_unknown_new_config_options} %if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k" MAKE_ARGS="$MAKE_ARGS -k"
@ -338,7 +338,7 @@ export NO_BRP_STRIP_DEBUG=true
# kernel-source package is installed. Don't check for stale symlinks # kernel-source package is installed. Don't check for stale symlinks
# in the brp-symlink check: # in the brp-symlink check:
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
cd linux-2.6.28 cd linux-2.6.29
mkdir %buildroot/boot mkdir %buildroot/boot
# (Could strip out non-public symbols.) # (Could strip out non-public symbols.)
cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE cp -p System.map %buildroot/boot/System.map-$KERNELRELEASE
@ -497,8 +497,8 @@ if [ $CONFIG_MODULES = y ]; then
# $(uname -m) to the ARCH directory. # $(uname -m) to the ARCH directory.
[ -e %buildroot/$obj_dir/%_target_cpu ] \ [ -e %buildroot/$obj_dir/%_target_cpu ] \
|| ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu || ln -sf $cpu_arch %buildroot/$obj_dir/%_target_cpu
# We were building in %my_builddir/linux-2.6.28, but the sources will # We were building in %my_builddir/linux-2.6.29, but the sources will
# later be installed in /usr/src/linux-2.6.28-%source_rel. Fix up the # later be installed in /usr/src/linux-2.6.29-%source_rel. Fix up the
# build symlink. # build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build} rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \ ln -s /usr/src/linux-${KERNELRELEASE%%-xen} \
@ -562,37 +562,6 @@ if [ $CONFIG_MODULES = y ]; then
( cd %buildroot ( cd %buildroot
find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n' find lib/modules/$KERNELRELEASE -type f -name '*.ko' -printf '/%%p\n'
) > %my_builddir/base-modules ) > %my_builddir/base-modules
%endif
# generate symsets
mkdir -p %my_builddir/{base,main,extra}-symsets
for f in %my_builddir/{base,main,unsupported}-modules; do
if [ -f "$f" ]; then
sed 's:^/:%buildroot/:' "$f"
fi > "$f-br"
done
reference=
if test -e %my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz; then
tar xzf %my_builddir/kabi/$cpu_arch/symsets-xen.tar.gz -C \
%my_builddir/kabi/$cpu_arch
reference="--reference %my_builddir/kabi/$cpu_arch/symsets-*-xen/"
fi
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--symvers=Module.symvers \
--modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/base-symsets
%if %split_packages
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/main-modules-br \
--required-modules=%my_builddir/base-modules-br \
--output-dir=%my_builddir/main-symsets
%_sourcedir/symsets.pl --generate-symsets \
$reference \
--modules=%my_builddir/unsupported-modules-br \
--required-modules=%my_builddir/base-modules-br \
--required-modules=%my_builddir/main-modules-br \
--output-dir=%my_builddir/extra-symsets
%endif %endif
# check for kabi changes # check for kabi changes
KABI=0 KABI=0
@ -619,13 +588,6 @@ if [ $CONFIG_MODULES = y ]; then
# Indicate the ABI badness in build result emails. # Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi fi
symsets=%my_builddir/symsets-$KERNELRELEASE
mkdir -p $symsets
find %my_builddir/{base,main,extra}-symsets -type f \
| xargs --replace='{}' cp '{}' $symsets/
tar c -C ${symsets%/*} ${symsets##*/} \
| gzip -9 \
> %buildroot/boot/symsets-$KERNELRELEASE.tar.gz
# Set up some module aliases # Set up some module aliases
install -d -m 755 %buildroot/etc/modprobe.d/ install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames \ install -m 644 %_sourcedir/module-renames \
@ -728,8 +690,8 @@ This package contains only the base modules, required in all installs.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun base -f preun-base.sh %preun base -f preun-base.sh
@ -773,8 +735,8 @@ This package contains additional modules not supported by Novell.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%preun extra -f preun-extra.sh %preun extra -f preun-extra.sh
@ -804,8 +766,8 @@ unprivileged ("xenU") kernel.
Source Timestamp: 2009-03-17 12:11:53 +0100 Source Timestamp: 2009-03-24 15:38:18 +0100
GIT Revision: 808de9df1ee94a7d2dab6b9da1bb0870c941fb28 GIT Revision: 4bf28205c0f7e5acf2f5690f0515b74f3460a7db
GIT Branch: master GIT Branch: master
%files -n kernel-xen-man %files -n kernel-xen-man
@ -814,6 +776,21 @@ GIT Branch: master
%endif %endif
%changelog %changelog
* Tue Mar 24 2009 jeffm@suse.de
- Update to 2.6.29-final.
- Eliminated 4 patches.
* Fri Mar 20 2009 jbeulich@novell.com
- Update Xen config files.
- Update Xen patches to 2.6.29-rc8 and c/s 821.
* Wed Mar 18 2009 mmarek@suse.cz
- rpm/kernel-*.spec.in, scripts/tar-up.sh: don't add "<RELEASE>"
to the release, breaks plain rpmbuild.
* Tue Mar 17 2009 mmarek@suse.cz
- rpm/kernel-binary.spec.in: don't generate symsets
- rpm/kernel-syms.spec.in: don't package symsets
- rpm/find-provides: disable symset provides
- rpm/macros.kernel-source: don't check for /boot/symsets*
(fate#305945)
* Tue Mar 17 2009 knikanth@suse.de * Tue Mar 17 2009 knikanth@suse.de
- patches.fixes/loop-barriers: Delete. - patches.fixes/loop-barriers: Delete.
- patches.fixes/loop-barriers2: Delete. - patches.fixes/loop-barriers2: Delete.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
size 52665364

3
linux-2.6.29.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
size 56579370

View File

@ -18,7 +18,6 @@
esac \ esac \
krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \ krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \
kver=${krel%%-*} \ kver=${krel%%-*} \
[ -e /boot/symsets-$kver-$flavor.tar.gz ] || continue \
flavors_to_build="$flavors_to_build $flavor" \ flavors_to_build="$flavors_to_build $flavor" \
echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name}-kmp -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} $flavor $kver" \ echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name}-kmp -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} $flavor $kver" \
done \ done \

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4e7c0d6b3a3bd1219abe2a5b16bba5e45640f4483a57b7887d58b8c04a018e73 oid sha256:1e9877a3f48c9c24cfe0e8e449d872d58df300e8957496280d7a6a8ed0562caa
size 127 size 127

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8a2fb9d88132985542a4fca1cb5a509f382509c326a53d676e44c4b1071c40b8 oid sha256:e295a4b4e94a619a8c845fe45a3b0f7addbcb38083de9ad0be241731a173dac7
size 173520 size 171727

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:12ef9ad87dcbfbf4c6eb14cd672b7f51adadc91dfe68edf979dcfeebe7eac23d oid sha256:41b2d5e56efb399ff2c0df634095fda13b3eedfc7a6bd474d8b549a058958888
size 126 size 123

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e354c9586f59bc9f459504411804d6f8d0eefef1f249ecffdc61f30b6b308004 oid sha256:5b88f274939d97cad971f5b562812a05c55e09f8d9dca3040376d433a660bd44
size 12844283 size 3708

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:764932e4aa24cd40b4e4a10e8ebdb5328e2e39afdcd664bc9d28ed7bb993f962 oid sha256:78c6e796d51f019117f663ddb136571da2911b385672a3785e399b7119a84c0a
size 125 size 124

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:133b9cde5083eca7e5450dd10b1554f496a5d2106b45bb31b79443973a64a24a oid sha256:98972db234d25f739b8205616f0c4140695ffdbafd81c1208a0ec89cab764023
size 1279147 size 1279783

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a53a5eb104a3bcb9095985e3d5a03b9c4bf5fa65876bb66ed2c6a4b0a9c23af7 oid sha256:784758af3ac07d3b19f2b01a63561ceca1d321c8c609f74057d66fa083fd9a21
size 1660575 size 1661110

View File

@ -27,14 +27,6 @@
# DO NOT MODIFY THEM! # DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem... # Send separate patches upstream if you find a problem...
######################################################## ########################################################
patches.kernel.org/patch-2.6.29-rc1
patches.kernel.org/patch-2.6.29-rc1-rc2
patches.kernel.org/patch-2.6.29-rc2-rc3
patches.kernel.org/patch-2.6.29-rc3-rc4
patches.kernel.org/patch-2.6.29-rc4-rc5
patches.kernel.org/patch-2.6.29-rc5-rc6
patches.kernel.org/patch-2.6.29-rc6-rc7
patches.kernel.org/patch-2.6.29-rc7-rc8
######################################################## ########################################################
# Build fixes that apply to the vanilla kernel too. # Build fixes that apply to the vanilla kernel too.
@ -501,11 +493,6 @@
+needs_update patches.drivers/cxgb3i-fixed-offload-array-size +needs_update patches.drivers/cxgb3i-fixed-offload-array-size
+needs_update patches.fixes/disable-lro-per-default +needs_update patches.fixes/disable-lro-per-default
patches.drivers/libfc-handle-rrq-exch-timeout.diff
patches.drivers/libfc-pass-lport-in-exch_mgr_r.diff
patches.drivers/libfc-when-rport-goes-away-re.diff
######################################################## ########################################################
# PCI and PCI hotplug # PCI and PCI hotplug
######################################################## ########################################################
@ -572,7 +559,6 @@
patches.suse/dm-mpath-queue-length-load-balancing patches.suse/dm-mpath-queue-length-load-balancing
patches.suse/dm-mpath-tracking-nr-bytes patches.suse/dm-mpath-tracking-nr-bytes
patches.suse/dm-mpath-service-time-load-balancing patches.suse/dm-mpath-service-time-load-balancing
patches.suse/dm-block-integrity
######################################################## ########################################################
# md # md
@ -784,6 +770,7 @@
patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch
patches.xen/ipv6-no-autoconf patches.xen/ipv6-no-autoconf
patches.xen/pci-reassign-resources patches.xen/pci-reassign-resources
patches.xen/pci-guestdev
patches.xen/sfc-driverlink patches.xen/sfc-driverlink
patches.xen/sfc-resource-driver patches.xen/sfc-resource-driver
patches.xen/sfc-driverlink-conditional patches.xen/sfc-driverlink-conditional
@ -806,18 +793,6 @@
patches.xen/xen3-fixup-xen patches.xen/xen3-fixup-xen
# newer changeset backports # newer changeset backports
patches.xen/735-balloon-exit.patch
patches.xen/737-kexec-free.patch
patches.xen/740-blkback-resource-leak.patch
patches.xen/746-pirq-status-page.patch
patches.xen/747-x86-undo-mfn-limit.patch
patches.xen/748-x86-ioapic-cleanup.patch
patches.xen/761-highpte.patch
patches.xen/762-xencons-hvc.patch
patches.xen/764-netback-foreign-pages.patch
patches.xen/769-evtchn-CPU-offline.patch
patches.xen/782-netback-error-handling.patch
patches.xen/791-x86-pcifront-register-pirq.patch
# changes outside arch/{i386,x86_64}/xen # changes outside arch/{i386,x86_64}/xen
patches.xen/xen3-fixup-kconfig patches.xen/xen3-fixup-kconfig
@ -841,6 +816,7 @@
patches.xen/xen3-patch-2.6.29-rc4-rc5 patches.xen/xen3-patch-2.6.29-rc4-rc5
patches.xen/xen3-patch-2.6.29-rc5-rc6 patches.xen/xen3-patch-2.6.29-rc5-rc6
patches.xen/xen3-patch-2.6.29-rc6-rc7 patches.xen/xen3-patch-2.6.29-rc6-rc7
patches.xen/xen3-patch-2.6.29-rc7-rc8
patches.xen/xen3-seccomp-disable-tsc-option patches.xen/xen3-seccomp-disable-tsc-option
patches.xen/xen3-rwlocks-enable-interrupts patches.xen/xen3-rwlocks-enable-interrupts
patches.xen/xen3-x86-mark_rodata_rw.patch patches.xen/xen3-x86-mark_rodata_rw.patch
@ -862,7 +838,6 @@
patches.xen/xen-scsifront-block-timeout-update patches.xen/xen-scsifront-block-timeout-update
patches.xen/xen-op-packet patches.xen/xen-op-packet
patches.xen/xen-blkfront-cdrom patches.xen/xen-blkfront-cdrom
patches.xen/xen-blkfront-map-sg
patches.xen/xen-sections patches.xen/xen-sections
patches.xen/xen-swiotlb-heuristics patches.xen/xen-swiotlb-heuristics
patches.xen/xen-kconfig-compat patches.xen/xen-kconfig-compat
@ -874,7 +849,6 @@
patches.xen/xen-configurable-guest-devices patches.xen/xen-configurable-guest-devices
patches.xen/xen-netback-nr-irqs patches.xen/xen-netback-nr-irqs
patches.xen/xen-netback-notify-multi patches.xen/xen-netback-notify-multi
patches.xen/xen-S3-MSI
patches.xen/xen-x86-panic-no-reboot patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback patches.xen/xen-x86-dcr-fallback
patches.xen/xen-x86-consistent-nmi patches.xen/xen-x86-consistent-nmi