[uml-devel] [PATCH] 2.6: mrproper and clean still broken

[uml-devel] [PATCH] 2.6: mrproper and clean still broken

[BlaisorBlade]

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

PROBLEM:
make mrproper has problems with the SIZE var:
SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
since .config is not included when doing *make clean* or *make mrproper*.
SOLUTION:
I've attached the patch to fix this. Actually someone(i.e. J.Cone) already 
sent this, but the form in which it was applied didn't fix the problem(or 
maybe it wasn't applied); the applied patch simply provided default config 
values.
I've attached also the other part of that patch, i.e. adding -g to USER_CFLAGS 
when needed.

Bye
-- 
cat <<EOSIGN
Paolo Giarrusso, aka Blaisorblade
Linux Kernel 2.4.21/2.6.0-test on an i686; Linux registered user n. 292729
EOSIGN

[-- Attachment #2: Fix_clean_mrproper.patch --]
[-- Type: text/x-diff, Size: 921 bytes --]

--- ./arch/um/Makefile.cleanfix	2003-12-02 17:20:42.000000000 +0100
+++ ./arch/um/Makefile	2003-12-13 18:36:36.000000000 +0100
@@ -61,7 +61,11 @@
 
 LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
 
-SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
+#This is needed for clean and mrproper, since in that case .config is not
+#included; but the values here are meaningless
+CONFIG_NEST_LEVEL ?= 0
+CONFIG_KERNEL_HALF_GIGS ?= 0
+SIZE := (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
 
 ifeq ($(CONFIG_MODE_SKAS), y)
 $(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
@@ -128,6 +132,11 @@
 # To get a definition of F_SETSIG
 USER_CFLAGS += -D_GNU_SOURCE
 
+ifdef CONFIG_DEBUG_INFO
+USER_CFLAGS += -g
+endif
+
+
 CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
 	$(ARCH_DIR)/dyn_link.ld.s $(ARCH_DIR)/include/uml-config.h \
 	$(GEN_HEADERS)

Re: [uml-devel] [PATCH] 2.6: mrproper and clean still broken

[Jeff Dike]

On Sat, Dec 13, 2003 at 06:38:31PM +0100, BlaisorBlade wrote:
> PROBLEM:
> make mrproper has problems with the SIZE var:
> SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
> since .config is not included when doing *make clean* or *make mrproper*.

This is all fixed in my 2.6 tree now.

				Jeff


-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel