On Oct 10 2007 22:47, Jan Engelhardt wrote:
On Oct 10 2007 11:33, Greg KH wrote:
As 2.6.23 is now out, should we branch the 10.3 kernel tree from HEAD
now? I think I'll be doing at least one more 2.6.22-stable release,
which we should probably apply to the 10.3 kernel and push that out when
it happens, but we should also work on moving on to 2.6.23.
Any thoughts?
Yup, do 2.6.22.10 for 10.3,
fix the root hole[1] in 10.2,
then move on :-)
[1] 176df2457ef6207156ca1a40991c54ca01fef567
Hm, while we are at it, could the specfiles be changed per the suggestion of
http://lists.opensuse.org/opensuse-packaging/2007-10/msg00024.html ?
See this patch..
diff -dpru 165.1/kernel-default.spec new/kernel-default.spec
--- 165.1/kernel-default.spec 2007-10-10 22:59:01.899393000 +0200
+++ new/kernel-default.spec 2007-10-10 23:04:38.015522193 +0200
@@ -37,7 +37,7 @@
%define build_vanilla 1
%endif
-Name: kernel-default
+Name: kernel-%build_flavor
Summary: Dummy summary
Version: 2.6.22.9
Release: 0
@@ -88,8 +88,8 @@ Requires: irqbalance
Requires: xen >= xen-3.0.2_09697
#!BuildIgnore: xen
%endif
-Provides: kernel-default-nongpl
-Obsoletes: kernel-default-nongpl
+Provides: %name-nongpl
+Obsoletes: %name-nongpl
Conflicts: apparmor-profiles <= 2.0.1
Conflicts: apparmor-parser <= 2.0.1
Conflicts: sysfsutils < 2.0
@@ -97,7 +97,7 @@ Conflicts: sysfsutils < 2.0
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = %version-%source_rel
%endif
%endif
%ifarch alpha
@@ -186,7 +186,7 @@ NoSource: 120
%(chmod +x %_sourcedir/{arch-symbols,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,find-provides,make-symsets,find-types,kabi-checks,install-configs})
-%define symbols %(set -- kernel-default default $(case default in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
+%define symbols %(set -- kernel-%build_flavor %build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $(%_sourcedir/arch-symbols %_target_cpu) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
@@ -205,8 +205,8 @@ Dummy description.
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-default-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The %name-%version.nosrc.rpm package does not contain the" \
+ "complete sources. Please install %name-%version.src.rpm."
exit 1
fi
@@ -235,7 +235,7 @@ cd linux-2.6.22
# tells us for which architecture to compile.
set -- $(
for config in $(%_sourcedir/guards %symbols < %_sourcedir/config.conf) ; do
- [ ${config#*/} = default ] && echo $config
+ [ ${config#*/} = %build_flavor ] && echo $config
done)
if [ $# -ne 1 ]; then
echo "$# config files found for this spec file (but one needed)" >&2
@@ -261,7 +261,7 @@ done
%endif
%_sourcedir/install-configs %_sourcedir %my_builddir %source_rel
-config=arch/$subarch/defconfig.default
+config=arch/$subarch/defconfig.%build_flavor
cat $config \
%if 0%{?__debug_package:1}
| %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
@@ -271,9 +271,9 @@ cat $config \
# We compile for this sub-architecture (i.e., machine architecture):
%if %build_um
cat > ../.rpm-defs < ../.rpm-defs <&2
exit 1
fi
@@ -440,25 +440,25 @@ add_vmlinux()
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:default:g" \
+ -e "s:@FLAVOR""@:%build_flavor:g" \
%_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:default:g" \
+ -e "s:@FLAVOR""@:%build_flavor:g" \
%_sourcedir/post.sh
) > ../post.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
- -e "s:@FLAVOR""@:default:g" \
+ -e "s:@FLAVOR""@:%build_flavor:g" \
%_sourcedir/postun.sh
) > ../postun.sh
%if %build_kdump || %build_um || %build_xen || %build_vanilla
-suffix=-default
+suffix=-%build_flavor
%endif
ln -s $image$suffix %buildroot/boot/$image$suffix
ln -s initrd$suffix %buildroot/boot/initrd$suffix
@@ -479,7 +479,7 @@ gzip -c9 < Module.symvers > %buildroot/b
# Group the exported symbols listed in symvers.gz by directory, and
# create a database of sets. Preserve exports from previous kernels
# (stored in old-symsets.tar.gz) when possible.
-old_symsets=%my_builddir/kabi/$SUBARCH/symsets-default.tar.gz
+old_symsets=%my_builddir/kabi/$SUBARCH/symsets-%build_flavor.tar.gz
[ -e $old_symsets ] || old_symsets=
( grep -v $'\tvmlinux$' Module.symvers
# Find out in which built-in.o files the exported symbols that ended
@@ -489,12 +489,12 @@ old_symsets=%my_builddir/kabi/$SUBARCH/s
%buildroot/boot/symsets-$KERNELRELEASE.tar.gz \
$old_symsets
-# Also put the resulting file in $obj_dir/$SUBARCH/default
-# so that kernel-source + kernel-default is sufficient for building
+# Also put the resulting file in $obj_dir/$SUBARCH/%build_flavor
+# so that kernel-source + kernel-%build_flavor is sufficient for building
# modules that have modversions as well.
-obj_dir=usr/src/linux-${KERNELRELEASE%%-default}-obj
-mkdir -p %buildroot/$obj_dir/$SUBARCH/default
-cp Module.symvers %buildroot/$obj_dir/$SUBARCH/default
+obj_dir=usr/src/linux-${KERNELRELEASE%%-%build_flavor}-obj
+mkdir -p %buildroot/$obj_dir/$SUBARCH/%build_flavor
+cp Module.symvers %buildroot/$obj_dir/$SUBARCH/%build_flavor
# Table of types used in exported symbols (for modversion debugging).
%_sourcedir/find-types > %buildroot/boot/symtypes-$KERNELRELEASE
@@ -523,7 +523,7 @@ fi
#
# create configfile for makedumpfile utility (see makedumpfile(8)) to
# create smaller kdump images
-CONFIGFILE=%buildroot/$obj_dir/$SUBARCH/default/makedumpfile.config
+CONFIGFILE=%buildroot/$obj_dir/$SUBARCH/%build_flavor/makedumpfile.config
makedumpfile -x %buildroot/usr/lib/debug/boot/vmlinux-$KERNELRELEASE.debug \
-g $CONFIGFILE || true # failure should not fail the build
@@ -557,9 +557,9 @@ fi
# Check for kABI changes
KABI=0
-if [ -e %my_builddir/kabi/$SUBARCH/symvers-default ]; then
+if [ -e %my_builddir/kabi/$SUBARCH/symvers-%build_flavor ]; then
%_sourcedir/kabi-checks \
- %my_builddir/kabi/$SUBARCH/symvers-default \
+ %my_builddir/kabi/$SUBARCH/symvers-%build_flavor \
Module.symvers \
%my_builddir/kabi/commonsyms \
%my_builddir/kabi/usedsyms \
@@ -568,7 +568,7 @@ fi
if [ $KABI -gt %tolerate_kabi_changes ]; then
echo "kABI changes of badness $KABI exceed the maximum allowed badness" \
"of %tolerate_kabi_changes. Please try to avoid the kABI changes."
- if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-default -a \
+ if [ ! -e %my_builddir/kabi/$SUBARCH/ignore-%build_flavor -a \
! -e %_sourcedir/IGNORE-KABI-BADNESS ]; then
echo "Create a file IGNORE-KABI-BADNESS in the kernel-source" \
"directory to build this kernel even though its badness is" \
@@ -589,9 +589,9 @@ fi
# later be installed in /usr/src/linux-2.6.22-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
-ln -s /usr/src/linux-${KERNELRELEASE%%-default} \
+ln -s /usr/src/linux-${KERNELRELEASE%%-%build_flavor} \
%buildroot/lib/modules/$KERNELRELEASE/source
-ln -s /$obj_dir/$SUBARCH/default \
+ln -s /$obj_dir/$SUBARCH/%build_flavor \
%buildroot/lib/modules/$KERNELRELEASE/build
# Abort if there are any undefined symbols
diff -dpru 165.1/kernel-source.spec new/kernel-source.spec
--- 165.1/kernel-source.spec 2007-10-10 22:59:02.329362000 +0200
+++ new/kernel-source.spec 2007-10-10 23:04:19.656826034 +0200
@@ -31,8 +31,8 @@ BuildRequires: coreutils
BuildRequires: kernel-dummy
%endif
Provides: linux
-Provides: kernel-source = 2.6.22.9-%source_rel
-%if "kernel-source" == "kernel-source"
+Provides: %name = %version-%source_rel
+%if "%name" == "kernel-source"
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
%endif
@@ -124,17 +124,17 @@ chmod -Rf a+rX,g-w,o-w .
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.22.9/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.22.9/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22.9/$patch; then
+ > %_builddir/%name-%version/kernel-source.patches
+for patch in $(< %_builddir/%name-%version/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/%name-%version/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22.9 %source_rel
+%_sourcedir/install-configs %_sourcedir %_builddir/%name-%version %source_rel
-KERNELRELEASE=2.6.22.9-%source_rel
+KERNELRELEASE=%version-%source_rel
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.22.9/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.22.9/kernel-{source,$flavor}.patches \
+ > %_builddir/%name-%version/kernel-$flavor.patches
+ diff -q %_builddir/%name-%version/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-kernel+help@opensuse.org