Author: sparky                       Date: Fri Sep 19 01:43:13 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- multiarch.config takes precedence over arch-specific config

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1952 -> 1.441.2.1953) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1952 SPECS/kernel.spec:1.441.2.1953
--- SPECS/kernel.spec:1.441.2.1952      Fri Sep 19 02:43:57 2008
+++ SPECS/kernel.spec   Fri Sep 19 03:43:06 2008
@@ -1056,7 +1056,7 @@
        KernelVer=%{kernel_release}
        echo "Building config file using $Config.conf..."
        %{__awk} -v basearch=%{_target_base_arch} -v arch=%{_target_cpu} -f 
%{SOURCE6} \
-               $RPM_SOURCE_DIR/kernel-$Config.config 
$RPM_SOURCE_DIR/kernel-multiarch.config \
+               %{SOURCE19} $RPM_SOURCE_DIR/kernel-$Config.config \
                > %{defconfig}
        TuneUpConfigForIX86 %{defconfig}
 
@@ -1172,6 +1172,7 @@
 BuildKernel() {
        %{?debug:set -x}
        echo "Building kernel $1 ..."
+       install .config %{defconfig}
        %{__make} %CrossOpts mrproper \
                RCS_FIND_IGNORE='-name build-done -prune -o'
        ln -sf %{defconfig} .config
@@ -1678,6 +1679,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1953  2008/09/19 01:43:06  sparky
+- multiarch.config takes precedence over arch-specific config
+
 Revision 1.441.2.1952  2008/09/19 00:43:57  sparky
 - use kernel-config.awk; drop python dependancy
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1952&r2=1.441.2.1953&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to