SPECS: kernel-vanilla.spec - rules part of multiarch makefile move...

[glen]

Author: glen                         Date: Mon Feb  4 21:31:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rules part of multiarch makefile moved to sources

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.90 SPECS/kernel-vanilla.spec:1.91
--- SPECS/kernel-vanilla.spec:1.90	Thu Jan 31 22:30:19 2008
+++ SPECS/kernel-vanilla.spec	Mon Feb  4 22:31:01 2008
@@ -61,6 +61,7 @@
 Source3:	kernel-vanilla-config.h
 Source6:	kernel-config.py
 Source7:	kernel-config-update.py
+Source8:	kernel-multiarch.make
 
 Source19:	kernel-vanilla-multiarch.conf
 
@@ -358,6 +359,7 @@
 ln -s %{SOURCE6} o/scripts/kernel-config.py
 ln -s %{SOURCE7} o/scripts/kernel-config-update.py
 ln -s %{SOURCE2} o/scripts/kernel-module-build.pl
+ln -s %{SOURCE8} Makefile
 
 cd linux-%{_basever}
 %if "%{_postver}" != "%{nil}"
@@ -377,7 +379,7 @@
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
-cat > Makefile <<'EOF'
+cat > multiarch.make <<'EOF'
 # Makefile generated by %{name}.spec
 srctree := %{_builddir}/%{name}-%{version}/linux-%{_basever}
 objtree := %{objdir}
@@ -395,33 +397,6 @@
 
 # config where we ignore timestamps
 CONFIG_NODEP += %{objdir}/pykconfig.conf
-
-all modules_install mrproper:
-	$(Q)$(MAKE) -C $(srctree) %{MakeOpts} $<
-
-pykconfig: $(objtree)/.config.conf
-	@echo 'pykconfig is up to date'
-
-$(objtree)/.config.conf: $(srctree)/arch/$(SRCARCH)/defconfig
-	@echo '  kernel-config-update.py $(ARCH) arch/$(SRCARCH)/defconfig.conf $< > $@'
-	$(Q)$(objtree)/scripts/kernel-config-update.py $(ARCH) $(srctree)/arch/$(SRCARCH)/defconfig.conf $< > .config.conf.tmp
-	$(Q)mv .config.conf.tmp $@
-
-$(srctree)/arch/$(SRCARCH)/defconfig: $(srctree)/arch/$(SRCARCH)/defconfig.conf
-	@echo '  kernel-config.py $(ARCH) $< $@'
-	$(Q)> .defconfig.tmp
-	$(Q)$(objtree)/scripts/kernel-config.py $(ARCH) $< .defconfig.tmp
-	$(Q)mv .defconfig.tmp $@
-	$(Q)ln -sf $@ $(objtree)/.config
-
-$(srctree)/arch/$(SRCARCH)/defconfig.conf: $(CONFIGS) $(objtree)/defconfig-nodep.conf
-	$(Q)cat $^ > $@
-
-$(objtree)/defconfig-nodep.conf: $(CONFIG_NODEP)
-	$(Q)if [ ! -f $@ ] || ! cmp -s $< $@; then \
-		echo '  cat $< > $@'; \
-		cat $< > $@; \
-	fi
 EOF
 
 # update config at spec time
@@ -781,6 +756,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2008-02-04 21:31:01  glen
+- rules part of multiarch makefile moved to sources
+
 Revision 1.90  2008-01-31 21:30:19  glen
 - update from kernel:LINUX_2_6 (qboosh):
   arch/x86/kernel/asm-offsets_{32,64}.c needed in -module-build
================================================================

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