|
List Info
Thread: better patch
|
|
| better patch |
|
2006-08-09 00:04:32 |
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
--- 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
 -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
--- 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
-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=' '
printf '#include "%s"\t\t/*
%s\t%-9s\t*/\n' >&4 \
"$" "$"
"$"
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
-
To unsubscribe from this list: send the line
"unsubscribe linux-8086" in
the body of a message to majordomovger.kernel.org
More majordomo info at http://vge
r.kernel.org/majordomo-info.html
|
|
| better patch |
|
2006-08-09 08:40:01 |
Sorry, I realized that some stupid auto word-wrap cut the
patch in some
line... I'm trying to attach it.
Eddy wrote:
> 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
> --- 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
> -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
> --- 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
> -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=' '
> printf '#include "%s"\t\t/*
%s\t%-9s\t*/\n' >&4 \
> "$"
"$" "$"
> 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
>
>
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
-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
--- 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
-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=' '
printf '#include "%s"\t\t/*
%s\t%-9s\t*/\n' >&4 \
"$" "$"
"$"
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
|
|
| better patch |
|
2006-08-09 17:04:10 |
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.
--- Eddy <eddyx89gmail.com> wrote:
> Sorry, I realized that some stupid auto word-wrap
> cut the patch in some
> line... I'm trying to attach it.
>
> Eddy wrote:
> > 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
> > --- 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
> > -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
> > --- 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
> > -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=' '
> > printf '#include "%s"\t\t/*
> %s\t%-9s\t*/\n' >&4 \
> > "$"
"$" "$"
> > 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
> >
> >
>
> > 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
> -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
> --- 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
> -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=' '
> printf '#include "%s"\t\t/*
%s\t%-9s\t*/\n' >&4 \
> "$" "$"
"$"
> 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
>
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection
around
http://mail.yahoo.com
-
To unsubscribe from this list: send the line
"unsubscribe linux-8086" in
the body of a message to majordomovger.kernel.org
More majordomo info at http://vge
r.kernel.org/majordomo-info.html
|
|
[1-3]
|
|