Skip to contentSkip to conversation

better patch

PATCH Eddy 2 participants 3 messages Aug 9, 2006

lore
Share & tools
lore

Eddy

author
#0 lore raw

Sorry I was wrong.. in this patch i have corrected a ld86 parm that couldn't let system built. (-t)

File: patch-elks-0.1.3-r2.patch

arch/i86/Makefile 2006-08-09 01:44:24.000000000 +0200 renamed from elks/arch/i86/Makefile 2003-10-14 05:02:42.000000000 +0200 +2 -2
diff -Naur r2/elks/arch/i86/Makefile elks/arch/i86/Makefile
@@ -92,7 +92,7 @@
        (cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
                $(ARCH_DIR)/sibo/crt0.o $(ARCH_DIR)/sibo/crt1.o \
                init/main.o $(ARCHIVES) $(DRIVERS) \
-               -t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+               -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
                sort -k4 System.tmp > System.map ; rm -f System.tmp )
 
 #SIBO image build

@@ -107,7 +107,7 @@
        (cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
                $(ARCH_DIR)/boot/crt0.o $(ARCH_DIR)/boot/crt1.o \
                init/main.o $(ARCHIVES) $(DRIVERS) \
-               -t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+               -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
                sort -k4 System.tmp > System.map ; rm -f System.tmp )
 
 #PC image build
arch/i86/boot/setup.S 2006-08-09 01:52:40.000000000 +0200 renamed from elks/arch/i86/boot/setup.S 2003-10-14 05:02:40.000000000 +0200 +1 -1
diff -Naur r2/elks/arch/i86/boot/setup.S elks/arch/i86/boot/setup.S
@@ -585,7 +585,7 @@
        or      al,al
        jnz     is486
 #endif
-#ifdef(CONFIG_CPU_80386)
+#ifdef CONFIG_CPU_80386
         mov cl,#7
        lea     si,p80386
        br      getfpu

diff -Naur r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg elks/arch/i86/drivers/char/KeyMaps/mkcfg
--- r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg 2003-10-14 05:02:42.000000000 +0200
+++ elks/arch/i86/drivers/char/KeyMaps/mkcfg 2006-08-09
01:52:40.000000000 +0200
@@ -13,14 +13,14 @@
printf '# Automatically created - do not edit.\n\n' >&3 printf "choice 'XT Keyboard support'\t\t" >&3 printf '/* Automatically created - do not edit */\n\n' >&4
- while read FILE CODE NAME ; do
+ while read FILE CODE NAME ; do

        printf '\t\\\n\t%-12s\tCONFIG_KEYMAP_%s' >&3 \
                "${SEP}${NAME}" "${CODE}"
        SEP=' '
        printf '#include "%s"\t\t/* %s\t%-9s\t*/\n' >&4 \
                "${FILE}" "${CODE}" "${NAME}"
     done

- printf '"\t\tAmerican\n\n# EOF.\n' >&3
+ printf '\"\n' >&3
}

-codes | sort +1f | process 3> Config.in 4> keymaps.h +codes | process 3> Config.in 4> keymaps.h

EOF

author
#1 lore raw

Sorry, I realized that some stupid auto word-wrap cut the patch in some line... I'm trying to attach it.

Quoted 61 lines · Eddy

Sorry I was wrong.. in this patch i have corrected a ld86 parm that couldn't let system built. (-t)

File: patch-elks-0.1.3-r2.patch

diff -Naur r2/elks/arch/i86/Makefile elks/arch/i86/Makefile

arch/i86/Makefile 2006-08-09 01:44:24.000000000 +0200 renamed from elks/arch/i86/Makefile 2003-10-14 05:02:42.000000000 +0200 +2 -2
@@ -92,7 +92,7 @@
        (cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
                $(ARCH_DIR)/sibo/crt0.o $(ARCH_DIR)/sibo/crt1.o \
                init/main.o $(ARCHIVES) $(DRIVERS) \
-               -t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+               -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
                sort -k4 System.tmp > System.map ; rm -f System.tmp )
 
 #SIBO image build

@@ -107,7 +107,7 @@
        (cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
                $(ARCH_DIR)/boot/crt0.o $(ARCH_DIR)/boot/crt1.o \
                init/main.o $(ARCHIVES) $(DRIVERS) \
-               -t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+               -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
                sort -k4 System.tmp > System.map ; rm -f System.tmp )
 
 #PC image build

diff -Naur r2/elks/arch/i86/boot/setup.S elks/arch/i86/boot/setup.S

arch/i86/boot/setup.S 2006-08-09 01:52:40.000000000 +0200 renamed from elks/arch/i86/boot/setup.S 2003-10-14 05:02:40.000000000 +0200 +1 -1
@@ -585,7 +585,7 @@
        or      al,al
        jnz     is486
 #endif
-#ifdef(CONFIG_CPU_80386)
+#ifdef CONFIG_CPU_80386
         mov cl,#7
        lea     si,p80386
        br      getfpu

diff -Naur r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg elks/arch/i86/drivers/char/KeyMaps/mkcfg

arch/i86/drivers/char/KeyMaps/mkcfg 2006-08-09 01:52:40.000000000 +0200 renamed from elks/arch/i86/drivers/char/KeyMaps/mkcfg 2003-10-14 05:02:42.000000000 +0200 +3 -3
@@ -13,14 +13,14 @@
     printf '# Automatically created - do not edit.\n\n' >&3
     printf "choice 'XT Keyboard support'\t\t" >&3
     printf '/* Automatically created - do not edit */\n\n' >&4
-    while read FILE CODE NAME ; do
+    while read FILE CODE NAME ; do
        printf '\t\\\n\t%-12s\tCONFIG_KEYMAP_%s' >&3 \
                "${SEP}${NAME}" "${CODE}"
        SEP=' '
        printf '#include "%s"\t\t/* %s\t%-9s\t*/\n' >&4 \
                "${FILE}" "${CODE}" "${NAME}"
     done
-    printf '"\t\tAmerican\n\n# EOF.\n' >&3
+    printf '\"\n' >&3
 }
 
-codes | sort +1f | process 3> Config.in 4> keymaps.h
+codes | process 3> Config.in 4> keymaps.h
Quoted 3 lines

EOF

arch/i86/Makefile renamed from elks/arch/i86/Makefile +2 -2
diff -Naur r2/elks/arch/i86/Makefile elks/arch/i86/Makefile
@@ -92,7 +92,7 @@
 	(cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
 		$(ARCH_DIR)/sibo/crt0.o $(ARCH_DIR)/sibo/crt1.o \
 		init/main.o $(ARCHIVES) $(DRIVERS) \
-		-t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+		-M -o $(ARCH_DIR)/boot/system > System.tmp ; \
 		sort -k4 System.tmp > System.map ; rm -f System.tmp ) 
 
 #SIBO image build

@@ -107,7 +107,7 @@
 	(cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
 		$(ARCH_DIR)/boot/crt0.o $(ARCH_DIR)/boot/crt1.o \
 		init/main.o $(ARCHIVES) $(DRIVERS) \
-		-t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+		-M -o $(ARCH_DIR)/boot/system > System.tmp ; \
 		sort -k4 System.tmp > System.map ; rm -f System.tmp ) 
 
 #PC image build
arch/i86/boot/setup.S renamed from elks/arch/i86/boot/setup.S +1 -1
diff -Naur r2/elks/arch/i86/boot/setup.S elks/arch/i86/boot/setup.S
@@ -585,7 +585,7 @@
 	or	al,al
 	jnz	is486
 #endif
-#ifdef(CONFIG_CPU_80386)
+#ifdef CONFIG_CPU_80386
         mov cl,#7
 	lea	si,p80386
 	br	getfpu
arch/i86/drivers/char/KeyMaps/mkcfg renamed from elks/arch/i86/drivers/char/KeyMaps/mkcfg +3 -3
diff -Naur r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg elks/arch/i86/drivers/char/KeyMaps/mkcfg
@@ -13,14 +13,14 @@
     printf '# Automatically created - do not edit.\n\n' >&3
     printf "choice 'XT Keyboard support'\t\t" >&3
     printf '/* Automatically created - do not edit */\n\n' >&4
-    while read FILE CODE NAME ; do
+    while read FILE CODE NAME ; do	
 	printf '\t\\\n\t%-12s\tCONFIG_KEYMAP_%s' >&3 \
 		"${SEP}${NAME}" "${CODE}"
 	SEP=' '
 	printf '#include "%s"\t\t/* %s\t%-9s\t*/\n' >&4 \
 		"${FILE}" "${CODE}" "${NAME}"
     done
-    printf '"\t\tAmerican\n\n# EOF.\n' >&3
+    printf '\"\n' >&3
 }
 
-codes | sort +1f | process 3> Config.in 4> keymaps.h
+codes | process 3> Config.in 4> keymaps.h
#2 lore raw

Okay, er, what version is this, since I fixed the
(CONFIG_CPU_80386) in boot/setup.S two years ago.
Check the changelog in /elks, line 70.

Quoted 164 lines · --- Eddy

