2010-03-04 Vladimir Serbinenko <phcoder@gmail.com>

	Disable linux.mod on qemu-mips since it's not functional and leads
	to compilation failure.

	* conf/mips.rmk (pkglib_MODULES): Remove linux.mod.
	* conf/mips-yeeloong.rmk (pkglib_MODULES): Add linux.mod.
	* conf/mips.rmk (linux_mod_SOURCES): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_SOURCES): ... here
	* conf/mips.rmk (linux_mod_CFLAGS): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_CFLAGS): ... here
	* conf/mips.rmk (linux_mod_ASFLAGS): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_ASFLAGS): ... here
	* conf/mips.rmk (linux_mod_LDFLAGS): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_LDFLAGS): ... here
	Reported by: BVK Chaitanya

diff --git a/ChangeLog b/ChangeLog
index d3d939985ac8b81b91e2e1011dafc919a669ed59..039a80a59e218e6441ef86393b278cec9b820bc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Disable linux.mod on qemu-mips since it's not functional and leads
+       to compilation failure.
+
+       * conf/mips.rmk (pkglib_MODULES): Remove linux.mod.
+       * conf/mips-yeeloong.rmk (pkglib_MODULES): Add linux.mod.
+       * conf/mips.rmk (linux_mod_SOURCES): Move from here ...
+       * conf/mips-yeeloong.rmk (linux_mod_SOURCES): ... here
+       * conf/mips.rmk (linux_mod_CFLAGS): Move from here ...
+       * conf/mips-yeeloong.rmk (linux_mod_CFLAGS): ... here
+       * conf/mips.rmk (linux_mod_ASFLAGS): Move from here ...
+       * conf/mips-yeeloong.rmk (linux_mod_ASFLAGS): ... here
+       * conf/mips.rmk (linux_mod_LDFLAGS): Move from here ...
+       * conf/mips-yeeloong.rmk (linux_mod_LDFLAGS): ... here
+       Reported by: BVK Chaitanya
+
 2010-03-04  Jordan Uggla  <jordan.uggla@gmail.com>
 
        * INSTALL: Add gettext as a dependency and add qemu to a new section

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 0d9a4c1bb3961f53b5525fc709a7bc2c59ec5eb4..9977f78815b6c529cd77bda8be5d44df4ba6f9ff 100644 (file)
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -76,6 +76,11 @@ datehook_mod_SOURCES = hook/datehook.c
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += linux.mod
+linux_mod_SOURCES = loader/$(target_cpu)/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in

diff --git a/conf/mips.rmk b/conf/mips.rmk
index c7c80a26de804e11b3d059758a070e537d14abb0..536d35cac723b25a026770adf9851bdebf65da14 100644 (file)
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -73,10 +73,4 @@ relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/$(target_cpu)/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk