Author: thomas
Date: Mon Feb 19 14:53:09 2007
New Revision: 122763
Removed:
packages/cooker/kernel-tmb/current/SOURCES/kernel-tmb-config.h
packages/cooker/kernel-tmb/current/SOURCES/kernel-tmb-mdvconfig.h
packages/cooker/kernel-tmb/current/SOURCES/kernel-tmb-merge-config.awk
Modified:
packages/cooker/kernel-tmb/current/SOURCES/README.tmb.urpmi
packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec
Log:
- fix the whole autoconf mess
dont rely on /etc/init.d/kheader and /boot/kernel.h anymore
drop all of the old autoconf hacks
drop kernel-tmb-source-stripped(-latest) rpms
introduce kernel-tmb-$flavour-headers(-latest) rpms to build 3rdparty
drivers against (survives test: make mrproper oldconfig prepare scripts)
kernel-tmb-source rpm does not include any autoconf stuff anymore
add info regarding this to README.urpmi
Modified: packages/cooker/kernel-tmb/current/SOURCES/README.tmb.urpmi
==============================================================================
--- packages/cooker/kernel-tmb/current/SOURCES/README.tmb.urpmi (original)
+++ packages/cooker/kernel-tmb/current/SOURCES/README.tmb.urpmi Mon Feb 19
14:53:09 2007
@@ -31,6 +31,16 @@
to /etc/modprobe.conf
+ !! Attention !!
+
+ Beginning from 2.6.20-4mdv the autoconf stuff has been reworked:
+ - we dont rely on /etc/init.d/kheader and /boot/kernel.h anymore
+ - dropped all of the old autoconf hacks
+ - dropped kernel-tmb-source-stripped(-latest) rpms
+ - introduced kernel-tmb-$flavour-headers(-latest) rpms to build 3rdparty
+ drivers against (survives test: make mrproper oldconfig prepare scripts)
+ - kernel-tmb-source rpm does not include any autoconf stuff anymore
+
For more info about the kernel-tmb series, check out:
http://www.iki.fi/tmb/Kernels/
Modified: packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec
==============================================================================
--- packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec (original)
+++ packages/cooker/kernel-tmb/current/SPECS/kernel-tmb.spec Mon Feb 19
14:53:09 2007
@@ -62,11 +62,10 @@
%define debug_package %{nil}
# Build defines
-%define build_kheaders 0
-%define build_debug 0
%define build_doc 0
%define build_source 1
-%define build_source_stripped 1
+%define build_headers 1
+%define build_debug 0
# Defines module preload script as done in *mm* for use in post macros
%define post_preload_file module_preload.sh
@@ -98,10 +97,10 @@
%{?_without_laptop_smp: %global build_laptop_smp 0}
%{?_without_server_up: %global build_server_up 0}
%{?_without_server_smp: %global build_server_smp 0}
-%{?_without_debug: %global build_debug 0}
%{?_without_doc: %global build_doc 0}
%{?_without_source: %global build_source 0}
-%{?_without_source_stripped: %global build_source_stripped 0}
+%{?_without_headers: %global build_headers 0}
+%{?_without_debug: %global build_debug 0}
%{?_with_desktop586_up: %global build_desktop586_up 1}
%{?_with_desktop586_smp: %global build_desktop586_smp 1}
@@ -111,12 +110,10 @@
%{?_with_laptop_smp: %global build_laptop_smp 1}
%{?_with_server_up: %global build_server_up 1}
%{?_with_server_smp: %global build_server_smp 1}
-%{?_with_debug: %global build_debug 1}
%{?_with_doc: %global build_doc 1}
%{?_with_source: %global build_source 1}
-%{?_with_source_stripped: %global build_source_stipped 1}
-
-%{?_with_kheaders: %global build_kheaders 1}
+%{?_with_headers: %global build_headers 1}
+%{?_with_debug: %global build_debug 1}
# For the .nosrc.rpm
%define build_nosrc 0
@@ -156,10 +153,6 @@
Source5: README.Mandriva_Linux_%{ktag}
Source6: README.%{ktag}.urpmi
-Source14: kernel-%{ktag}-config.h
-Source15: kernel-%{ktag}-mdvconfig.h
-Source16: kernel-%{ktag}-merge-config.awk
-
Source100: linux-%{patch_ver}.tar.bz2
Source101: linux-%{patch_ver}.tar.bz2.sign
Source102: %{kname}.patchlist
@@ -716,24 +709,262 @@
#
-# kernel-tmb-source-stripped
+# kernel-tmb-desktop586-headers
#
-%package -n %{kname}-source-stripped-%{buildrel}
+%package -n %{kname}-desktop586-headers-%{buildrel}
Version: %{fakever}
Release: %{fakerel}
Requires: glibc-devel, ncurses-devel, make, gcc, perl
-Summary: The stripped Linux source code for %{kname}-%{buildrel}
+Summary: The kernel-headers for %{kname}-desktop586-%{buildrel}
Group: Development/Kernel
Autoreqprov: no
Provides: kernel-source kernel-source-fbsplash
-Requires(pre): %{kname} = %{kverrel}
-Conflicts: %{kname}-source-%{buildrel}
+Requires(pre): %{kname}-desktop586-%{buildrel}
-%description -n %{kname}-source-stripped-%{buildrel}
-The kernel-source package contains the source code files for the %{ktag}
-Linux kernel. This is a stripped down version of the full %{kname}-source
-that only holds the kernel-headers, Makefiles, KConfig files and some needed
-binarys. This package should be sufficient to build external drivers against.
+%description -n %{kname}-desktop586-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-desktop586-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-desktop586-smp-headers
+#
+%package -n %{kname}-desktop586-smp-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-desktop586-smp-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-desktop586-smp-%{buildrel}
+
+%description -n %{kname}-desktop586-smp-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-desktop586-smp-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-desktop-headers
+#
+%package -n %{kname}-desktop-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-desktop-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-desktop-%{buildrel}
+
+%description -n %{kname}-desktop-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-desktop-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-desktop-smp-headers
+#
+%package -n %{kname}-desktop-smp-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-desktop-smp-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-desktop-smp-%{buildrel}
+
+%description -n %{kname}-desktop-smp-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-desktop-smp-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-laptop-headers
+#
+%package -n %{kname}-laptop-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-laptop-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-laptop-%{buildrel}
+
+%description -n %{kname}-laptop-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-laptop-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-laptop-smp-headers
+#
+%package -n %{kname}-laptop-smp-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-laptop-smp-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-laptop-smp-%{buildrel}
+
+%description -n %{kname}-laptop-smp-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-laptop-smp-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-server-headers
+#
+%package -n %{kname}-server-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-server-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-server-%{buildrel}
+
+%description -n %{kname}-server-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-server-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-server-smp-headers
+#
+%package -n %{kname}-server-smp-headers-%{buildrel}
+Version: %{fakever}
+Release: %{fakerel}
+Requires: glibc-devel, ncurses-devel, make, gcc, perl
+Summary: The kernel-headers for %{kname}-server-smp-%{buildrel}
+Group: Development/Kernel
+Autoreqprov: no
+Provides: kernel-source kernel-source-fbsplash
+Requires(pre): %{kname}-server-smp-%{buildrel}
+
+%description -n %{kname}-server-smp-headers-%{buildrel}
+This package contains the kernel-header files that should be enough to build
+3rdparty drivers against for use with %{kname}-server-smp-%{buildrel}.
+
+If you want to build your own kernel, you need to install the full
+%{kname}-source-%{buildrel} rpm.
%{upinfo1}
%{upinfo2}
@@ -1033,19 +1264,18 @@
#
-# kernel-tmb-source-stripped-latest: virtual rpm
+# kernel-tmb-desktop586-headers-latest: virtual rpm
#
-%package -n %{kname}-source-stripped-latest
+%package -n %{kname}-desktop586-headers-latest
Version: %{kversion}
Release: %{rpmrel}
-Summary: Virtual rpm for latest %{kname}-source
+Summary: Virtual rpm for latest %{kname}-desktop586-headers
Group: Development/Kernel
-Requires: %{kname}-source-stripped-%{buildrel}
-Conflicts: %{kname}-source-latest
+Requires: %{kname}-desktop586-headers-%{buildrel}
-%description -n %{kname}-source-stripped-latest
+%description -n %{kname}-desktop586-headers-latest
This package is a virtual rpm that aims to make sure you always have the
-latest %{kname}-source-stripped installed...
+latest %{kname}-desktop586-headers installed...
%{upinfo1}
%{upinfo2}
@@ -1062,78 +1292,261 @@
#
-# End packages - here begins build stage
+# kernel-tmb-desktop586-smp-headers-latest: virtual rpm
#
-%prep
-%setup -q -n %top_dir_name -c
+%package -n %{kname}-desktop586-smp-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-desktop586-smp-headers
+Group: Development/Kernel
+Requires: %{kname}-desktop586-smp-headers-%{buildrel}
-%setup -q -n %top_dir_name -D -T -a100
+%description -n %{kname}-desktop586-smp-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-desktop586-smp-headers installed...
-%define patches_dir ../%{patch_ver}/
+%{upinfo1}
+%{upinfo2}
-cd %src_dir
-%if %kpatch
-%patch1 -p1
-%endif
-%if %kstable
-%patch1 -p1
-%endif
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
-%{patches_dir}/scripts/apply_patches
-# FIXME: Re-add config.h to support our Autoconf
-install -m 644 %{SOURCE14} include/linux/config.h
-# PATCH END
#
-# Setup Begin
+# kernel-tmb-desktop-headers-latest: virtual rpm
#
+%package -n %{kname}-desktop-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-desktop-headers
+Group: Development/Kernel
+Requires: %{kname}-desktop-headers-%{buildrel}
-# Prepare all the variables for calling create_configs
-
-%if %build_debug
-%define debug --debug
-%else
-%define debug --no-debug
-%endif
+%description -n %{kname}-desktop-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-desktop-headers installed...
-%{patches_dir}/scripts/create_configs %debug --user_cpu="%{target_arch}"
+%{upinfo1}
+%{upinfo2}
-# make sure the kernel has the sublevel we know it has...
-LC_ALL=C perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
-# get rid of unwanted files
-find . -name '*~' -o -name '*.orig' -o -name '*.append' |xargs rm -f
+%{info10}
+%{info11}
-%if %build_kheaders
-kheaders_dirs=`echo $PWD/include/{asm-*,linux,sound}`
-pushd %build_dir
-install -d kernel-headers/
-cp -a $kheaders_dirs kernel-headers/
-tar cf kernel-headers-%{ktag}-%{buildrel}.tar kernel-headers/
-bzip2 -9f kernel-headers-%{ktag}-%{buildrel}.tar
-rm -rf kernel-headers/
-# build_kheaders
-%endif
+#
+# kernel-tmb-desktop-smp-headers-latest: virtual rpm
+#
+%package -n %{kname}-desktop-smp-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-desktop-smp-headers
+Group: Development/Kernel
+Requires: %{kname}-desktop-smp-headers-%{buildrel}
+%description -n %{kname}-desktop-smp-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-desktop-smp-headers installed...
-%build
-# Common target directories
-%define _kerneldir /usr/src/%{kname}-%{buildrel}
-%define _kdir_stripped /usr/src/%{kname}-stripped-%{buildrel}
-%define _bootdir /boot
-%define _modulesdir /lib/modules
-%define _savedheaders ../../savedheaders/
+%{upinfo1}
+%{upinfo2}
-# Directories definition needed for building
-%define temp_root %{build_dir}/temp-root
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-laptop-headers-latest: virtual rpm
+#
+%package -n %{kname}-laptop-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-laptop-headers
+Group: Development/Kernel
+Requires: %{kname}-laptop-headers-%{buildrel}
+
+%description -n %{kname}-laptop-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-laptop-headers installed...
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-laptop-smp-headers-latest: virtual rpm
+#
+%package -n %{kname}-laptop-smp-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-laptop-smp-headers
+Group: Development/Kernel
+Requires: %{kname}-laptop-smp-headers-%{buildrel}
+
+%description -n %{kname}-laptop-smp-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-laptop-smp-headers installed...
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-server-headers-latest: virtual rpm
+#
+%package -n %{kname}-server-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-server-headers
+Group: Development/Kernel
+Requires: %{kname}-server-headers-%{buildrel}
+
+%description -n %{kname}-server-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-server-headers installed...
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# kernel-tmb-server-smp-headers-latest: virtual rpm
+#
+%package -n %{kname}-server-smp-headers-latest
+Version: %{kversion}
+Release: %{rpmrel}
+Summary: Virtual rpm for latest %{kname}-server-smp-headers
+Group: Development/Kernel
+Requires: %{kname}-server-smp-headers-%{buildrel}
+
+%description -n %{kname}-server-smp-headers-latest
+This package is a virtual rpm that aims to make sure you always have the
+latest %{kname}-server-smp-headers installed...
+
+%{upinfo1}
+%{upinfo2}
+
+%{info1}
+%{info2}
+%{info3}
+%{info4}
+%{info5}
+
+%{info10}
+%{info11}
+
+
+
+#
+# End packages - here begins build stage
+#
+%prep
+%setup -q -n %top_dir_name -c
+
+%setup -q -n %top_dir_name -D -T -a100
+
+%define patches_dir ../%{patch_ver}/
+
+cd %src_dir
+%if %kpatch
+%patch1 -p1
+%endif
+%if %kstable
+%patch1 -p1
+%endif
+
+%{patches_dir}/scripts/apply_patches
+
+# PATCH END
+
+
+
+#
+# Setup Begin
+#
+
+# Prepare all the variables for calling create_configs
+
+%if %build_debug
+%define debug --debug
+%else
+%define debug --no-debug
+%endif
+
+%{patches_dir}/scripts/create_configs %debug --user_cpu="%{target_arch}"
+
+# make sure the kernel has the sublevel we know it has...
+LC_ALL=C perl -p -i -e "s/^SUBLEVEL.*/SUBLEVEL = %{sublevel}/" Makefile
+
+# get rid of unwanted files
+find . -name '*~' -o -name '*.orig' -o -name '*.append' |xargs rm -f
+
+
+
+%build
+# Common target directories
+%define _kerneldir /usr/src/%{kname}-%{buildrel}
+%define _bootdir /boot
+%define _modulesdir /lib/modules
+
+# Directories definition needed for building
+%define temp_root %{build_dir}/temp-root
%define temp_source %{temp_root}%{_kerneldir}
%define temp_boot %{temp_root}%{_bootdir}
%define temp_modules %{temp_root}%{_modulesdir}
+
PrepareKernel() {
name=$1
extension=$2
@@ -1175,25 +1588,96 @@
%smake INSTALL_MOD_PATH=%{temp_root} KERNELRELEASE=$KernelVer
modules_install
}
-
SaveHeaders() {
- headers=$1
- headers_name="`echo $headers | sed 's/-/_/g'`"
-%if %build_source
- HeadersRoot=%{temp_source}/savedheaders
- HeadersArch=$HeadersRoot/%{target_arch}/$headers
- echo "Saving hearders for $headers %{target_arch}"
-
- # deal with the kernel headers that are version specific
- install -d $HeadersArch
- install -m 644 include/linux/autoconf.h $HeadersArch/autoconf.h
- install -m 644 include/linux/version.h $HeadersArch/version.h
- install -m 644 include/linux/utsrelease.h $HeadersArch/utsrelease.h
- if [ "$headers" != "BOOT" ]; then
- grep -e " __crc_" -e " __ksymtab_" System.map >
include/linux/symtab-$headers
+ header_flavour=$1
+ header_cpu=$2
+
+ if [ "$header_cpu" = "smp-i586" ]; then
+
HeadersRoot=/usr/src/%{kname}-$header_flavour586-headers-%{buildrel}smp
+ else
+ if [ "$header_cpu" = "-i586" ]; then
+
HeadersRoot=/usr/src/%{kname}-$header_flavour586-headers-%{buildrel}
+ else
+
HeadersRoot=/usr/src/%{kname}-$header_flavour-headers-%{buildrel}$header_cpu
+ fi
fi
- echo "%{target_arch} $headers_name
%{_savedheaders}%{target_arch}/$headers/" >> $HeadersRoot/list
-%endif
+ TempHeadersRoot=%{temp_root}$HeadersRoot
+ mkdir -p $TempHeadersRoot
+ for i in $(find . -name Makefile -o -name Makefile-* -o -name
Makefile.*); do cp -R --parents $i $TempHeadersRoot;done
+ for i in $(find . -name Kconfig -o -name Kconfig.* -o -name Kbuild -o
-name Kbuild.*); do cp -R --parents $i $TempHeadersRoot;done
+ cp -fR include $TempHeadersRoot
+ cp -fR scripts $TempHeadersRoot
+ cp -fR arch/%{target_arch}/kernel/asm-offsets.{c,s}
$TempHeadersRoot/arch/%{target_arch}/kernel/
+ cp -fR .config COPYING CREDITS MAINTAINERS Module.symvers README
REPORTING-BUGS $TempHeadersRoot
+ cp -fR 3rdparty/mkbuild.pl $TempHeadersRoot/3rdparty
+ for i in alpha arm arm26 avr32 cris frv h8300 ia64 mips m32r m68k
m68knommu parisc powerpc ppc sh sh64 sparc s390 v850 xtensa; do
+ rm -rf $TempHeadersRoot/arch/$i
+ rm -rf $TempHeadersRoot/include/asm-$i
+ done
+
+ if [ "$header_cpu" != "" ]; then
+ output_header=../kernel_header_files.$header_flavour$header_cpu
+ else
+ output_header=../kernel_header_files.$header_flavour
+ fi
+ echo "%defattr(-,root,root)" > $output_header
+ echo "%dir $HeadersRoot" >> $output_header
+ echo "%dir $HeadersRoot/arch" >> $output_header
+ echo "%dir $HeadersRoot/include" >> $output_header
+ echo "$HeadersRoot/.config" >> $output_header
+ echo "$HeadersRoot/COPYING" >> $output_header
+ echo "$HeadersRoot/CREDITS" >> $output_header
+ echo "$HeadersRoot/3rdparty" >> $output_header
+ echo "$HeadersRoot/Documentation" >> $output_header
+ echo "$HeadersRoot/Kbuild" >> $output_header
+ echo "$HeadersRoot/MAINTAINERS" >> $output_header
+ echo "$HeadersRoot/Makefile" >> $output_header
+ echo "$HeadersRoot/Module.symvers" >> $output_header
+ echo "$HeadersRoot/README" >> $output_header
+ echo "$HeadersRoot/REPORTING-BUGS" >> $output_header
+ echo "$HeadersRoot/arch/i386" >> $output_header
+ echo "$HeadersRoot/arch/sparc64" >> $output_header
+ echo "$HeadersRoot/arch/um" >> $output_header
+ echo "$HeadersRoot/arch/x86_64" >> $output_header
+ echo "$HeadersRoot/block" >> $output_header
+ echo "$HeadersRoot/crypto" >> $output_header
+ echo "$HeadersRoot/drivers" >> $output_header
+ echo "$HeadersRoot/fs" >> $output_header
+ echo "$HeadersRoot/include/Kbuild" >> $output_header
+ echo "$HeadersRoot/include/acpi" >> $output_header
+ echo "$HeadersRoot/include/asm" >> $output_header
+ echo "$HeadersRoot/include/asm-generic" >> $output_header
+ echo "$HeadersRoot/include/asm-i386" >> $output_header
+ echo "$HeadersRoot/include/asm-sparc64" >> $output_header
+ echo "$HeadersRoot/include/asm-um" >> $output_header
+ echo "$HeadersRoot/include/asm-x86_64" >> $output_header
+ echo "$HeadersRoot/include/config" >> $output_header
+ echo "$HeadersRoot/include/crypto" >> $output_header
+ echo "$HeadersRoot/include/keys" >> $output_header
+ echo "$HeadersRoot/include/linux" >> $output_header
+ echo "$HeadersRoot/include/math-emu" >> $output_header
+ echo "$HeadersRoot/include/media" >> $output_header
+ echo "$HeadersRoot/include/mtd" >> $output_header
+ echo "$HeadersRoot/include/net" >> $output_header
+ echo "$HeadersRoot/include/pcmcia" >> $output_header
+ echo "$HeadersRoot/include/rdma" >> $output_header
+ echo "$HeadersRoot/include/rxrpc" >> $output_header
+ echo "$HeadersRoot/include/scsi" >> $output_header
+ echo "$HeadersRoot/include/sound" >> $output_header
+ echo "$HeadersRoot/include/video" >> $output_header
+ echo "$HeadersRoot/init" >> $output_header
+ echo "$HeadersRoot/ipc" >> $output_header
+ echo "$HeadersRoot/kernel" >> $output_header
+ echo "$HeadersRoot/lib" >> $output_header
+ echo "$HeadersRoot/mm" >> $output_header
+ echo "$HeadersRoot/net" >> $output_header
+ echo "$HeadersRoot/scripts" >> $output_header
+ echo "$HeadersRoot/security" >> $output_header
+ echo "$HeadersRoot/sound" >> $output_header
+ echo "$HeadersRoot/usr" >> $output_header
+ echo "%doc README.kernel-%{ktag}-sources" >> $output_header
+ echo "%doc README.Mandriva_Linux_%{ktag}" >> $output_header
+ echo "%doc README.urpmi" >> $output_header
}
CreateFiles() {
@@ -1225,7 +1709,9 @@
PrepareKernel $flavour$processor
%{ktag}-$flavour-%{buildrpmrel}$processor
BuildKernel %{kversion}-%{ktag}-$flavour-%{buildrpmrel}$processor
- SaveHeaders $flavour$processor
+ %if %build_headers
+ SaveHeaders $flavour $processor
+ %endif
CreateFiles $flavour $processor
}
@@ -1320,7 +1806,6 @@
# Directories definition needed for installing
%define target_source %{buildroot}%{_kerneldir}
-%define target_source_stripped %{buildroot}%{_kdir_stripped}
%define target_boot %{buildroot}%{_bootdir}
%define target_modules %{buildroot}%{_modulesdir}
@@ -1347,125 +1832,10 @@
rm -rf %{target_source}/arch/$i
rm -rf %{target_source}/include/asm-$i
done
-%ifnarch sparc64
- rm -rf %{target_source}/arch/sparc64
- rm -rf %{target_source}/include/asm-sparc64
-%endif
-
-# remove config split dir contents
-rm -rf %{target_source}/include/config/*
# other misc files
rm -f %{target_source}/{.config.old,.config.cmd}
-# Install support for autoconf
-pushd %{target_source}/include/linux ; {
-install -m 644 %{SOURCE15} rhconfig.h
-rm -rf autoconf.h version.h
-
-# Create autoconf.h file
-echo '#include <linux/rhconfig.h>' > autoconf.h
-sed 's,$,autoconf.h,' %{_savedheaders}list | awk -f %{SOURCE16} >> autoconf.h
-
-# From 2.6.18-rcX onward autoconf setup is being reworked,
-# /include/linux/autoconf.h is replaced with
-# /include/config/auto.conf and several other changes...
-# FIXME: For now use autoconf.h to create auto.conf
-grep '#' autoconf.h >>../config/auto.conf
-
-# Create version.h
-echo "#include <linux/rhconfig.h>" > version.h
-loop_cnt=0
-for i in desktop-i586 desktopsmp-i586 desktop desktopsmp laptop laptopsmp
server serversmp; do
- if [ -d %{_savedheaders}%{target_arch}/$i -a \
- -f %{_savedheaders}%{target_arch}/$i/version.h ]; then
- name=`echo $i | sed 's/-/_/g'`
- if [ $loop_cnt = 0 ]; then
- buf="#if defined(__module__$name)"
- else
- buf="#elif defined(__module__$name)"
- fi
- echo "$buf" >> version.h
- grep UTS_RELEASE %{_savedheaders}%{_arch}/$i/utsrelease.h >>
version.h
- loop_cnt=$[loop_cnt + 1]
- fi
-done
-
-#write last lines
-if [ $loop_cnt -eq 0 ]; then
- echo "You need to build at least one kernel"
- exit 1;
-fi
-echo "#else" >> version.h
-echo '#define UTS_RELEASE "'%{buildrel}tmbcustom'"' >> version.h
-echo "#endif" >> version.h
-
-# From 2.6.18-rcX onward autoconf setup is being reworked,
-# UTS_RELEASE defines in /include/linux/version.h
-# has been moved to /include/linux/utsrelease.h
-# FIXME: For now we simply duplicate the code
-rm -rf utsrelease.h
-cp version.h utsrelease.h
-
-# Any of the version.h are ok, as they only differ in the first line
-ls %{_savedheaders}%{target_arch}/*/version.h | head -n 1 | xargs grep -v
UTS_RELEASE >> version.h
-rm -rf %{_savedheaders}
-} ;
-popd
-
-
-
-#Create source-stripped tree from source
-%if %build_source_stripped
-cp -a %{target_source} %{target_source_stripped}
-
-# wipe Documentation tree
-rm -rf %{target_source_stripped}/Documentation
-
-# wipe a lot of unneeded files
-for i in 3rdparty arch block crypto drivers fs init ipc kernel lib mm net
security sound lib usr; do
- find %{target_source_stripped}/$i -iname '*.[c,h,S,y]' | xargs rm -f
- find %{target_source_stripped}/$i -iname '*.db' -o -iname '*.in' -o
-iname '*.sh' -o -iname '*.lds' | xargs rm -f
- find %{target_source_stripped}/$i -iname '*.map' -o -iname '*.old' -o
-iname '*.ppm' -o -iname '*.req' | xargs rm -f
- find %{target_source_stripped}/$i -iname '*.scr' -o -iname '*.seq' -o
-iname '*.txt' -o -iname '*.data' | xargs rm -f
- find %{target_source_stripped}/$i -iname '*.orig' -o -iname '*.start'
-o -iname '*.regions' | xargs rm -f
- find %{target_source_stripped}/$i -iname '*.c_shipped' -o -iname
'*.h_shipped' | xargs rm -f
-done
-
-# remove .gitignore files
-find %{target_source_stripped} -iname '.gitignore' | xargs rm -f
-
-# nuke misc text files
-find %{target_source_stripped} -iname 'AUTHORS' -o -iname 'ChangeLog' -o
-iname 'CHANGES' | xargs rm -f
-find %{target_source_stripped} -iname 'INTRO' -o -iname 'README' -o -iname
'TODO' -o -iname 'REPORTING-BUGS' | xargs rm -f
-
-# copy back the files needed for make mrproper oldconfig prepare
-for i in i386 x86_64; do
- cp -a %{target_source}/arch/$i/kernel/asm-offsets.c
%{target_source_stripped}/arch/$i/kernel/asm-offsets.c
-done
-mkdir -p %{target_source_stripped}/Documentation/DocBook/man
-cp %{target_source}/Documentation/DocBook/Makefile
%{target_source_stripped}/Documentation/DocBook/Makefile
-cp %{target_source}/Documentation/DocBook/man/Makefile
%{target_source_stripped}/Documentation/DocBook/man/Makefile
-cp %{target_source}/arch/i386/kernel/sigframe.h
%{target_source_stripped}/arch/i386/kernel/sigframe.h
-cp %{target_source}/3rdparty/mkbuild.pl
%{target_source_stripped}/3rdparty/mkbuild.pl
-
-# create simple README
-readout=%{target_source_stripped}/README
-echo "*" > $readout
-echo "* This is a stripped down version of:" >> $readout
-echo "*" >> $readout
-echo "* %{kname}-source-%{kverrel}" >> $readout
-echo "*" >> $readout
-echo "* Its only intended to be used to build external modules against," >>
$readout
-echo "* such as dkms, nvidia, ati, ..." >> $readout
-echo "*" >> $readout
-echo "* If you want to compile your own kernel you need to install the" >>
$readout
-echo "* above mentioned %{kname}-source rpm." >> $readout
-echo "*" >> $readout
-
-#endif %build_source_stripped
-%endif
-
#endif %build_source
%endif
@@ -1526,14 +1896,6 @@
# desktop586 scripts
%post -n %{kname}-desktop586-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/source
-fi
pushd /boot >/dev/null
if [ -L /boot/vmlinuz-%{ktag}-desktop-i586 ]; then
rm -f /boot/vmlinuz-%{ktag}-desktop-i586
@@ -1546,12 +1908,6 @@
popd >/dev/null
%preun -n %{kname}-desktop586-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/build ];
then
- rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/source ];
then
- rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktop-i586 -a `ls -l
/boot/vmlinuz-%{ktag}-desktop-i586 2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-desktop-%{buildrpmrel}-i586" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-desktop-i586
fi
@@ -1569,14 +1925,6 @@
# desktop586-smp scripts
%post -n %{kname}-desktop586-smp-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktopsmp-i586 ]; then
rm -f /boot/vmlinuz-%{ktag}-desktopsmp-i586
fi
@@ -1589,12 +1937,6 @@
popd >/dev/null
%preun -n %{kname}-desktop586-smp-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/build
]; then
- rm -f
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/source
]; then
- rm -f
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktopsmp-i586 -a `ls -l
/boot/vmlinuz-%{ktag}-desktopsmp-i586 2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp-i586" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-desktopsmp-i586
fi
@@ -1612,14 +1954,6 @@
# desktop scripts
%post -n %{kname}-desktop-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-desktop-%{buildrpmrel}
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktop ]; then
rm -f /boot/vmlinuz-%{ktag}-desktop
fi
@@ -1632,12 +1966,6 @@
popd >/dev/null
%preun -n %{kname}-desktop-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/build ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/source ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktop -a `ls -l /boot/vmlinuz-%{ktag}-desktop
2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-desktop-%{buildrpmrel}" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-desktop
fi
@@ -1655,14 +1983,6 @@
# desktop-smp scripts
%post -n %{kname}-desktop-smp-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-desktop-%{buildrpmrel}smp
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktopsmp ]; then
rm -f /boot/vmlinuz-%{ktag}-desktopsmp
fi
@@ -1675,12 +1995,6 @@
popd >/dev/null
%preun -n %{kname}-desktop-smp-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/build ];
then
- rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/source ];
then
- rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-desktopsmp -a `ls -l
/boot/vmlinuz-%{ktag}-desktopsmp 2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-desktopsmp
fi
@@ -1698,14 +2012,6 @@
# laptop scripts
%post -n %{kname}-laptop-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-laptop-%{buildrpmrel}
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-loptop-%{buildrpmrel}/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-loptop-%{buildrpmrel}/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-laptop ]; then
rm -f /boot/vmlinuz-%{ktag}-laptop
fi
@@ -1718,12 +2024,6 @@
popd >/dev/null
%preun -n %{kname}-laptop-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/build ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/source ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-laptop -a `ls -l /boot/vmlinuz-%{ktag}-laptop
2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-laptop-%{buildrpmrel}" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-laptop
fi
@@ -1741,14 +2041,6 @@
# laptop-smp scripts
%post -n %{kname}-laptop-smp-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-laptop-%{buildrpmrel}smp
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-laptopsmp ]; then
rm -f /boot/vmlinuz-%{ktag}-laptopsmp
fi
@@ -1761,12 +2053,6 @@
popd >/dev/null
%preun -n %{kname}-laptop-smp-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/build ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/source ];
then
- rm -f /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-laptopsmp -a `ls -l
/boot/vmlinuz-%{ktag}-laptopsmp 2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-laptopsmp
fi
@@ -1784,14 +2070,6 @@
# server scripts
%post -n %{kname}-server-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-server-%{buildrpmrel}
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-server ]; then
rm -f /boot/vmlinuz-%{ktag}-server
fi
@@ -1804,12 +2082,6 @@
popd >/dev/null
%preun -n %{kname}-server-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/build ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/source ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-server -a `ls -l /boot/vmlinuz-%{ktag}-server
2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-server-%{buildrpmrel}" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-server
fi
@@ -1827,14 +2099,6 @@
# server-smp scripts
%post -n %{kname}-server-smp-%{buildrel} -f %{post_preload_file}
/sbin/installkernel -L %{kversion}-%{ktag}-server-%{buildrpmrel}smp
-if [ -d /usr/src/%{kname}-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/build
- ln -sf /usr/src/%{kname}-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/source
-fi
-if [ -d /usr/src/%{kname}-stripped-%{buildrel} ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel}/
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-serversmp ]; then
rm -f /boot/vmlinuz-%{ktag}-serversmp
fi
@@ -1847,12 +2111,6 @@
popd >/dev/null
%preun -n %{kname}-server-smp-%{buildrel}
-if [ -L /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/build ]; then
- rm -f /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/build
-fi
-if [ -L /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/source ];
then
- rm -f /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/source
-fi
if [ -L /boot/vmlinuz-%{ktag}-serversmp -a `ls -l
/boot/vmlinuz-%{ktag}-serversmp 2>/dev/null| awk '{ print $11 }'` =
"vmlinuz-%{kversion}-%{ktag}-server-%{buildrpmrel}smp" ]; then
[ $1 = 0 ] && rm -f /boot/vmlinuz-%{ktag}-serversmp
fi
@@ -1869,65 +2127,118 @@
# source scripts
%post -n %{kname}-source-%{buildrel}
-cd /usr/src
-rm -f linux
-ln -snf %{kname}-%{buildrel} linux
-/sbin/service kheader start 2>/dev/null >/dev/null || :
-
-# we need to create /build,source only when there is a source tree.
-for i in
/lib/modules/%{kversion}-%{ktag}-{desktop,laptop,server}-%{buildrpmrel}*; do
- if [ -d $i ]; then
- ln -sf /usr/src/%{kname}-%{buildrel} $i/build
- ln -sf /usr/src/%{kname}-%{buildrel} $i/source
- fi
-done
+# nothing right now
%postun -n %{kname}-source-%{buildrel}
-if [ -L /usr/src/linux ]; then
- if [ -L /usr/src/linux -a `ls -l /usr/src/linux 2>/dev/null| awk '{ print
$11 }'` = "%{kname}-%{buildrel}" ]; then
- [ $1 = 0 ] && rm -f /usr/src/linux
- fi
-fi
-# we need to delete <modules>/build,source at unsinstall
-for i in
/lib/modules/%{kversion}-%{ktag}-{desktop,laptop,server}-%{buildrpmrel}*/{build,source};
do
- if [ -L $i ]; then
- rm -f $i
- fi
-done
+# nothing right now
exit 0
-# source-stripped scripts
-%post -n %{kname}-source-stripped-%{buildrel}
-cd /usr/src
-rm -f linux
-ln -snf %{kname}-stripped-%{buildrel} linux
-/sbin/service kheader start 2>/dev/null >/dev/null || :
-
-# we need to create /build only when there is a source tree.
-for i in
/lib/modules/%{kversion}-%{ktag}-{desktop,laptop,server}-%{buildrpmrel}*; do
- if [ -d $i ]; then
- ln -sf /usr/src/%{kname}-stripped-%{buildrel} $i/build
- ln -sf /usr/src/%{kname}-stripped-%{buildrel} $i/source
- fi
-done
+### kernel-desktop586-headers
+%post -n %{kname}-desktop586-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-desktop586-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-desktop586-%{buildrpmrel}/build
+ln -sf /usr/src/%{kname}-desktop586-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-desktop586-%{buildrpmrel}/source
+
+%postun -n %{kname}-desktop586-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f
/lib/modules/%{kversion}-%{ktag}-desktop586-%{buildrpmrel}/{build,source}
>/dev/null
+exit 0
-%postun -n %{kname}-source-stripped-%{buildrel}
-if [ -L /usr/src/linux ]; then
- if [ -L /usr/src/linux -a `ls -l /usr/src/linux 2>/dev/null| awk '{ print
$11 }'` = "%{kname}-stripped-%{buildrel}" ]; then
- [ $1 = 0 ] && rm -f /usr/src/linux
- fi
-fi
-# we need to delete <modules>/build at unsinstall
-for i in
/lib/modules/%{kversion}-%{ktag}-{desktop,laptop,server}-%{buildrpmrel}*/{build,source};
do
- if [ -L $i ]; then
- rm -f $i
- fi
-done
+
+
+### kernel-desktop586-smp-headers
+%post -n %{kname}-desktop586-smp-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-desktop586-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-desktop586-%{buildrpmrel}smp/build
+ln -sf /usr/src/%{kname}-desktop586-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-desktop586-%{buildrpmrel}smp/source
+
+%postun -n %{kname}-desktop586-smp-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f
/lib/modules/%{kversion}-%{ktag}-desktop586-%{buildrpmrel}smp/{build,source}
>/dev/null
+exit 0
+
+
+
+### kernel-desktop-headers
+%post -n %{kname}-desktop-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-desktop-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/build
+ln -sf /usr/src/%{kname}-desktop-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/source
+
+%postun -n %{kname}-desktop-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f /lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}/{build,source}
>/dev/null
+exit 0
+
+
+
+### kernel-desktop-smp-headers
+%post -n %{kname}-desktop-smp-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-desktop-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/build
+ln -sf /usr/src/%{kname}-desktop-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/source
+
+%postun -n %{kname}-desktop-smp-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f
/lib/modules/%{kversion}-%{ktag}-desktop-%{buildrpmrel}smp/{build,source}
>/dev/null
+exit 0
+
+
+
+### kernel-laptop-headers
+%post -n %{kname}-laptop-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-laptop-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/build
+ln -sf /usr/src/%{kname}-laptop-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/source
+
+%postun -n %{kname}-laptop-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}/{build,source}
>/dev/null
+exit 0
+
+
+
+### kernel-laptop-smp-headers
+%post -n %{kname}-laptop-smp-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-laptop-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/build
+ln -sf /usr/src/%{kname}-laptop-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/source
+
+%postun -n %{kname}-laptop-smp-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f /lib/modules/%{kversion}-%{ktag}-laptop-%{buildrpmrel}smp/{build,source}
>/dev/null
+exit 0
+
+
+
+### kernel-server-headers
+%post -n %{kname}-server-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-server-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/build
+ln -sf /usr/src/%{kname}-server-headers-%{buildrel}
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/source
+
+%postun -n %{kname}-server-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}/{build,source}
>/dev/null
+exit 0
+
+
+
+### kernel-server-smp-headers
+%post -n %{kname}-server-smp-headers-%{buildrel}
+# place /build and /source symlinks in place.
+ln -sf /usr/src/%{kname}-server-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/build
+ln -sf /usr/src/%{kname}-server-headers-%{buildrel}smp
/lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/source
+
+%postun -n %{kname}-server-smp-headers-%{buildrel}
+# we need to delete <modules>/{build,source} at uninstall
+rm -f /lib/modules/%{kversion}-%{ktag}-server-%{buildrpmrel}smp/{build,source}
>/dev/null
exit 0
+
###
### file lists
###
@@ -1984,33 +2295,19 @@
%{_kerneldir}/README
%{_kerneldir}/REPORTING-BUGS
%{_kerneldir}/arch/i386
-%ifarch sparc64
%{_kerneldir}/arch/sparc64
-%endif
%{_kerneldir}/arch/um
%{_kerneldir}/arch/x86_64
%{_kerneldir}/block
%{_kerneldir}/crypto
%{_kerneldir}/drivers
%{_kerneldir}/fs
-%{_kerneldir}/init
-%{_kerneldir}/ipc
-%{_kerneldir}/kernel
-%{_kerneldir}/lib
-%{_kerneldir}/mm
-%{_kerneldir}/net
-%{_kerneldir}/scripts
-%{_kerneldir}/security
-%{_kerneldir}/sound
-%{_kerneldir}/usr
%{_kerneldir}/include/Kbuild
%{_kerneldir}/include/acpi
%{_kerneldir}/include/asm
%{_kerneldir}/include/asm-generic
%{_kerneldir}/include/asm-i386
-%ifarch sparc64
%{_kerneldir}/include/asm-sparc64
-%endif
%{_kerneldir}/include/asm-um
%{_kerneldir}/include/asm-x86_64
%{_kerneldir}/include/config
@@ -2027,72 +2324,57 @@
%{_kerneldir}/include/scsi
%{_kerneldir}/include/sound
%{_kerneldir}/include/video
+%{_kerneldir}/init
+%{_kerneldir}/ipc
+%{_kerneldir}/kernel
+%{_kerneldir}/lib
+%{_kerneldir}/mm
+%{_kerneldir}/net
+%{_kerneldir}/scripts
+%{_kerneldir}/security
+%{_kerneldir}/sound
+%{_kerneldir}/usr
%doc README.kernel-%{ktag}-sources
%doc README.Mandriva_Linux_%{ktag}
%doc README.urpmi
-#endif %build_source
+#endif build_source
%endif
-%if %build_source_stripped
-%files -n %{kname}-source-stripped-%{buildrel}
-%defattr(-,root,root)
-%dir %{_kdir_stripped}
-%dir %{_kdir_stripped}/arch
-%dir %{_kdir_stripped}/include
-%{_kdir_stripped}/.config
-%{_kdir_stripped}/COPYING
-%{_kdir_stripped}/CREDITS
-%{_kdir_stripped}/3rdparty
-%{_kdir_stripped}/Documentation
-%{_kdir_stripped}/Kbuild
-%{_kdir_stripped}/MAINTAINERS
-%{_kdir_stripped}/Makefile
-%{_kdir_stripped}/README
-%{_kdir_stripped}/arch/i386
-%ifarch sparc64
-%{_kdis_stripped}/arch/sparc64
-%endif
-%{_kdir_stripped}/arch/um
-%{_kdir_stripped}/arch/x86_64
-%{_kdir_stripped}/block
-%{_kdir_stripped}/crypto
-%{_kdir_stripped}/drivers
-%{_kdir_stripped}/fs
-%{_kdir_stripped}/init
-%{_kdir_stripped}/ipc
-%{_kdir_stripped}/kernel
-%{_kdir_stripped}/lib
-%{_kdir_stripped}/mm
-%{_kdir_stripped}/net
-%{_kdir_stripped}/scripts
-%{_kdir_stripped}/security
-%{_kdir_stripped}/sound
-%{_kdir_stripped}/usr
-%{_kdir_stripped}/include/Kbuild
-%{_kdir_stripped}/include/acpi
-%{_kdir_stripped}/include/asm
-%{_kdir_stripped}/include/asm-generic
-%{_kdir_stripped}/include/asm-i386
-%ifarch sparc64
-%{_kdis_stripped}/include/asm-sparc64
-%endif
-%{_kdir_stripped}/include/asm-um
-%{_kdir_stripped}/include/asm-x86_64
-%{_kdir_stripped}/include/config
-%{_kdir_stripped}/include/crypto
-%{_kdir_stripped}/include/keys
-%{_kdir_stripped}/include/linux
-%{_kdir_stripped}/include/math-emu
-%{_kdir_stripped}/include/media
-%{_kdir_stripped}/include/mtd
-%{_kdir_stripped}/include/net
-%{_kdir_stripped}/include/pcmcia
-%{_kdir_stripped}/include/rdma
-%{_kdir_stripped}/include/rxrpc
-%{_kdir_stripped}/include/scsi
-%{_kdir_stripped}/include/sound
-%{_kdir_stripped}/include/video
-#endif %build_source_stripped
+%if %build_headers
+%ifarch %{ix86}
+%if %build_desktop586_up
+%files -n %{kname}-desktop586-headers-%{buildrel} -f
kernel_header_files.desktop-i586
+%endif
+
+%if %build_desktop586_smp
+%files -n %{kname}-desktop586-smp-headers-%{buildrel} -f
kernel_header_files.desktopsmp-i586
+%endif
+%endif
+
+%if %build_desktop_up
+%files -n %{kname}-desktop-headers-%{buildrel} -f kernel_header_files.desktop
+%endif
+
+%if %build_desktop_smp
+%files -n %{kname}-desktop-smp-headers-%{buildrel} -f
kernel_header_files.desktopsmp
+%endif
+
+%if %build_laptop_up
+%files -n %{kname}-laptop-headers-%{buildrel} -f kernel_header_files.laptop
+%endif
+
+%if %build_laptop_smp
+%files -n %{kname}-laptop-smp-headers-%{buildrel} -f
kernel_header_files.laptopsmp
+%endif
+
+%if %build_server_up
+%files -n %{kname}-server-headers-%{buildrel} -f kernel_header_files.server
+%endif
+
+%if %build_server_smp
+%files -n %{kname}-server-smp-headers-%{buildrel} -f
kernel_header_files.serversmp
+%endif
+#endif build_headers
%endif
%if %build_doc
@@ -2148,14 +2430,62 @@
%defattr(-,root,root)
%endif
-%if %build_source_stripped
-%files -n %{kname}-source-stripped-latest
+%if %build_headers
+%ifarch %{ix86}
+%if %build_desktop586_up
+%files -n %{kname}-desktop586-headers-latest
%defattr(-,root,root)
%endif
+%if %build_desktop586_smp
+%files -n %{kname}-desktop586-smp-headers-latest
+%defattr(-,root,root)
+%endif
+%endif
+
+%if %build_desktop_up
+%files -n %{kname}-desktop-headers-latest
+%defattr(-,root,root)
+%endif
+
+%if %build_desktop_smp
+%files -n %{kname}-desktop-smp-headers-latest
+%defattr(-,root,root)
+%endif
+
+%if %build_laptop_up
+%files -n %{kname}-laptop-headers-latest
+%defattr(-,root,root)
+%endif
+
+%if %build_laptop_smp
+%files -n %{kname}-laptop-smp-headers-latest
+%defattr(-,root,root)
+%endif
+
+%if %build_server_up
+%files -n %{kname}-server-headers-latest
+%defattr(-,root,root)
+%endif
+
+%if %build_server_smp
+%files -n %{kname}-server-smp-headers-latest
+%defattr(-,root,root)
+%endif
+#endif build_headers
+%endif
+
%changelog
* Sun Feb 18 2007 Thomas Backlund <[EMAIL PROTECTED]> 2.6.20-4mdv
- fix RC versioning
+- fix the whole autoconf mess
+ dont rely on /etc/init.d/kheader and /boot/kernel.h anymore
+ drop all of the old autoconf hacks
+ drop kernel-tmb-source-stripped(-latest) rpms
+ introduce kernel-tmb-$flavour-headers(-latest) rpms to build 3rdparty
+ drivers against (survives test: make mrproper oldconfig prepare scripts)
+ kernel-tmb-source rpm does not include any autoconf stuff anymore
+ add info regarding this to README.urpmi
* Sun Feb 11 2007 Thomas Backlund <[EMAIL PROTECTED]> 2.6.20-3mdv
- update patch CK00: rotating staircase deadline scheduler 0.14