Sorry, I realized that some stupid auto word-wrap
cut the patch in some
line... I'm trying to attach it.

Quoted 1 line · Eddy

Sorry I was wrong.. in this patch i have corrected

a ld86 parm that

Quoted 5 lines

couldn't let system built. (-t)

File: patch-elks-0.1.3-r2.patch

diff -Naur r2/elks/arch/i86/Makefile

elks/arch/i86/Makefile

Quoted 1 line

--- r2/elks/arch/i86/Makefile 2003-10-14

05:02:42.000000000 +0200

Quoted 1 line

+++ elks/arch/i86/Makefile 2006-08-09

01:44:24.000000000 +0200

Review line 92

Quoted 2 lines
(quoted diff) +0 -0
@@ -92,7 +92,7 @@
        (cd $(BASEDIR) ; $(LD) $(LDFLAGS)

$(ARCH_LD) \

Review line 93

Quoted 1 line
(quoted diff) +0 -0
                $(ARCH_DIR)/sibo/crt0.o

$(ARCH_DIR)/sibo/crt1.o \

Review line 94

Quoted 1 line
(quoted diff) +0 -0
                init/main.o $(ARCHIVES) $(DRIVERS)

\

Review line 95

Quoted 1 line
(quoted diff) +0 -1
-               -t -M -o $(ARCH_DIR)/boot/system >

System.tmp ; \

Review line 95

Quoted 1 line
(quoted diff) +1 -0
+               -M -o $(ARCH_DIR)/boot/system >

System.tmp ; \

Review line 96

Quoted 1 line
(quoted diff) +0 -0
                sort -k4 System.tmp > System.map ;

rm -f System.tmp )

arch/i86/Makefile line 107

Quoted 4 lines
arch/i86/Makefile renamed from elks/arch/i86/Makefile +0 -0
 #SIBO image build

@@ -107,7 +107,7 @@
        (cd $(BASEDIR) ; $(LD) $(LDFLAGS)

$(ARCH_LD) \

Review line 108

Quoted 1 line
(quoted diff) +0 -0
                $(ARCH_DIR)/boot/crt0.o

$(ARCH_DIR)/boot/crt1.o \

Review line 109

Quoted 1 line
(quoted diff) +0 -0
                init/main.o $(ARCHIVES) $(DRIVERS)

\

Review line 110

Quoted 1 line
(quoted diff) +0 -1
-               -t -M -o $(ARCH_DIR)/boot/system >

System.tmp ; \

Review line 110

Quoted 1 line
(quoted diff) +1 -0
+               -M -o $(ARCH_DIR)/boot/system >

System.tmp ; \

Review line 111

Quoted 1 line
(quoted diff) +0 -0
                sort -k4 System.tmp > System.map ;

rm -f System.tmp )

Quoted 3 lines
arch/i86/Makefile renamed from elks/arch/i86/Makefile +0 -0
 #PC image build

diff -Naur r2/elks/arch/i86/boot/setup.S

elks/arch/i86/boot/setup.S

Quoted 1 line

--- r2/elks/arch/i86/boot/setup.S 2003-10-14

05:02:40.000000000 +0200

Quoted 1 line

+++ elks/arch/i86/boot/setup.S 2006-08-09

01:52:40.000000000 +0200

Quoted 10 lines
arch/i86/boot/setup.S renamed from elks/arch/i86/boot/setup.S +1 -1
@@ -585,7 +585,7 @@
        or      al,al
        jnz     is486
 #endif
-#ifdef(CONFIG_CPU_80386)
+#ifdef CONFIG_CPU_80386
         mov cl,#7
        lea     si,p80386
        br      getfpu

diff -Naur

r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg

Quoted 2 lines

elks/arch/i86/drivers/char/KeyMaps/mkcfg
--- r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg

2003-10-14 05:02:42.000000000 +0200
Quoted 1 line

+++ elks/arch/i86/drivers/char/KeyMaps/mkcfg

2006-08-09 01:52:40.000000000 +0200

Review line 13

Quoted 2 lines
(quoted diff) +0 -0
@@ -13,14 +13,14 @@
     printf '# Automatically created - do not

edit.\n\n' >&3

Review line 15

Quoted 2 lines
(quoted diff) +0 -0
     printf "choice 'XT Keyboard support'\t\t" >&3
     printf '/* Automatically created - do not

edit */\n\n' >&4

arch/i86/drivers/char/KeyMaps/mkcfg

