commit kernel-source for openSUSE:Factory
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Sat Aug 1 11:17:14 CEST 2009.
--------
--- kernel-source/kernel-debug.changes 2009-07-20 20:40:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-07-30 04:06:58.000000000 +0200
@@ -1,0 +2,227 @@
+Wed Jul 29 16:00:59 CEST 2009 - tiwai@suse.de
+
+- Update config files: revert to CONFIG_SND=m and enabled again
+ CONFIG_SND_DEBUG=y
+
+-------------------------------------------------------------------
+Tue Jul 28 12:23:12 CEST 2009 - mmarek@suse.cz
+
+- Update config files: disable CONFIG_PRISM2_USB on ia64 and ppc.
+
+-------------------------------------------------------------------
+Tue Jul 28 11:21:11 CEST 2009 - mmarek@suse.cz
+
+- Update config files: disable CONFIG_FB_UDL on ia64.
+
+-------------------------------------------------------------------
+Tue Jul 28 09:54:55 CEST 2009 - jbeulich@novell.com
+
+- config.conf: Remove duplicate i386/desktop entry.
+
+-------------------------------------------------------------------
+Tue Jul 28 01:03:23 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-hda-29-Add-quirk-for-Dell-Studio-1555:
+ ALSA: hda - Add quirk for Dell Studio 1555 (bnc#525244).
+
+-------------------------------------------------------------------
+Mon Jul 27 23:57:31 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-pcm-*: ALSA PCM fixes
+- Fix/enhancement patches backported from ALSA tree
+ * patches.drivers/alsa-core-Add-new-TLV-types-for-dBwith-min-max:
+ ALSA: Add new TLV types for dBwith min/max (for usb).
+ * patches.drivers/alsa-ctxfi-*: SB X-Fi support (FATE#306935).
+ * patches.drivers/alsa-hda-*: More HD-audio fixes
+ * patches.drivers/alsa-ice-*: ICE17xx fixes
+ * patches.drivers/alsa-midi-*: MIDI fixes
+ * patches.drivers/alsa-usb-*: USB-audio/MIDI fixes
+- Remove obsoleted patches: patches.drivers/alsa-ad1984a-hp-quirks,
+ patches.drivers/alsa-ca0106-capture-bufsize-fix,
+ patches.drivers/alsa-ctxfi
+- Update config files.
+
+-------------------------------------------------------------------
+Mon Jul 27 17:06:11 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-source.spec.in, scripts/tar-up.sh: really drop
+ config-subst from the package.
+
+-------------------------------------------------------------------
+Mon Jul 27 13:43:01 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: manually create a -devel-debuginfo
+ subpackage with vmlinux.debug to fix build with new rpm. This
+ works for ix86 and x86_64, other archs might need further fixes.
+
+-------------------------------------------------------------------
+Mon Jul 27 03:04:23 CEST 2009 - jeffm@suse.de
+
+- patches.rpmify/rtl8192su-build-fix: more ia64 fixes
+
+-------------------------------------------------------------------
+Mon Jul 27 01:47:21 CEST 2009 - jeffm@suse.de
+
+- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
+
+-------------------------------------------------------------------
+Mon Jul 27 01:45:37 CEST 2009 - jeffm@suse.de
+
+- patches.rpmify/rtl8192su-build-fix: rtl8192su: compile fixes.
+
+-------------------------------------------------------------------
+Sun Jul 26 00:42:40 CEST 2009 - jeffm@suse.de
+
+- config.conf: Re-enabled trace flavor.
+
+-------------------------------------------------------------------
+Fri Jul 24 21:23:54 CEST 2009 - jeffm@suse.de
+
+- Update config files: Disabled optimize for size on i386 and x86_64
+ across all flavors.
+
+-------------------------------------------------------------------
+Fri Jul 24 21:21:08 CEST 2009 - jeffm@suse.de
+
+- Update to 2.6.31-rc4.
+
+-------------------------------------------------------------------
+Thu Jul 23 12:56:16 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: cleanup %cpu_arch_flavor definition,
+ make %symbols a variable and only use it for selecting patches.
+ Also drop the RT symbol as there are not rt patches currently.
+
+-------------------------------------------------------------------
+Thu Jul 23 11:58:25 CEST 2009 - mmarek@suse.cz
+
+- Change the s390(x) config layout so that each arch has its own
+ subdirectory, as it is done for other archs. s390/vanilla is a
+ symlink to s390x/vanilla.
+
+-------------------------------------------------------------------
+Thu Jul 23 11:21:38 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-*.spec.in, rpm/kernel-spec-macros: move some common
+ macros to kernel-spec-macros.
+
+-------------------------------------------------------------------
+Wed Jul 22 18:58:38 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-ca0106-capture-bufsize-fix: ALSA: ca0106 -
+ Fix the max capture buffer size (bnc#521890).
+
+-------------------------------------------------------------------
+Wed Jul 22 17:28:36 CEST 2009 - tiwai@suse.de
+
+- patches.drivers/alsa-ctxfi: Add SoundBlaster X-Fi support
+ (FATE#306935).
+- Update config files.
+
+-------------------------------------------------------------------
+Wed Jul 22 13:08:35 CEST 2009 - trenn@suse.de
+
+These are mainline:
+- patches.drivers/cpufreq_add_cpu_number_paramater_1.patch:
+ Delete.
+- patches.drivers/cpufreq_add_idle_microaccounting_6.patch:
+ Delete.
+- patches.drivers/cpufreq_change_load_calculation_2.patch: Delete.
+- patches.drivers/cpufreq_changes_to_get_cpu_idle_us_5.patch:
+ Delete.
+- patches.drivers/cpufreq_get_cpu_idle_time_changes_3.patch:
+ Delete.
+- patches.drivers/cpufreq_parameterize_down_differential_4.patch:
+ Delete.
+
+-------------------------------------------------------------------
+Wed Jul 22 12:57:54 CEST 2009 - trenn@suse.de
+
+These are mainline:
+- patches.arch/acpi_video_thinkpad_exclude_IGD_devices.patch:
+ Delete.
+- patches.arch/thinkpad_fingers_off_backlight_igd.patch: Delete.
+
+-------------------------------------------------------------------
+Tue Jul 21 15:38:37 CEST 2009 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: remove double-slash from include2/asm
+ symlink.
+
+-------------------------------------------------------------------
+Tue Jul 21 12:09:42 CEST 2009 - mmarek@suse.cz
+
+- config.conf, rpm/mkspec: exclude trace, kdump and ia64/debug from
+ the kernel-syms package. These flavor are often excluded in KMPs,
+ so excluding them from kernel-syms reduces useless build
+ dependencies. KMPs can buildrequire kernel-$flavor-devel
+ explicitely if desired.
+
+-------------------------------------------------------------------
+Tue Jul 21 11:57:00 CEST 2009 - mmarek@suse.cz
+
+Delete obsolete apparmor patches.
+
+- patches.apparmor/add-path_permission.diff: Delete.
+- patches.apparmor/add-security_path_permission: Delete.
+- patches.apparmor/apparmor-2.6.25.diff: Delete.
+- patches.apparmor/apparmor-audit.diff: Delete.
+- patches.apparmor/apparmor-intree.diff: Delete.
+- patches.apparmor/apparmor-lsm.diff: Delete.
+- patches.apparmor/apparmor-main.diff: Delete.
+- patches.apparmor/apparmor-misc.diff: Delete.
+- patches.apparmor/apparmor-module_interface.diff: Delete.
+- patches.apparmor/apparmor-network.diff: Delete.
+- patches.apparmor/apparmor-path_permission: Delete.
+- patches.apparmor/apparmor-ptrace-2.6.27.diff: Delete.
+- patches.apparmor/apparmor-rlimits.diff: Delete.
+- patches.apparmor/d_namespace_path.diff: Delete.
+- patches.apparmor/d_namespace_path_oops_fix.diff: Delete.
+- patches.apparmor/do_path_lookup-nameidata.diff: Delete.
+- patches.apparmor/export-security_inode_permission-for-aufs:
+ Delete.
+- patches.apparmor/file-handle-ops.diff: Delete.
+- patches.apparmor/fix-complain.diff: Delete.
+- patches.apparmor/fix-vfs_rmdir.diff: Delete.
+- patches.apparmor/fork-tracking.diff: Delete.
+- patches.apparmor/fsetattr-reintro-ATTR_FILE.diff: Delete.
+- patches.apparmor/fsetattr-restore-ia_file.diff: Delete.
+- patches.apparmor/fsetattr.diff: Delete.
+- patches.apparmor/remove_suid.diff: Delete.
+- patches.apparmor/security-create.diff: Delete.
+- patches.apparmor/security-getxattr.diff: Delete.
+- patches.apparmor/security-link.diff: Delete.
+- patches.apparmor/security-listxattr.diff: Delete.
+- patches.apparmor/security-mkdir.diff: Delete.
+- patches.apparmor/security-mknod.diff: Delete.
+- patches.apparmor/security-readlink.diff: Delete.
++++ 90 more lines (skipped)
++++ between kernel-source/kernel-debug.changes
++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
calling whatdependson for head-i586
Old:
----
config-subst
kernel-xen.changes
kernel-xen.spec
New:
----
TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS
kernel-spec-macros
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.30.2)
+# spec file for package kernel-debug (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor debug
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -127,11 +113,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -155,7 +139,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc64 x86_64
# These files are found in the kernel-source package:
@@ -190,9 +173,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -213,12 +193,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -229,7 +213,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -240,13 +224,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -317,6 +303,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -328,6 +315,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -533,7 +521,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -738,4 +726,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-default (Version 2.6.30.2)
+# spec file for package kernel-default (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor default
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-default
Summary: The Standard Kernel
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -143,11 +129,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -171,7 +155,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390x x86_64
# These files are found in the kernel-source package:
@@ -206,9 +189,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -228,12 +208,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -244,7 +228,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -255,13 +239,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -332,6 +318,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -343,6 +330,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -548,7 +536,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -751,4 +739,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-desktop.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-desktop (Version 2.6.30.2)
+# spec file for package kernel-desktop (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor desktop
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-desktop
Summary: Kernel optimized for the desktop
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -127,11 +113,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -155,7 +139,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
# These files are found in the kernel-source package:
@@ -190,9 +173,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -206,7 +186,7 @@
and has many of the features that aren't usually used on desktop machines
disabled.
-This kernel upports up to 64GB of main memory. It requires Physical
+This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
@@ -223,12 +203,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -239,7 +223,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -250,13 +234,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -327,6 +313,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -338,6 +325,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -543,7 +531,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -641,7 +629,7 @@
and has many of the features that aren't usually used on desktop machines
disabled.
-This kernel upports up to 64GB of main memory. It requires Physical
+This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
@@ -691,7 +679,7 @@
and has many of the features that aren't usually used on desktop machines
disabled.
-This kernel upports up to 64GB of main memory. It requires Physical
+This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
@@ -768,4 +756,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.30.2)
+# spec file for package kernel-kdump (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor kdump
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-kdump
Summary: kernel for kdump
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -127,11 +113,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -155,7 +139,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64
# These files are found in the kernel-source package:
@@ -190,9 +173,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -215,12 +195,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -231,7 +215,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -242,13 +226,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -319,6 +305,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -330,6 +317,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -535,7 +523,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -744,4 +732,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-pae (Version 2.6.30.2)
+# spec file for package kernel-pae (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor pae
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-pae
Summary: Kernel with PAE Support
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -131,11 +117,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -159,7 +143,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86
# These files are found in the kernel-source package:
@@ -194,9 +177,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -223,12 +203,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -239,7 +223,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -250,13 +234,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -327,6 +313,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -338,6 +325,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -543,7 +531,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -760,4 +748,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:20.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.30.2)
+# spec file for package kernel-ppc64 (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor ppc64
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-ppc64
Summary: Kernel for ppc64 Systems
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -131,11 +117,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -159,7 +143,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc ppc64
# These files are found in the kernel-source package:
@@ -194,9 +177,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -223,12 +203,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -239,7 +223,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -250,13 +234,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -327,6 +313,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -338,6 +325,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -543,7 +531,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -760,4 +748,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-ps3.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ps3 (Version 2.6.30.2)
+# spec file for package kernel-ps3 (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor ps3
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-ps3
Summary: kernel for ps3 bootloader
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -127,11 +113,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -155,7 +139,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: ppc
# These files are found in the kernel-source package:
@@ -190,9 +173,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -215,12 +195,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -231,7 +215,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -242,13 +226,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -319,6 +305,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -330,6 +317,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -535,7 +523,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -744,4 +732,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.30.2)
+# spec file for package kernel-s390 (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor s390
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-s390
Summary: The Standard Kernel
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -131,11 +117,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -159,7 +143,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390
# These files are found in the kernel-source package:
@@ -194,9 +177,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -216,12 +196,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -232,7 +216,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -243,13 +227,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -320,6 +306,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -331,6 +318,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -536,7 +524,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -739,4 +727,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.30.2)
+# spec file for package kernel-source (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,21 +18,10 @@
# norootforbuild
# icecream 0
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
%define srcversion 2.6.30
-%define patchversion 2.6.30.2
+%define patchversion 2.6.31-rc4
%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
+%include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant
%define obj_install_dir /%src_install_dir-obj
%define rpm_install_dir %buildroot%real_install_dir
@@ -40,7 +29,7 @@
Name: kernel-source
Summary: The Linux Kernel Sources
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -67,7 +56,6 @@
Source16: guards
Source21: config.conf
Source23: supported.conf
-Source30: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source37: README.SUSE
@@ -108,11 +96,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Prefix: /usr/src
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
-%define my_builddir %_builddir/%{name}-%{version}
-%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
%define do_vanilla "%variant" == ""
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.30.2)
+# spec file for package kernel-syms (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,21 +17,12 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
Name: kernel-syms
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -42,7 +33,7 @@
Url: http://www.kernel.org/
AutoReqProv: off
BuildRequires: coreutils
-%ifarch %ix86 ia64 ppc64 x86_64
+%ifarch %ix86 ppc64 x86_64
Requires: kernel-debug-devel = %version-%source_rel
%endif
%ifarch %ix86 ia64 ppc ppc64 s390x x86_64
@@ -51,9 +42,6 @@
%ifarch %ix86 x86_64
Requires: kernel-desktop-devel = %version-%source_rel
%endif
-%ifarch ppc ppc64
-Requires: kernel-kdump-devel = %version-%source_rel
-%endif
%ifarch %ix86
Requires: kernel-pae-devel = %version-%source_rel
%endif
@@ -66,12 +54,6 @@
%ifarch s390
Requires: kernel-s390-devel = %version-%source_rel
%endif
-%ifarch ia64
-Requires: kernel-trace-devel = %version-%source_rel
-%endif
-%ifarch %ix86 x86_64
-Requires: kernel-xen-devel = %version-%source_rel
-%endif
Source: README.KSYMS
Requires: kernel-source%variant = %version-%source_rel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ kernel-trace.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-trace (Version 2.6.30.2)
+# spec file for package kernel-trace (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor trace
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-trace
Summary: The Realtime Linux Kernel
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -127,11 +113,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -155,9 +139,8 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: ia64
+ExclusiveArch: %ix86 ia64 x86_64
# These files are found in the kernel-source package:
NoSource: 0
NoSource: 100
@@ -190,9 +173,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -212,12 +192,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -228,7 +212,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -239,13 +223,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -316,6 +302,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -327,6 +314,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -532,7 +520,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -735,4 +723,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.30.2)
+# spec file for package kernel-vanilla (Version 2.6.31)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,37 +17,23 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-# Don't use shell commands in build macros, this won't work outside of rpm
+%define srcversion 2.6.30
+%define patchversion 2.6.31-rc4
+%define variant %{nil}
+%include %_sourcedir/kernel-spec-macros
%define build_flavor vanilla
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion 2.6.30
-%define patchversion 2.6.30.2
-%define variant %{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
%define config_vars CONFIG_MODULES CONFIG_KMSG_IDS CONFIG_SPLIT_PACKAGE
@@ -61,7 +47,7 @@
Name: kernel-vanilla
Summary: The Standard Kernel - without any SUSE patches
-Version: 2.6.30.2
+Version: 2.6.31
Release: 1
%if %using_buildservice
%else
@@ -135,11 +121,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -163,7 +147,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 ia64 ppc ppc64 s390 s390x x86_64
# These files are found in the kernel-source package:
@@ -198,9 +181,6 @@
Obsoletes: at76_usb-kmp
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
@@ -220,12 +200,16 @@
"complete sources. Please install kernel-source-%version.src.rpm."
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
# Generate the list of modules to be marked as supported
@@ -236,7 +220,7 @@
cd linux-%srcversion
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -247,13 +231,15 @@
if [ -f %_sourcedir/localversion ] ; then
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
yes '' | make oldconfig $MAKE_ARGS
@@ -324,6 +310,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -335,6 +322,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -540,7 +528,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -743,4 +731,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+
+%source_timestamp
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ arch-symbols ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,25 @@
#!/bin/sh
+#############################################################################
+# Copyright (c) 2003-2005,2009 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
+#############################################################################
+
# With --list, list all known architectures, otherwise print the generic
# name for this architecture (or the one specified on command line).
++++++ config.conf ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:21.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:21.000000000 +0200
@@ -1,5 +1,7 @@
# Kernel configuration file selection.
-# (See series.conf for a list of symbols defined.)
+# See the arch-symbols script for a list of symbols defined.
+# -syms excludes a flavor from the kernel-syms package (vanilla is excluded
+# automatically).
#
# IMPORTANT: the subdirectory names map to cpuarch
@@ -10,27 +12,27 @@
+i386 i386/desktop
+i386 i386/pae
+i386 i386/debug
-+i386 i386/xen
++i386 - i386/xen
+i386 i386/vanilla
-+i386 - i386/trace
++i386 -syms i386/trace
+ia64 ia64/default
-+ia64 ia64/debug
++ia64 -syms ia64/debug
+ia64 ia64/vanilla
-+ia64 ia64/trace
++ia64 -syms ia64/trace
+x86_64 x86_64/default
+x86_64 x86_64/desktop
-+x86_64 x86_64/xen
++x86_64 - x86_64/xen
+x86_64 x86_64/debug
+x86_64 x86_64/vanilla
-+x86_64 - x86_64/trace
++x86_64 -syms x86_64/trace
# openSuSE:
# G3 G4 bPlan
+ppc ppc/default
# pSeries
-+ppc ppc/kdump
++ppc -syms ppc/kdump
# G5 PS3 pSeries
+ppc ppc/ppc64
# PS3 bootloader
@@ -45,7 +47,7 @@
# supporting 32bit and 64bit systems.
+ppc64 ppc64/default
# pSeries
-+ppc64 ppc64/kdump
++ppc64 -syms ppc64/kdump
# G5 pSeries
+ppc64 ppc64/ppc64
+ppc64 ppc64/debug
@@ -53,6 +55,6 @@
+ppc64 ppc64/vanilla
+s390 s390/s390
-+s390x s390/default
+s390 s390/vanilla
-+s390x s390/vanilla
++s390x s390x/default
++s390x s390x/vanilla
++++++ config.tar.bz2 ++++++
++++ 30387 lines of diff (skipped)
++++++ guards ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:22.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:22.000000000 +0200
@@ -1,5 +1,23 @@
#!/usr/bin/perl -w
-
+#############################################################################
+# Copyright (c) 2003-2007,2009 Novell, Inc.
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail,
+# you may find current contact information at www.novell.com
+#############################################################################
#
# Guards:
#
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:22.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:22.000000000 +0200
@@ -17,44 +17,28 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
+%define srcversion @SRCVERSION@
+%define patchversion @PATCHVERSION@
+%define variant @VARIANT@%{nil}
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
+%include %_sourcedir/kernel-spec-macros
-# Don't use shell commands in build macros, this won't work outside of rpm
%define build_flavor @FLAVOR@
%define build_kdump (%build_flavor == "kdump")
%define build_xen (%build_flavor == "xen")
%define build_vanilla (%build_flavor == "vanilla")
%define build_ps3 (%build_flavor == "ps3")
-%define srcversion @SRCVERSION@
-%define patchversion @PATCHVERSION@
-%define variant @VARIANT@%{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
-
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
%define obj_install_dir %src_install_dir-obj
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-obj
-%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,config-subst,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
+%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,built-in-where,modversions,symsets.pl,split-modules})
-%define arch_symbols %(%_sourcedir/arch-symbols %_target_cpu)
-%define symbols %(set -- %name kernel-%build_flavor $(case %build_flavor in (rt|rt_*) echo RT ;; esac) $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
-%define cpu_arch_flavor %{expand:%(%_sourcedir/guards %symbols %arch_symbols < %_sourcedir/config.conf | grep '/%build_flavor$')}
-%define cpu_arch %(var=%cpu_arch_flavor ; echo ${var%/*})
+%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
+%define cpu_arch_flavor %cpu_arch/%build_flavor
# Define some CONFIG variables as rpm macros as well. (rpm cannot handle
# defining them all at once.)
@@ -141,11 +125,9 @@
Source12: pre.sh
Source13: post.sh
Source20: series.conf
-Source21: config.conf
Source22: supported.conf
Source30: arch-symbols
Source31: guards
-Source32: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source40: source-timestamp
@@ -169,7 +151,6 @@
Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
-%define my_builddir %_builddir/%{name}-%{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: @ARCHS@
@@ -207,10 +188,6 @@
Obsoletes: pcc-acpi-kmp
Obsoletes: btusb-kmp
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
-
# Provide the exported symbols as "ksym(symbol) = hash"
%define __find_provides %_sourcedir/find-provides %name
@@ -233,7 +210,11 @@
exit 1
fi
-echo "Symbol(s):" %symbols
+SYMBOLS=%name
+if test -e %_sourcedir/extra-symbols; then
+ SYMBOLS="$SYMBOLS $(cat %_sourcedir/extra-symbols)"
+fi
+echo "Symbol(s):" $SYMBOLS
# Unpack all sources and patches
%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120
@@ -241,7 +222,7 @@
mkdir -p %kernel_build_dir
supported_conf() {
- %_sourcedir/guards %symbols $* < %_sourcedir/supported.conf | \
+ %_sourcedir/guards $* < %_sourcedir/supported.conf | \
sed 's,.*/,,; s,\.ko$,,' | sort -u
}
@@ -255,7 +236,7 @@
# Apply patches
echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh
-%_sourcedir/guards %symbols <%_sourcedir/series.conf | \
+%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \
%if %build_vanilla
egrep '^patches\.(kernel\.org|rpmify)/' | \
%endif
@@ -269,13 +250,15 @@
cat %_sourcedir/localversion > localversion
fi
-cat ../config/%cpu_arch_flavor \
-| %_sourcedir/config-subst CONFIG_LOCALVERSION '"'-%release_major-%build_flavor'"' \
-| %_sourcedir/config-subst CONFIG_SUSE_KERNEL y \
+cp ../config/%cpu_arch_flavor .config
+%build_src_dir/scripts/config \
+ --set-str CONFIG_LOCALVERSION -%release_major-%build_flavor \
+ --enable CONFIG_SUSE_KERNEL \
%if 0%{?__debug_package:1}
- | %_sourcedir/config-subst CONFIG_DEBUG_INFO y \
+ --enable CONFIG_DEBUG_INFO
+%else
+ --disable CONFIG_DEBUG_INFO
%endif
- > .config
MAKE_ARGS="$MAKE_ARGS -C %build_src_dir O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
@@ -362,6 +345,7 @@
cp vmlinux %buildroot/$vmlinux
/usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \
-l vmlinux.sourcefiles %buildroot/$vmlinux
+ # FIXME: create and package build-id symlinks
objcopy --only-keep-debug \
%buildroot/$vmlinux \
%buildroot/$vmlinux_debug || :
@@ -373,6 +357,7 @@
| ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug )
find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755
find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644
+ echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files
%else
cp vmlinux %buildroot/$vmlinux
%endif
@@ -603,7 +588,7 @@
%rpm_install_dir/%cpu_arch_flavor/Makefile
link=%rpm_install_dir/%cpu_arch_flavor/include2/asm
target=$(readlink "$link")
- target=${target#%build_src_dir}
+ target=${target#%build_src_dir/}
rm "$link"
ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link"
fi
@@ -801,4 +786,17 @@
%endif
%endif
+%package devel-debuginfo
+# rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz
+Summary: Debug information for package %name-devel
+License: GPL v2 only
+Group: Development/Debug
+
+%description devel-debuginfo
+Debug information for package %name-devel
+
+%source_timestamp
+
+%files devel-debuginfo -f vmlinux.debug.files
+
%changelog
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:23.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:23.000000000 +0200
@@ -18,25 +18,11 @@
# norootforbuild
# icecream 0
-
-%define using_buildservice 0%{?opensuse_bs}
-
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-
%define srcversion @SRCVERSION@
%define patchversion @PATCHVERSION@
%define variant @VARIANT@%{nil}
-%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
-%define kernelrelease %patchversion-%release_major
+
+%include %_sourcedir/kernel-spec-macros
%define src_install_dir usr/src/linux-%kernelrelease%variant
%define obj_install_dir /%src_install_dir-obj
@@ -74,7 +60,6 @@
Source16: guards
Source21: config.conf
Source23: supported.conf
-Source30: config-subst
Source33: check-for-config-changes
Source34: check-supported-list
Source37: README.SUSE
@@ -116,13 +101,7 @@
BuildArch: noarch
Prefix: /usr/src
-# Build with bash instead of sh as the shell: this turns on bash
-# extensions like <(...).
-%define _buildshell /bin/bash
-
-%define my_builddir %_builddir/%{name}-%{version}
-
-%(chmod +x %_sourcedir/{guards,config-subst,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
+%(chmod +x %_sourcedir/{guards,check-for-config-changes,symsets.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
++++++ kernel-spec-macros ++++++
# This file is included by all the kernel-*.spec files
# Build with bash instead of sh as the shell: this turns on bash
# extensions like <(...).
%define _buildshell /bin/bash
%define using_buildservice 0%{?opensuse_bs}
%define source_rel %release
%if %using_buildservice
# The last digit is a volatile rebuild counter, strip it
%define source_rel %(release=%release; echo ${release%.*})
%endif
%define release_major %(rel="%source_rel" ; echo "${rel##[^0-9]*.}")
%define kernelrelease %patchversion-%release_major
%define my_builddir %_builddir/%{name}-%{version}
# macro to add the source timestamp to package descriptions
%define source_timestamp %(sed '1s/^/Source Timestamp: /' %_sourcedir/source-timestamp || :)
# vim: ft=spec
++++++ kernel-syms.spec.in ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:23.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:23.000000000 +0200
@@ -17,21 +17,10 @@
# norootforbuild
-%define using_buildservice 0%{?opensuse_bs}
-
-%if %using_buildservice
-# Strip off the build number ("y") from the "x.y" release number
-%define source_rel %(release=%release; echo ${release%.*})
-%else
-# We don't have build numbers internally
-%define source_rel %release
-%endif
-
-# macro to add the source timestamp to package descriptions
-%define source_timestamp %(sed '1s/^/Source timestamp: /' %_sourcedir/source-timestamp || :)
-
%define variant @VARIANT@%{nil}
+%include %_sourcedir/kernel-spec-macros
+
Name: kernel-syms@VARIANT@
Summary: Kernel Symbol Versions (modversions)
Version: @RPMVERSION@
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:24.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:24.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:24.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:24.000000000 +0200
@@ -17,6 +17,8 @@
# flavor -> [supported archs]
my %flavor_archs = parse_config_conf();
+# subset to include in kernel-syms
+my %syms_flavor_archs = parse_config_conf("syms");
# template name -> template body
my %templates = read_spec_templates();
@@ -59,7 +61,6 @@
# binary spec files
for my $flavor (sort keys(%flavor_archs)) {
- $flavor_archs{$flavor} = [sort @{$flavor_archs{$flavor}}];
my ($summary, $description);
if (!exists($binary_descriptions{"kernel-$flavor"})) {
print STDERR "warning: no description for kernel-$flavor found\n";
@@ -84,9 +85,9 @@
# kernel-syms.spec
{
my $requires = "";
- for my $flavor (sort keys(%flavor_archs)) {
+ for my $flavor (sort keys(%syms_flavor_archs)) {
next if $flavor eq "vanilla";
- my @archs = arch2rpm(@{$flavor_archs{$flavor}});
+ my @archs = arch2rpm(@{$syms_flavor_archs{$flavor}});
$requires .= "%ifarch @archs\n";
$requires .= "Requires: kernel-$flavor-devel = \%version-\%source_rel\n";
$requires .= "%endif\n";
@@ -101,10 +102,12 @@
sub parse_config_conf {
+ my @symbols = @_;
+ my $symbols = join(' ', @symbols);
my %res;
for my $arch (split(/\s+/, `$dir/arch-symbols --list`)) {
- my @flavors = `$dir/guards $arch < $dir/config.conf`;
+ my @flavors = `$dir/guards $arch $symbols < $dir/config.conf`;
next if @flavors == 0;
chomp @flavors;
@flavors = map { s/.*\///; $_ } @flavors;
@@ -113,6 +116,9 @@
push(@{$res{$flavor}}, $arch);
}
}
+ for my $flavor (keys(%res)) {
+ $res{$flavor} = [sort @{$res{$flavor}}];
+ }
return %res;
}
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:25.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ package-descriptions ++++++
--- /var/tmp/diff_new_pack.5bG3L3/_old 2009-08-01 11:13:25.000000000 +0200
+++ /var/tmp/diff_new_pack.5bG3L3/_new 2009-08-01 11:13:25.000000000 +0200
@@ -27,7 +27,7 @@
and has many of the features that aren't usually used on desktop machines
disabled.
-This kernel upports up to 64GB of main memory. It requires Physical
+This kernel supports up to 64GB of main memory. It requires Physical
Addressing Extensions (PAE), which were introduced with the Pentium Pro
processor.
++++++ patches.apparmor.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor.diff new/patches.apparmor/apparmor.diff
--- old/patches.apparmor/apparmor.diff 2009-07-17 17:11:44.000000000 +0200
+++ new/patches.apparmor/apparmor.diff 2009-07-17 17:10:26.000000000 +0200
@@ -10,7 +10,7 @@
---
include/linux/audit.h | 10
- security/Kconfig | 1
+ security/Kconfig | 10
security/Makefile | 2
security/apparmor/Kconfig | 53 +
security/apparmor/Makefile | 24
@@ -47,7 +47,7 @@
security/apparmor/procattr.c | 117 ++
security/apparmor/resource.c | 104 ++
security/apparmor/sid.c | 111 ++
- 38 files changed, 7106 insertions(+), 1 deletion(-)
+ 38 files changed, 7115 insertions(+), 1 deletion(-)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -77,7 +77,7 @@
#define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */
--- a/security/Kconfig
+++ b/security/Kconfig
-@@ -136,6 +136,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
+@@ -116,6 +125,7 @@ config SECURITY_ROOTPLUG
source security/selinux/Kconfig
source security/smack/Kconfig
source security/tomoyo/Kconfig
@@ -95,9 +95,9 @@
# always enable default capabilities
obj-y += commoncap.o
-@@ -17,6 +18,7 @@ obj-$(CONFIG_SECURITYFS) += inode.o
- obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
- obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o
+@@ -20,6 +21,7 @@ ifeq ($(CONFIG_AUDIT),y)
+ obj-$(CONFIG_SECURITY_SMACK) += lsm_audit.o
+ endif
obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o
+obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
@@ -7221,8 +7221,8 @@
+ */
+
+#include
participants (1)
-
root@Hilbert.suse.de