wok rev 986

Up: syslinux (3.70)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jul 03 10:19:31 2008 +0000 (2008-07-03)
parents 3c48e6f2d04a
children ebf2fcf26fc1
files syslinux-extra/receipt syslinux/receipt syslinux/stuff/tools/keytab-lilo.pl
line diff
     1.1 --- a/syslinux-extra/receipt	Wed Jul 02 18:23:20 2008 +0200
     1.2 +++ b/syslinux-extra/receipt	Thu Jul 03 10:19:31 2008 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="syslinux-extra"
     1.7 -VERSION="3.63"
     1.8 +VERSION="3.70"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="MBR/FAT/EXT3/PXE bootloader files"
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -13,13 +13,14 @@
    1.13  genpkg_rules()
    1.14  {
    1.15      mkdir -p $fs/usr/share/boot
    1.16 -    lzma e $src/memdisk/memdisk $fs/usr/share/boot/memdisk.lzma
    1.17 +    lzma e $src/memdisk/memdisk $fs/usr/share/boot/memdisk.lzma 2>-
    1.18      cp -a $src/mbr/mbr.bin $fs/usr/share/boot
    1.19 -    lzma e $src/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma
    1.20 +    lzma e $src/core/pxelinux.0 $fs/usr/share/boot/pxelinux.0.lzma 2>-
    1.21      #lzma e $src/com32/menu/vesamenu.c32 $fs/usr/share/boot/vesamenu.c32.lzma
    1.22 +    #lzma e $src/com32/modules/mboot.c32 $fs/usr/share/boot/mboot.c32.lzma
    1.23      cp $src/com32/modules/sdi.c32 $fs/usr/share/boot/
    1.24      mkdir -p $fs/bin
    1.25 -    cp -a $src/unix/syslinux-nomtools $fs/bin/syslinux
    1.26 +    cp -a $src/linux/syslinux-nomtools $fs/bin/syslinux
    1.27      cp -a $src/extlinux/extlinux $fs/bin
    1.28      chown root.root $fs/usr/share/boot/* $fs/bin/*
    1.29  }
     2.1 --- a/syslinux/receipt	Wed Jul 02 18:23:20 2008 +0200
     2.2 +++ b/syslinux/receipt	Thu Jul 03 10:19:31 2008 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="syslinux"
     2.7 -VERSION="3.63"
     2.8 +VERSION="3.70"
     2.9  CATEGORY="base-system"
    2.10  SHORT_DESC="LiveCD ISO bootloader (isolinux)"
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 @@ -15,7 +15,7 @@
    2.13  compile_rules()
    2.14  {
    2.15      cd $src
    2.16 -    patch -p1 < ../stuff/tools/keytab-lilo.pl.u
    2.17 +    cp ../stuff/tools/keytab-lilo.pl .
    2.18      for i in /usr/share/kbd/keymaps/i386/*/*.map.gz; do
    2.19          [ "$(basename $(dirname $i))" = "include" ] && continue
    2.20          j=$(basename $i)
    2.21 @@ -28,7 +28,7 @@
    2.22  genpkg_rules()
    2.23  {
    2.24      mkdir -p $fs/boot/isolinux
    2.25 -    cp -a $src/isolinux.bin $fs/boot/isolinux
    2.26 +    cp -a $src/core/isolinux.bin $fs/boot/isolinux
    2.27      cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
    2.28      cp stuff/* $fs/boot/isolinux
    2.29      rm -rf $fs/boot/isolinux/tools $fs/boot/isolinux/*.kbd 2> /dev/null
    2.30 @@ -38,5 +38,10 @@
    2.31          cp $src/$kbd $fs/boot/isolinux/$cfg.kbd
    2.32      done
    2.33      chown root.root $fs/boot/isolinux/*
    2.34 +    # Package all syslinux pkgs
    2.35 +    for i in $(cd $WOK; ls -d syslinux-*)
    2.36 +    do
    2.37 +    	tazwok genpkg $i
    2.38 +    done
    2.39  }
    2.40  
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/syslinux/stuff/tools/keytab-lilo.pl	Thu Jul 03 10:19:31 2008 +0000
     3.3 @@ -0,0 +1,111 @@
     3.4 +#!/usr/bin/perl
     3.5 +# --------------------------------------------------------------------------
     3.6 +# This program was taken from the LILO-20 distribution; only this header
     3.7 +# was added.
     3.8 +#
     3.9 +# LILO program code, documentation and auxiliary programs are
    3.10 +# Copyright 1992-1997 Werner Almesberger.
    3.11 +# All rights reserved.
    3.12 +#
    3.13 +# Redistribution and use in source and binary forms of parts of or the
    3.14 +# whole original or derived work are permitted provided that the
    3.15 +# original work is properly attributed to the author. The name of the
    3.16 +# author may not be used to endorse or promote products derived from
    3.17 +# this software without specific prior written permission. This work
    3.18 +# is provided "as is" and without any express or implied warranties.
    3.19 +# --------------------------------------------------------------------------
    3.20 +
    3.21 +eval { use bytes; }; eval { binmode STDOUT; };
    3.22 +
    3.23 +$DEFAULT_PATH = "/usr/lib/kbd/keytables";
    3.24 +$DEFAULT_MAP = "us";
    3.25 +$DEFAULT_EXT = ".map";
    3.26 +
    3.27 +sub usage
    3.28 +{
    3.29 +    print STDERR
    3.30 +      "usage: $0 [ -p old_code=new_code ] ...\n".
    3.31 +      (" "x(8+length $0))."[path]default_layout[.map] ] ".
    3.32 +      "[path]kbd_layout[.map]\n";
    3.33 +    exit 1;
    3.34 +}
    3.35 +
    3.36 +
    3.37 +while ($ARGV[0] eq "-p") {
    3.38 +    shift(@ARGV);
    3.39 +    &usage unless $ARGV[0] =~ /=/;
    3.40 +    $table[eval($`)] = eval($');
    3.41 +    shift(@ARGV);
    3.42 +}
    3.43 +&usage unless defined $ARGV[0];
    3.44 +load_map("def",defined $ARGV[1] ? $ARGV[0] : undef);
    3.45 +load_map("kbd",defined $ARGV[1] ? $ARGV[1] : $ARGV[0]);
    3.46 +&build_table("plain","shift","ctrl","altgr","shift_ctrl",
    3.47 +  "altgr_ctrl","alt","shift_alt","ctrl_alt");
    3.48 +for ($i = 0; $i < 256; $i++) {
    3.49 +    printf("%c",$table[$i] ? $table[$i] : $i) || die "print: $!";
    3.50 +}
    3.51 +close STDOUT || die "close: $!";
    3.52 +
    3.53 +
    3.54 +sub load_map
    3.55 +{
    3.56 +    local ($pfx,$map) = @_;
    3.57 +    local ($empty,$current);
    3.58 +
    3.59 +    $map = $DEFAULT_MAP unless defined $map;
    3.60 +    $map = $DEFAULT_PATH."/".$map unless $map =~ m|/|;
    3.61 +    $map .= $DEFAULT_EXT unless $map =~ m|/[^/]+\.[^/]+$|;
    3.62 +    if (!open(FILE,"loadkeys -m $map |")) {
    3.63 +	print STDERR "loadkeys -m $map: $!\n";
    3.64 +	exit 1;
    3.65 +    }
    3.66 +    undef $current;
    3.67 +    $empty = 1;
    3.68 +    while (<FILE>) {
    3.69 +	chop;
    3.70 +	if (/^(static\s+)?u_short\s+(\S+)_map\[\S+\]\s+=\s+{\s*$/) {
    3.71 +	    die "active at beginning of map" if defined $current;
    3.72 +	    $current = $pfx.":".$2;
    3.73 +	    next;
    3.74 +	}
    3.75 +	undef $current if /^};\s*$/;
    3.76 +	next unless defined $current;
    3.77 +	s/\s//g;
    3.78 +	$map{$current} .= $_;
    3.79 +	$empty = 0;
    3.80 +    }
    3.81 +    close FILE;
    3.82 +    return unless $empty;
    3.83 +    print STDERR "Keymap is empty\n";
    3.84 +    exit 1;
    3.85 +}
    3.86 +
    3.87 +
    3.88 +sub build_table
    3.89 +{
    3.90 +    local (@maps) = @_;
    3.91 +    local (@tmp);
    3.92 +
    3.93 +    $set = 0;
    3.94 +    for $map (@maps) {
    3.95 +	$code = $set;
    3.96 +	for (split(",",$map{"def:".$map})) {
    3.97 +	    die "bad map entry $_ (def, map $map)" unless /^0x\S\S(\S\S)$/;
    3.98 +	    $tmp[$code] = hex $1 unless $tmp[$code];
    3.99 +	    $code++;
   3.100 +	}
   3.101 +	$set += 256;
   3.102 +    }
   3.103 +    $set = 0;
   3.104 +    for $map (@maps) {
   3.105 +	$code = $set;
   3.106 +	for (split(",",$map{"kbd:".$map})) {
   3.107 +	    die "bad map entry $_ (kbd, map $map)" unless /^0x\S\S(\S\S)$/;
   3.108 +	    $table[$tmp[$code]] = hex $1 unless $table[$tmp[$code]];
   3.109 +	    $code++;
   3.110 +	}
   3.111 +	$set += 256;
   3.112 +    }
   3.113 +    $table[0] = 0;
   3.114 +}