# HG changeset patch # User Pascal Bellard # Date 1211103801 0 # Node ID 38e7dabd3c3e431b332cc6815f0ac7fedb714f8f # Parent 97526a91fabbb5736cf2f5ce3f9a74e3e8ae61ce Syslinux: fix keymap generation diff -r 97526a91fabb -r 38e7dabd3c3e syslinux/receipt --- a/syslinux/receipt Sat May 17 21:03:22 2008 +0000 +++ b/syslinux/receipt Sun May 18 09:43:21 2008 +0000 @@ -14,6 +14,7 @@ compile_rules() { cd $src + patch -p1 < ../stuff/tools/keytab-lilo.pl.u for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do [ "$(basename $(dirname $i))" = "include" ] && continue j=$(basename $i) @@ -29,7 +30,7 @@ cp -a $src/isolinux.bin $fs/boot/isolinux cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux cp stuff/* $fs/boot/isolinux - rm -r $fs/boot/isolinux/slitaz.* $fs/boot/isolinux/*.kbd 2> /dev/null + rm -rf $fs/boot/isolinux/tools $fs/boot/isolinux/*.kbd 2> /dev/null grep kbd$ $fs/boot/isolinux/*.cfg | while read cfg kbd; do cfg=$(basename ${cfg%.cfg:*}) sed -i "s/$kbd/$cfg.kbd/" $fs/boot/isolinux/$cfg.cfg diff -r 97526a91fabb -r 38e7dabd3c3e syslinux/stuff/slitaz.css --- a/syslinux/stuff/slitaz.css Sat May 17 21:03:22 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,345 +0,0 @@ -/* - CSS style for SliTaz GNU/Linux website - www.slitaz.org - (c) 2007 Pankso -*/ - -body { - background: #222222; - color: black; - font: 13px sans-serif, vernada, arial; - margin: 0; -/* padding-bottom: 100%;*/ -} - -/* Accessibility */ - -#access { - position: absolute; - top: 1px; - right: 6px; - text-align: right; - width: 100%; - margin: 0; - font-size: 12px; - font-weight: bold; -} - -#access a { - background: inherit; - color: #222222; - text-decoration: none; -} - -#access a:hover { - background: inherit; - color: #EDEDED; -} - -/* Header and title */ - -#header{ - background: #f0ba08 url(http://www.slitaz.org/pics/website/header.png) repeat-x top; - color: black; - width: 100%; - height: 50px ; - border-top: 1px solid black; - border-bottom: 1px solid black; - margin-bottom: 30px; -} - -#titre{ - font-size: 16px; - font-weight: bolder ; - margin-left: 232px; - margin-top: 4px; - padding-top: 25px ; -} - -#logo { - position: absolute; - float: left; - margin-left: 32px; - margin-right: 20px; - margin-top: 0px; -} - -/* Navigation */ - -#nav { - position: absolute; - top: 100px; - right: 6px; - background: #eaeaea url(http://www.slitaz.org/pics/website/nav-tr.png) no-repeat top right; - color: black; - float: right; - width: 152px; - line-height: 1.3em; - text-align: center; - font-size: 12px; - font-weight: bold; -} - -#nav_top { - background: transparent url(http://www.slitaz.org/pics/website/nav-tl.png) no-repeat top left; - height: 12px; -} - -#nav_bottom { - background: transparent url(http://www.slitaz.org/pics/website/nav-bl.png) no-repeat bottom left; - height: 12px; -} - -#nav_bottom_img { - background: transparent url(http://www.slitaz.org/pics/website/nav-br.png) no-repeat bottom right; - height: 12px; -} - -#nav ul{ - list-style-type: none; - margin: 0px 0px 0px 6px; - padding: 2px; -} - -#nav li { - display: inline; -} - -#nav a { - color: #3E1220; - background: inherit; - display: block; - padding: 0.5px; - text-decoration: none; -} - -#nav a:hover { - color: #DF8F06; - text-decoration: none; - display: block; -} - -#nav i { - color: #DF8F06; -} - -/* Page content */ - -#content, #content_bottom, #content_top { - background: white; - color: black; - text-align: justify; -} - -#content_top { - height: 14px; - margin: 0px 70px 0px 70px; -} - -#content { - height: auto; - margin: -6px 70px 0px 70px; - padding: 0px 72px 1px 72px; - /*background: white; - color: #333333;*/ -} - -#content_bottom { - height: 14px; - margin: 0px 70px 0px 70px; - /*clear: both;*/ -} - -#content li { - line-height: 1.5em; - text-align: left; -} - -/* Legal informations */ - -#copy { - font-size: 11px ; - text-align: center ; - background: transparent; - color: #a8a8a8; - padding-top: 10px; -} - -#copy a { - background: inherit; - color: #a8a8a8; -} - -#copy a:hover { - background: inherit; - color: #EDEDED; -} - -/* Footer */ - -#bottom { - float: none; - background: inherit; - color: black; - width: auto; - clear: both; - padding: 0; - margin: 0; - text-align: center; - vertical-align: middle; -} - -#news li { - list-style-type: square; - border-bottom: 1px dotted #BEBEBE; - margin-left: -25px; - padding: 4px 0px 4px 0px; -} -#gallery { - text-align: center; -} - -/* CSS class. */ - -.top_left, .top_right, .bottom_left, .bottom_right { - height: 14px; - width: 14px; - color: white; - background-color: #333333; - background-repeat: no-repeat; -} - -.top_left { - background-image: url(http://www.slitaz.org/pics/website/content-tl.png); - background-position: left top; - position: absolute; -} - -.top_right { - background-image: url(http://www.slitaz.org/pics/website/content-tr.png); - float: right; -} - -.bottom_left { - background-image: url(http://www.slitaz.org/pics/website/content-bl.png); - position: absolute; -} - -.bottom_right { - background-image: url(http://www.slitaz.org/pics/website/content-br.png); - float: right; -} - -/* HTML styles */ - -h1 { - color: #3E1220; - background: inherit; - text-align: left; - margin: 0px 0px 8px -58px; -} - -h2 { - color: #DF8F06; - border-left: 10px solid #F3F3F3; - padding: 0px 0px 0px 4px; - margin: 0; -} - -h3 { - font-weight: bold; - color: #6c0023; - background: inherit; -} - -a { - text-decoration: underline; - color: #0F314E; - background: inherit; -} - -a:hover { - text-decoration: none; - color: blue; - background: inherit; -} - -code { - font-size: 12px; - color: #669900; - background: inherit; -} - -tt { - color: #15EE15; - background: inherit; -} - -img { - border: 0pt none; -} - -fieldset { - background: #E2ECf6; - color: black; - margin-top: 25px; - border: 1px solid black; -} - -legend { - border: 1px solid black; - color: #6c0023; - background: #eaeaea; - font-weight: bold; -} - -pre { - padding: 5px; - color: black; - background: #E1E0B0; -} - -pre.script { - padding: 10px; - color: black; - background: #E8E8E8; - border: 1px inset #606060; -} - -textarea { - background: #E5E5E5; - margin-top: 12px; -} - -input[type=submit] { - background: #E5E5E5; - color: black; - border: 1px outset #111111; - font-weight: bold; -} - -input[type=submit]:hover { - background: #F3F3F3; - color: black; -} - -/* Packages pages */ - -.pkg_nav { - border-top: 1px solid black; - margin-top: 10px; - padding-top: 10px; -} - -pre.package { - padding: 0px; - color: black; - background: white; -} - -p.get { - text-align: center; - padding: 10px; - color: black; - background: #F3F3F3; - border: 1px solid #DEDEDE; -} diff -r 97526a91fabb -r 38e7dabd3c3e syslinux/stuff/slitaz.html --- a/syslinux/stuff/slitaz.html Sat May 17 21:03:22 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ - - - - SliTaz GNU/Linux - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
- - -
- - -

