- new module build way

- ver up to 0.5.32, thanks to Adam Skucin'ski

Changed files:
    acerhk.spec -> 1.6

diff --git a/acerhk.spec b/acerhk.spec
index 7b4fa406d7be02920d21446d1d071ddc1c1eec62..3bfbc1e6d1add4ea8533904c48f1dc6d83a9f0fc 100644 (file)
--- a/acerhk.spec
+++ b/acerhk.spec
@@ -6,15 +6,15 @@
 %define _rel           1
 %define _orig_name     acerhk
 
-Summary:       Linux driver for special Acer Hot Keys
+Summary:       Linux driver for Acer notebook special Hot Keys
 Summary(pl):   Sterownik dla Linuksa obs³uguj±cy specjalne klawisze w notebookach Acer
 Name:          kernel-misc-%{_orig_name}
-Version:       0.5.18
+Version:       0.5.32
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL
 Group:         Base/Kernel
 Source0:       http://www.informatik.hu-berlin.de/~tauber/acerhk/archives/%{_orig_name}-%{version}.tgz
-# Source0-md5: 2627c1760a1d8e22ad4d4519475cf0c6
+# Source0-md5: 0bf2ae26bd2acaee72863bc9ee550f19
 URL:           http://www.informatik.hu-berlin.de/~tauber/acerhk/
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.0}
 BuildRequires: %{kgcc_package}
@@ -24,7 +24,7 @@ Requires(post,postun):        /sbin/depmod
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-This is a Linux driver for special Acer Hot Keys.
+This is a Linux driver for Acer notebook special Hot Keys.
 
 %description -l pl
 Sterownik dla Linuksa pozwalaj±cy uaktywniæ specjalne przyciski w
@@ -39,7 +39,7 @@ Group:                Base/Kernel
 Requires(post,postun): /sbin/depmod
 
 %description -n kernel-smp-misc-%{_orig_name}
-This is a Linux SMP driver for special Acer Hot Keys.
+This is a Linux SMP driver for Acer notebook special Hot Keys.
 
 %description -n kernel-smp-misc-%{_orig_name} -l pl
 Sterownik dla Linuksa SMP pozwalaj±cy uaktywniæ specjalne przyciski w
@@ -50,31 +50,45 @@ notebookach Acer.
 
 %build
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-    if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-        exit 1
-    fi
-    rm -rf include
-    install -d include/{linux,config}
-    ln -sf %{_kernelsrcdir}/config-$cfg .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-    ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-    touch include/config/MARKER
-    %{__make} -C %{_kernelsrcdir} clean modules \
-    EXTRA_CFLAGS="-I../include -DFUSE_VERSION='1.1'" \
-    RCS_FIND_IGNORE="-name '*.ko' -o" \
-    M=$PWD O=$PWD \
-    %{?with_verbose:V=1}
-    mv %{_orig_name}.ko %{_orig_name}-$cfg.ko
+       if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+               exit 1
+       fi
+       install -d o/include/linux
+       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+       %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+       install -d o/include/config
+       touch o/include/config/MARKER
+       ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
+       %{__make} -C %{_kernelsrcdir} clean \
+               RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD/o \
+               M=$PWD O=$PWD/o \
+               %{?with_verbose:V=1}
+       %{__make} -C %{_kernelsrcdir} modules \
+               CC="%{__cc}" CPP="%{__cpp}" \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD/o \
+               M=$PWD O=$PWD/o \
+               %{?with_verbose:V=1}
+
+       mv %{_orig_name}.ko %{_orig_name}-$cfg.ko
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install %{_orig_name}-up.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.ko
-%if %{with smp}
-install %{_orig_name}-smp.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.ko
+install %{_orig_name}-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.ko
+%if %{with smp} && %{with dist_kernel}
+install %{_orig_name}-smp.ko \
+       $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.ko
 %endif
 
 %clean