Quoted 7 lines
arch/i86/drivers/char/KeyMaps/mkcfg renamed from elks/arch/i86/drivers/char/KeyMaps/mkcfg +1 -1
-    while read FILE CODE NAME ; do
+    while read FILE CODE NAME ; do
        printf '\t\\\n\t%-12s\tCONFIG_KEYMAP_%s'
 &3 \
                "${SEP}${NAME}" "${CODE}"
        SEP=' '
        printf '#include "%s"\t\t/*

%s\t%-9s\t*/\n' >&4 \

arch/i86/drivers/char/KeyMaps/mkcfg

Quoted 7 lines
arch/i86/drivers/char/KeyMaps/mkcfg renamed from elks/arch/i86/drivers/char/KeyMaps/mkcfg +1 -2
                "${FILE}" "${CODE}" "${NAME}"
     done
-    printf '"\t\tAmerican\n\n# EOF.\n' >&3
+    printf '\"\n' >&3
 }
 
-codes | sort +1f | process 3> Config.in 4>

keymaps.h

Quoted 7 lines

+codes | process 3> Config.in 4> keymaps.h

EOF

diff -Naur r2/elks/arch/i86/Makefile

elks/arch/i86/Makefile
--- r2/elks/arch/i86/Makefile 2003-10-14
05:02:42.000000000 +0200
+++ elks/arch/i86/Makefile 2006-08-09
01:44:24.000000000 +0200

arch/i86/Makefile renamed from elks/arch/i86/Makefile +1 -1
@@ -92,7 +92,7 @@
 	(cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
 		$(ARCH_DIR)/sibo/crt0.o $(ARCH_DIR)/sibo/crt1.o \
 		init/main.o $(ARCHIVES) $(DRIVERS) \
-		-t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+		-M -o $(ARCH_DIR)/boot/system > System.tmp ; \
 		sort -k4 System.tmp > System.map ; rm -f
 System.tmp )

#SIBO image build

arch/i86/Makefile renamed from elks/arch/i86/Makefile +1 -1
@@ -107,7 +107,7 @@
 	(cd $(BASEDIR) ; $(LD) $(LDFLAGS) $(ARCH_LD) \
 		$(ARCH_DIR)/boot/crt0.o $(ARCH_DIR)/boot/crt1.o \
 		init/main.o $(ARCHIVES) $(DRIVERS) \
-		-t -M -o $(ARCH_DIR)/boot/system > System.tmp ; \
+		-M -o $(ARCH_DIR)/boot/system > System.tmp ; \
 		sort -k4 System.tmp > System.map ; rm -f
 System.tmp )

#PC image build
diff -Naur r2/elks/arch/i86/boot/setup.S
elks/arch/i86/boot/setup.S
--- r2/elks/arch/i86/boot/setup.S 2003-10-14
05:02:40.000000000 +0200
+++ elks/arch/i86/boot/setup.S 2006-08-09
01:52:40.000000000 +0200

arch/i86/boot/setup.S renamed from elks/arch/i86/boot/setup.S +1 -1
@@ -585,7 +585,7 @@
 	or	al,al
 	jnz	is486
 #endif
-#ifdef(CONFIG_CPU_80386)
+#ifdef CONFIG_CPU_80386
         mov cl,#7
 	lea	si,p80386
 	br	getfpu

diff -Naur
r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg
elks/arch/i86/drivers/char/KeyMaps/mkcfg
--- r2/elks/arch/i86/drivers/char/KeyMaps/mkcfg

2003-10-14 05:02:42.000000000 +0200
+++ elks/arch/i86/drivers/char/KeyMaps/mkcfg
2006-08-09 01:52:40.000000000 +0200
(quoted diff) +0 -0
@@ -13,14 +13,14 @@
     printf '# Automatically created - do not

edit.\n\n' >&3
printf "choice 'XT Keyboard support'\t\t" >&3 printf '/* Automatically created - do not edit
*/\n\n' >&4

arch/i86/drivers/char/KeyMaps/mkcfg renamed from elks/arch/i86/drivers/char/KeyMaps/mkcfg +2 -3
-    while read FILE CODE NAME ; do
+    while read FILE CODE NAME ; do	
 	printf '\t\\\n\t%-12s\tCONFIG_KEYMAP_%s' >&3 \
 		"${SEP}${NAME}" "${CODE}"
 	SEP=' '
 	printf '#include "%s"\t\t/* %s\t%-9s\t*/\n' >&4 \
 		"${FILE}" "${CODE}" "${NAME}"
     done
-    printf '"\t\tAmerican\n\n# EOF.\n' >&3
+    printf '\"\n' >&3
 }
 
-codes | sort +1f | process 3> Config.in 4>
Quoted 3 lines

keymaps.h
+codes | process 3> Config.in 4> keymaps.h

__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com