Bienvenue - Welcome !

-

Comment démarrer ?

- -

-ENTER pour booter, F1 pour afficher la page d'aide. -
-[login] hacker ou root avec le mot de -passe root. -

- -

Exemple, clavier français :

- -

- boot: fr <ENTER> -
- boot: <ENTER> -

- -
- - - -
-
-
-
- - -
-

-SliTaz GNU/linux - Simple Light Incredible Temporary Autonomous Zone -
-Copyright © 2008 SliTaz - http://www.slitaz.org/ -

- -
- - - diff -r 97526a91fabb -r 38e7dabd3c3e syslinux/stuff/tools/keytab-lilo.pl.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/tools/keytab-lilo.pl.u Sun May 18 09:43:21 2008 +0000 @@ -0,0 +1,10 @@ +--- syslinux-3.63/keytab-lilo.pl ++++ syslinux-3.63/keytab-lilo.pl +@@ -66,5 +66,5 @@ + chop; +- if (/^u_short\s+(\S+)_map\[\S+\]\s+=\s+{\s*$/) { ++ if (/^(static\s+)?u_short\s+(\S+)_map\[\S+\]\s+=\s+{\s*$/) { + die "active at beginning of map" if defined $current; +- $current = $pfx.":".$1; ++ $current = $pfx.":".$2; + next; diff -r 97526a91fabb -r 38e7dabd3c3e syslinux/stuff/tools/slitaz.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/tools/slitaz.css Sun May 18 09:43:21 2008 +0000 @@ -0,0 +1,345 @@ +/* + CSS style for SliTaz GNU/Linux website + www.slitaz.org - (c) 2007 Pankso +*/ + +body { + background: #222222; + color: black; + font: 13px sans-serif, vernada, arial; + margin: 0; +/* padding-bottom: 100%;*/ +} + +/* Accessibility */ + +#access { + position: absolute; + top: 1px; + right: 6px; + text-align: right; + width: 100%; + margin: 0; + font-size: 12px; + font-weight: bold; +} + +#access a { + background: inherit; + color: #222222; + text-decoration: none; +} + +#access a:hover { + background: inherit; + color: #EDEDED; +} + +/* Header and title */ + +#header{ + background: #f0ba08 url(http://www.slitaz.org/pics/website/header.png) repeat-x top; + color: black; + width: 100%; + height: 50px ; + border-top: 1px solid black; + border-bottom: 1px solid black; + margin-bottom: 30px; +} + +#titre{ + font-size: 16px; + font-weight: bolder ; + margin-left: 232px; + margin-top: 4px; + padding-top: 25px ; +} + +#logo { + position: absolute; + float: left; + margin-left: 32px; + margin-right: 20px; + margin-top: 0px; +} + +/* Navigation */ + +#nav { + position: absolute; + top: 100px; + right: 6px; + background: #eaeaea url(http://www.slitaz.org/pics/website/nav-tr.png) no-repeat top right; + color: black; + float: right; + width: 152px; + line-height: 1.3em; + text-align: center; + font-size: 12px; + font-weight: bold; +} + +#nav_top { + background: transparent url(http://www.slitaz.org/pics/website/nav-tl.png) no-repeat top left; + height: 12px; +} + +#nav_bottom { + background: transparent url(http://www.slitaz.org/pics/website/nav-bl.png) no-repeat bottom left; + height: 12px; +} + +#nav_bottom_img { + background: transparent url(http://www.slitaz.org/pics/website/nav-br.png) no-repeat bottom right; + height: 12px; +} + +#nav ul{ + list-style-type: none; + margin: 0px 0px 0px 6px; + padding: 2px; +} + +#nav li { + display: inline; +} + +#nav a { + color: #3E1220; + background: inherit; + display: block; + padding: 0.5px; + text-decoration: none; +} + +#nav a:hover { + color: #DF8F06; + text-decoration: none; + display: block; +} + +#nav i { + color: #DF8F06; +} + +/* Page content */ + +#content, #content_bottom, #content_top { + background: white; + color: black; + text-align: justify; +} + +#content_top { + height: 14px; + margin: 0px 70px 0px 70px; +} + +#content { + height: auto; + margin: -6px 70px 0px 70px; + padding: 0px 72px 1px 72px; + /*background: white; + color: #333333;*/ +} + +#content_bottom { + height: 14px; + margin: 0px 70px 0px 70px; + /*clear: both;*/ +} + +#content li { + line-height: 1.5em; + text-align: left; +} + +/* Legal informations */ + +#copy { + font-size: 11px ; + text-align: center ; + background: transparent; + color: #a8a8a8; + padding-top: 10px; +} + +#copy a { + background: inherit; + color: #a8a8a8; +} + +#copy a:hover { + background: inherit; + color: #EDEDED; +} + +/* Footer */ + +#bottom { + float: none; + background: inherit; + color: black; + width: auto; + clear: both; + padding: 0; + margin: 0; + text-align: center; + vertical-align: middle; +} + +#news li { + list-style-type: square; + border-bottom: 1px dotted #BEBEBE; + margin-left: -25px; + padding: 4px 0px 4px 0px; +} +#gallery { + text-align: center; +} + +/* CSS class. */ + +.top_left, .top_right, .bottom_left, .bottom_right { + height: 14px; + width: 14px; + color: white; + background-color: #333333; + background-repeat: no-repeat; +} + +.top_left { + background-image: url(http://www.slitaz.org/pics/website/content-tl.png); + background-position: left top; + position: absolute; +} + +.top_right { + background-image: url(http://www.slitaz.org/pics/website/content-tr.png); + float: right; +} + +.bottom_left { + background-image: url(http://www.slitaz.org/pics/website/content-bl.png); + position: absolute; +} + +.bottom_right { + background-image: url(http://www.slitaz.org/pics/website/content-br.png); + float: right; +} + +/* HTML styles */ + +h1 { + color: #3E1220; + background: inherit; + text-align: left; + margin: 0px 0px 8px -58px; +} + +h2 { + color: #DF8F06; + border-left: 10px solid #F3F3F3; + padding: 0px 0px 0px 4px; + margin: 0; +} + +h3 { + font-weight: bold; + color: #6c0023; + background: inherit; +} + +a { + text-decoration: underline; + color: #0F314E; + background: inherit; +} + +a:hover { + text-decoration: none; + color: blue; + background: inherit; +} + +code { + font-size: 12px; + color: #669900; + background: inherit; +} + +tt { + color: #15EE15; + background: inherit; +} + +img { + border: 0pt none; +} + +fieldset { + background: #E2ECf6; + color: black; + margin-top: 25px; + border: 1px solid black; +} + +legend { + border: 1px solid black; + color: #6c0023; + background: #eaeaea; + font-weight: bold; +} + +pre { + padding: 5px; + color: black; + background: #E1E0B0; +} + +pre.script { + padding: 10px; + color: black; + background: #E8E8E8; + border: 1px inset #606060; +} + +textarea { + background: #E5E5E5; + margin-top: 12px; +} + +input[type=submit] { + background: #E5E5E5; + color: black; + border: 1px outset #111111; + font-weight: bold; +} + +input[type=submit]:hover { + background: #F3F3F3; + color: black; +} + +/* Packages pages */ + +.pkg_nav { + border-top: 1px solid black; + margin-top: 10px; + padding-top: 10px; +} + +pre.package { + padding: 0px; + color: black; + background: white; +} + +p.get { + text-align: center; + padding: 10px; + color: black; + background: #F3F3F3; + border: 1px solid #DEDEDE; +} diff -r 97526a91fabb -r 38e7dabd3c3e syslinux/stuff/tools/slitaz.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/syslinux/stuff/tools/slitaz.html Sun May 18 09:43:21 2008 +0000 @@ -0,0 +1,99 @@ + + + + SliTaz GNU/Linux + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + +
+ + +

Bienvenue - Welcome !

+

Comment démarrer ?

+ +

+ENTER pour booter, F1 pour afficher la page d'aide. +
+[login] hacker ou root avec le mot de +passe root. +

+ +

Exemple, clavier français :

+ +

+ boot: fr <ENTER> +
+ boot: <ENTER> +

+ +
+ + + +
+
+
+
+ + +
+

+SliTaz GNU/linux - Simple Light Incredible Temporary Autonomous Zone +
+Copyright © 2008 SliTaz - http://www.slitaz.org/ +

+ +
+ + +