diff options
Diffstat (limited to 'tools')
185 files changed, 431 insertions, 2734 deletions
diff --git a/tools/.cvsignore b/tools/.cvsignore deleted file mode 100644 index 88754bc8b..000000000 --- a/tools/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -rpm2header -gendepslist -xhost+ -rpcinfo-flushed diff --git a/tools/2adsldb.pm b/tools/2adsldb.pm deleted file mode 100644 index 23328aafc..000000000 --- a/tools/2adsldb.pm +++ /dev/null @@ -1,17 +0,0 @@ -open F, "isplist.txt" or die "file $file not found"; -open G, ">tutu" or die "file $file not found"; -foreach (<F>) { - s/\#.*//; - /.*ADSL.*/ or next; -#| NOM | PAYS | CONNECTION | MAILTYPE | SMTP | MAILSERVER | NEWS | MY1DNS | MY2DNS | PROXY | PROXYSERVER | DHCP | EMAIL - s/(.*)france(.*)/$1France$2/; - s/(.*)FRANCE(.*)/$1France$2/; - s/(.*)USA(.*)/$1United States$2/; - s/(.*)U.S.A(.*)/$1United States$2/; - s/(.*)US(.*)/$1United States$2/; - s/(.*)usa(.*)/$1United States$2/; - s/(.*)club-internet(.*)/$1club internet$2/; - my ($name, $country, $connexion, $mailtype, $smtp, $popserver, $mailserver, $news, $dns1, $dns2, $proxy, $proxyserver, $dhcp, $email) = split /\|/; - print G join("|", $country, join("=>", $name, $dns1, $dns2)), "\n"; #$domain, -} - diff --git a/tools/2isdndb.pm b/tools/2isdndb.pm deleted file mode 100644 index 536808706..000000000 --- a/tools/2isdndb.pm +++ /dev/null @@ -1,25 +0,0 @@ -open F, "isdndb.txt" or die "file $file not found"; -open G, ">tutu" or die "file $file not found"; -foreach (<F>) { - s/\#.*//; -# s/\[City\]\s+National//; - /\[Country\]\s*(.*)/ and $country = $1; - /\[City\]\s*(.*)/ and $city = $1; - /\[Name\]\s*(.*)/ and $name = $1; - /\[Prefix\]\s*(.*)/ and $prefix = $1; - /\[ISDN\]\s*(.*)/ and $isdn = $1; - /\[Encaps\]\s*.*/ and do { defined $dns1 and $dns2=""; }; - /\[Domain\]\s*(.*)/ and $domain = $1; - /\[DNS\]\s*(.*)/ and ($dns1 ? $dns2 : $dns1) = $1; - /\[End\]\s*(.*)/ and do { undef $name; undef $prefix; undef $isdn; undef $domain; undef $dns1; undef $dns2; }; - if ($isdn && !$prefix) { $prefix = "" } - if (defined $name && defined $isdn && defined $domain && defined $dns1 && defined $dns2) { - print G join("|", $country, $city, join("=>", $name, $prefix . $isdn, $domain, $dns1, $dns2)), "\n"; - undef $name; - undef $prefix; - undef $isdn; - undef $domain; - undef $dns1; - undef $dns2; - } -} diff --git a/tools/Makefile b/tools/Makefile index 9c1290a1e..40194245d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,10 +1,8 @@ -include ../Makefile.config - -RPMS = $(wildcard $(MAIN_RPMS_DIR)/*.rpm) DIRS = serial_probe -CFLAGS = -Wall +LDFLAGS = $(shell pkg-config libtirpc --libs) +CFLAGS = -Wall $(shell pkg-config libtirpc --cflags) -ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)") +ARCH := $(shell arch | grep -E "x86_64") ifneq ("x$(ARCH)", "x") LIB_NAME = lib64 else @@ -13,23 +11,14 @@ endif .PHONY: clean install $(DIRS) -all: $(DIRS) xhost+ rpcinfo-flushed install +all: $(DIRS) rpcinfo-flushed $(DIRS): make -C $@ install: - @install -d $(MISC_DEST)/auto $(MISC_DEST)/Distribconf - @install mdkinst_stage2_tool $(MISC_DEST) - cp -rf `perldoc -l packdrake` $(MISC_DEST) || { echo "install packdrake first!" ; exit 1; } - cp -rf `perldoc -l Packdrakeng` $(MISC_DEST) || { echo "install packdrake first!" ; exit 1; } - cp -rf `perldoc -l Distribconf` $(MISC_DEST) || { echo "install rpmtools first!" ; exit 1; } - cp -rf `perldoc -l Distribconf::Build` $(MISC_DEST)/Distribconf || { echo "install rpmtools first!" ; exit 1; } - @cp -rf `perldoc -l URPM | sed s/URPM.pm//`URPM* $(MISC_DEST) || { echo "install perl-URPM first!" ; exit 1; } - @cp -rf `perldoc -l URPM | sed s/URPM.pm//`auto/URPM $(MISC_DEST)/auto || { echo "install perl-URPM first!" ; exit 1; } - @cd /usr/bin ; install packdrake $(MISC_DEST) || { echo "packdrake is missing"; exit 1; } - @cd /usr/bin ; install gendistrib rpm2header $(MISC_DEST) || { echo "install rpmtools first!" ; exit 1; } - @mkdir -p $(STAGE2_LIVE)/usr/bin + install -d $(ROOTDEST)/misc + install mdkinst_stage2_tool drakx-in-chroot $(ROOTDEST)/misc xhost+: %: %.c $(CC) $(CFLAGS) $< -L/usr/X11R6/$(LIB_NAME) -lX11 -o $@ diff --git a/tools/addchangelog.pl b/tools/addchangelog.pl deleted file mode 100755 index 8e39802a6..000000000 --- a/tools/addchangelog.pl +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/perl - -@ARGV == 1 or die "usage $0: <cvslog2changelog script>\n"; - -($script) = @ARGV; - -$date = (split('/', `grep ChangeLog perl-install/CVS/Entries`))[3]; - -@changelog = `(cvs log -d ">$date" docs mdk-stage1 rescue tools ; cd perl-install; cvs log -d ">$date") | $script`; -@before = `cat perl-install/ChangeLog`; - -open F, ">perl-install/ChangeLog"; -print F foreach @changelog, @before; - -`cvs commit -m '' perl-install/ChangeLog` =~ /new revision: (.*?);/; - -print "$1\n"; -print foreach @changelog; diff --git a/tools/alpha/cd/Makefile b/tools/alpha/cd/Makefile deleted file mode 100644 index 67af70f2f..000000000 --- a/tools/alpha/cd/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -install: - cp -f README README.milo $(ROOTDEST) - install -d $(ROOTDEST)/etc - cp -f aboot.cnf $(ROOTDEST)/etc - - install -d $(ROOTDEST)/boot - cp -a up1000 $(ROOTDEST)/boot - mv -f $(ROOTDEST)/boot/up1000/apb.* $(ROOTDEST) diff --git a/tools/alpha/cd/README b/tools/alpha/cd/README deleted file mode 100644 index 78eb94bd5..000000000 --- a/tools/alpha/cd/README +++ /dev/null @@ -1,40 +0,0 @@ -!! beta version !! - -Mandrake Alpha short Howto-Install - -this doc is for SRM, if you have alphabios, see README.milo - - -* to install from the cdrom: - -- either boot on the cdrom: - - in SRM, find the device name corresponding to the cdrom (`show device' can help) - - enter `boot dqa0 -fl 0' (replacing dqa0 by the cdrom device) - -- or you can boot on a floppy: - - first create a boot floppy from images/cdrom.img - - in SRM, find the device name corresponding to the floppy (`show device' can help) - - enter `boot dva0 -fl 0' (replacing dva0 by the floppy device) - - fulfill the install. - -* on reboot: - -- either enter `boot XXXX -fl 0' where XXXX is the device where you installed -the system - -- if the device is not available via SRM, use the -cdrom: `boot dqa0 -file boot/v.gz -fl root=/dev/sda1' (replace sda1 by the -root you installed on, and dqa0 by the cdrom device) - - -* to install from the network: - -Same as for the cdrom install, except give `boot dqa0 -fl 1' or boot on -images/network.img floppy (with `boot dva0 -fl 0') - - - - Alpha Team. - -Reports problems to Chmouel Boudjnah <chmouel@mandrakesoft.com> or Pixel -<pixel@mandrakesoft.com>. diff --git a/tools/alpha/cd/README.milo b/tools/alpha/cd/README.milo deleted file mode 100644 index d2a52abe9..000000000 --- a/tools/alpha/cd/README.milo +++ /dev/null @@ -1,13 +0,0 @@ -* to install from the cdrom: - -- put boot/cdrom.rdz on a floppy - -- put that floppy in drive fd0 - -- configure alphabios with (example for miata): - -Boot File: CD: \milo\miata\linload.exe -OS path: CD: \milo\miata\milo -OS options: boot scd0:/boot/instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000 - -if you want text install, just add "text" to the options above diff --git a/tools/alpha/cd/aboot.cnf b/tools/alpha/cd/aboot.cnf deleted file mode 100644 index 42c7a4382..000000000 --- a/tools/alpha/cd/aboot.cnf +++ /dev/null @@ -1,3 +0,0 @@ -0:boot/instboot.gz initrd=boot/cdrom.rdz mdkinst rw ramdisk=32000 cdrom -1:boot/instboot.gz initrd=boot/network.rdz mdkinst rw ramdisk=32000 network -2:boot/instboot.gz initrd=boot/hd.rdz mdkinst rw ramdisk=32000 hd diff --git a/tools/alpha/cd/up1000/5100440A.txt b/tools/alpha/cd/up1000/5100440A.txt deleted file mode 100644 index ba6c5a9f1..000000000 --- a/tools/alpha/cd/up1000/5100440A.txt +++ /dev/null @@ -1,25 +0,0 @@ -The source code for the object code and executable programs licensed - -under GNU General Public License Version 2, June 1991 are available - -from Alpha Processor, Inc. at the API web site - - - - http://www.Alpha-Processor.COM - - - -For each distributed object or executable form of the programs, you - -will find an identifying API part number. You may use that part - -number to find the corresponding machine-readable source code. - - - -If you have any questions, contact Customer Support at API. - - - -51-0044-0A
\ No newline at end of file diff --git a/tools/alpha/cd/up1000/README.txt b/tools/alpha/cd/up1000/README.txt deleted file mode 100644 index 88f8855d3..000000000 --- a/tools/alpha/cd/up1000/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -Known issues with the UP1000 system: - -1. Linux boot via floppy disk drive: - When booting Linux via APB, it takes about 5 minutes for APB to load the kernel image from a floppy device. Booting from a hard disk takes a matter of seconds. - -2. 2x AGP card: - a. At the present time, 2x AGP driver for Linux is not available so 2x mode has not been tested. - b. The following cards have been used in 1x AGP mode: cards with Permedia-2 controller: Fire - GL1000, ELSA Synergy, E&S, Matrox Millenium G200 and Stealth 2000. - c. 3Dfx Rage Pro Turbo card does not work because the option ROM on the AGP card is - not properly emulated by Alpha BIOS. - -3. Linux installation: - a. To install Linux, please click the "Utilities" menu in the Alpha BIOS setup mode and the - "Run Maintenance Program". And follow the Linux installation procedure that API provides. - b. Please do not use the "Install Linux" menu in the "Operating System" menu.
\ No newline at end of file diff --git a/tools/alpha/cd/up1000/apb.cfg b/tools/alpha/cd/up1000/apb.cfg deleted file mode 100755 index 06614adcb..000000000 --- a/tools/alpha/cd/up1000/apb.cfg +++ /dev/null @@ -1,2 +0,0 @@ -floppy|bootl boot\up1000\up1000.pal boot\instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000 -floppy_text|bootl boot\up1000\up1000.pal boot\instboot.gz root=/dev/fd0 load_ramdisk=1 mdkinst rw ramdisk_size=32000 text diff --git a/tools/alpha/cd/up1000/apb.exe b/tools/alpha/cd/up1000/apb.exe Binary files differdeleted file mode 100755 index 4b3aa6099..000000000 --- a/tools/alpha/cd/up1000/apb.exe +++ /dev/null diff --git a/tools/alpha/cd/up1000/install.txt b/tools/alpha/cd/up1000/install.txt deleted file mode 100644 index 61dff54f9..000000000 --- a/tools/alpha/cd/up1000/install.txt +++ /dev/null @@ -1,356 +0,0 @@ - -- Contents of floppy - -apb.exe Alpha Processor bootloader v. 1.0.1. -apb.cfg Sample apb configuration file. -up1000.pal PAL code for Linux on UP1000. -vmlinux.gz Linux kernel v. 2.2.12 with UP1000 patch. -System.gz Kernel Symbol table. -INSTALL This file. - - -- Installation of RedHat Linux from CD ROM - -1. Copy this directory to a floppy disk. - -2. Insert floppy disk and RedHat Linux CD ROM. - This installation guide assumes - - hard disk is connected to primary channel as a master - - CD ROM drive is connected to primary channel as a slave - -3. From AlphaBIOS run apb.exe as a utility program. - [F2]->Utility->Run maintanace program - -4. At the apb command prompt, type - apb> cd floppy - apb> bootl up1000.pal vmlinux.gz root=/dev/hdb - This assumes you have an ATAPI CD ROM drive which Linux recognizes - as /dev/hdb (you may have to try /dev/hda, /dev/hdc, etc. depending - on your configuration. For a SCSI CD ROM drive, /dev/scd or - /dev/scd0. - -5. This should get you into the RedHat installation program. During the - disk partitioning phase of the installation be sure to allocate a small - FAT partition to be used as the "boot" partition. 10 MB should be ample. - If you choose 'Workstation' or 'Server' package then you don't need to - partition the disk by yourself. - * Follow the common redhat installation procedure. - * During install, Don't configure X server, - * Select 'Startup through ARC console' on timezone setup menu. - -6. Due to bugs in redhat 6.0, FAT partition is not formatted during installation - depends on package selection. - So, After installation, run apb.exe from flopy again and at the - apb command prompt, type - apb> cd floppy - apb> bootl up1000.pal vmlinux.gz root=/dev/hda5 single - You'll get shell prompt then type following commands. - # mkfs -t msdos /dev/hda1 - # mount /dev/hda1 /dos - # mcopy a:*.* /dos - # gzip -dc /dos/system.gz > /boot/System.map - # ln -s Tsunami /etc/alpha_systype - # init 6 - -8. Configure the OS selection menu of AlphaBIOS to start apb.exe - from the boot partition. - In 'OS Selection' menu([F2]->Operating system->OS selection setup), - Make an entry like this. - - Boot name: Linux - Boot file: Disk 0 Partition 1 \apb.exe - OS Path : Disk 0 Partition 2 \winnt - OS Options: - - OS Path doesn't have any meaning, just leave it intact. - -9. You can run apb from hard disk by selecting what you configured on step 8. - -10. Set the environment variable APB_DEVICE to be the AlphaBIOS name - of the boot partition. - For example, - apb> setenv APB_DEVICE scsi(0)disk(0)rdisk(0)partition(1) - type 'cd' once to make above environment variable change to be applied. - apb> cd - -11. Now, You can boot linux by selecting 'Linux' on BIOS' OS boot menu - and then type this on apb prompt - - apb> bootl up1000.pal vmlinux.gz root=/dev/hda5 - - If you don't want to type above long line everytime. You have two options - 1. Create apb.cfg file under /dos directory, Its contents look like - - linux|bootl up1000.pal vmlinux.gz root=/dev/hda5 - - then you can boot linux by typying - - apb> boot linux - - 2. Put option string in OS Selection setup menu of BIOS setup. - - Boot name: Linux - Boot file: Disk 0 Partition 1 \apb.exe - OS Path : Disk 0 Partition 2 \winnt - OS Options: bootl up1000.pal vmlinux.gz root=/dev/hda5 - - Then this setup will boot linux without apb prompt. - - -------------------------------------------------------------------------------- - - - APB -- Alpha Processor Bootstrap Loader for AlphaBIOS - - Alpha Processor, Inc. - 130C Baker Ave. Ext. - Concord, MA 01742, USA - - David Daniel, Soohoon Lee, Stig Telfer - customer.support@alpha-processor.com - -======================================================================== - - Copyright (c) 1999, Alpha Processor, Inc. - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the copyright notice and this permission notice appear -in all copies of software and supporting documentation, and that the -name of Alpha Processor not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. Alpha Processor grants this permission provided -that you prominently mark, as not part of the original, any -modifications made to this software or documentation. - -Alpha Processor disclaims all warranties and/or guarantees with regard -to this software, including all implied warranties of fitness for a -particular purpose and merchantability, and makes no representations -regarding the use of, or the results of the use of, the software and -documentation in terms of correctness, accuracy, reliability, -currentness or otherwise; and you rely on the software, documentation -and results solely at your own risk. - -======================================================================== - - -0. Introduction - -APB is a bootstrap loader for Alpha processor based systems with -AlphaBIOS firmware. It is primarily intended to be used for booting -Linux, though it may also be useful for free BSD derived systems. - -APB borrows ideas and some code from many places, notably Linux and -other Linux loaders for Alpha systems (aboot and MILO), and the ARCDos -example in the ARC Application Development Kit. APB can also be -linked against zlib to support reading compressed kernel and PALcode -images. See the file CREDITS for details. - - -1. Using APB - -+ Overview - -APB presents a simple command line interface with the following -commands - - boot TARGET boot a target in the configuration file - bootl PALCODE KERNEL ARG1 ... boot Unix - cd DEVICE set the current device - cp | copy FILE1 FILE2 copy files - exit | quit exit to AlphaBIOS - halt | reset system shutdown options - ls | dir list files on the current device - mkdir DIR make a directory - more FILE list a file - mv | rename FILE1 FILE2 rename a file - pwd print the current device - rm | delete FILE delete a file - printenv [NAME] print environment variable(s) - setenv [NAME [VAL]] (un)set environment variable - show targets | devices show information - -At any time an AlphaBIOS is device is selected as the default or -current device. On initialization this is set to the value of the -APB_DEVICE firmware environment variable, or "multi(0)disk(0)fdisk(0)" -(usually the floppy device) if this is not set. - -To change the default device, use the "cd" command. For example - - cd scsi(0)disk(0)rdisk(0)partition(2)\os\linux - -sets the default device to be the second partition of the disk 0 on -the 0th SCSI controller. To save this for future invocations, set the -APB_DEVICE firmware environment variable using the "setenv" command: - - setenv APB_DEVICE scsi(0)disk(0)rdisk(0)partition(2)\os\linux - -After this you can return to this device using "cd". - -Also the special targets - - cd floppy - cd cdrom - -will take you to the (first) floppy and CD-ROM drives respectively. - -If there is a file system supported by AlphaBIOS on the device -- FAT, -ISO 9660 (CD-ROM) -- then a directory listing can be obtained using -the "dir" or "ls" command: - - apb> ls - Directory listing of scsi(0)disk(0)rdisk(0)partition(2): - APB.CFG - APB.EXE - LINUX.PAL - VMLINUX - - -+ Booting from disk - -The recommended way to boot a system using APB is set aside a small -(10 - 30 MB) FAT partition on one disk to be used as a boot partition. -The following files should be placed on the boot partition: - - The APB image (APB.EXE) - The PALcode image - The kernel image - An optional configuration file "APB.CFG" (see below) - -Run APB (either from floppy or from the boot partition and use it to -set the environment variable APB_DEVICE to the name of the boot -partition. For example if the boot partition is the first partition -on a SCSI disk with SCSI ID 3 on the first SCSI controller, and the files are in directory \os\linux set APB_DEVICE using - - apb> setenv APB_DEVICE scsi(0)disk(3)rdisk(0)partition(1)\os\linux - -To enable autoboot - - apb> setenv APB_AUTOBOOT 1 - -This performs the first boot command it finds in the APB configuration -file, unless interrupted. - -Otherwise boot manually using a command such as - - apb> bootl palcode kernel [kernel_arg1 [kernel_arg1 ...]] - -or use one of the labels defined in the APB configuration file, for -example - - apb> boot linux - -See below for the configuration file format. - -+ Environment variables - -APB uses the following firmware environment variables to set default -noptions: - - APB_DEVICE Default device for all operations - APB_AUTOBOOT Determines whether an autoboot should be attempted - -If these are not set on invocation, then they are set to reasonable -values, namely - - APB_DEVICE=multi(0)disk(0)fdisk(0) - APB_AUTOBOOT=0 - -+ Configuration file - -APB consults a configuration file "APB.CFG" that is assumed to be -located at the current device path (initially given by environment -variable APB_DEVICE). The file consists of lines that are either -comments, or boot commands prefixed with a mnemonic label. For example - - # This is comment - linux-2.2|bootl linux.pal vmlinux.gz root=/dev/sda3 - linux-2.0|bootl linux.pal vml20.gz root=/dev/sda3 - -In this case, to boot linux-2.2, type - - apb> boot linux-2.2 - -which is equivalent to - - apb> bootl linux.pal vmlinux.gz root=/dev/sda3 - -If the AUTO_BOOT environment variable is set TRUE, then the default -configuration will be booted after 10 seconds, unless a key is -pressed. - -+ Boot devices - -APB can boot from any filesystem supported by AlphaBIOS. At present -these are limited to FAT, NTFS and ISO 9660 (CD-ROM). - -+ Booting from a network device - -Not yet implemented. - - -2. Building APB - -APB is an AlphaBIOS/ARC application. Currently it must be built on an -Microsoft Windows NT 4.0 Alpha processor system, with Microsoft Visual -C++ 5.0 (or higher), the Microsoft Software Development Kit (SDK) and -Device Driver Development Kit (DDK) for NT 4.0, and Compaq ARC -Application Development Kit (ADK) 1.3. - -Optionally, APB can be linked against zlib (a free compression -library) to support reading compressed kernel and PALcode images. - -To build, open a command window, set up the environment: - - VC++ (e.g "C:Program Files\DevStudio\VC\bin\vcvars32.bat") - DDK (e.g. "C:\DDK\bin\setenv.bat C:\DDK") - ADK (e.g. "set ADK=C:\adkv13\adk") - -and then and make using nmake. For example: - - C:\apb-1.0> nmake - -where the DDK has been installed on the C: drive. - -If building with compressed file support, obtain and unpack zlib -(http://www.cdrom.com/pub/infozip/zlib/), set the variable ZLIB to -the zlib directory, and then make. For example - - C:\apb-1.0> set ZLIB=C:\zlib-1.1.3 - C:\apb-1.0> nmake - -In either case, the executable is placed in the "obj\alpha" -subdirectory. - - -3. What APB does - -Booting Linux with APB involves the following steps: - - AlphaBIOS loads and transfers control to APB. - - APB is called with an argument specifying the device (as known to - AlphaBIOS) from which to read the Linux kernel, and additional - arguments to be passed on to the kernel. - - APB sets up the environment for Linux, including loading and - switching to the correct PAL code, setting up the HWRPB, copying - kernel arguments to the right location in memory etc. - - APB reads the Linux kernel image into memory from the specified - device (raw disk initially, and eventually filesystems or network - devices via bootp) and transfers control. - - -4. Modifying APB - -APB has been written with the aim of maintaining platform independence -across all AlphaBIOS (and ARC) systems. Furthermore, all dependence -on the ARC API has been isolated in the file "arc.c", so that porting -to another firmware environment should not be too difficult as long as -it provides a sufficiently complete API. - -Additional user commands can be incorporated through the command -dispatch table in "cmd.c". - diff --git a/tools/alpha/cd/up1000/up1000.pal b/tools/alpha/cd/up1000/up1000.pal Binary files differdeleted file mode 100644 index a47b359f3..000000000 --- a/tools/alpha/cd/up1000/up1000.pal +++ /dev/null diff --git a/tools/alpha/e2fsck.shared b/tools/alpha/e2fsck.shared Binary files differdeleted file mode 100755 index 765e664a1..000000000 --- a/tools/alpha/e2fsck.shared +++ /dev/null diff --git a/tools/closurepkgs b/tools/closurepkgs deleted file mode 100755 index 2ef479486..000000000 --- a/tools/closurepkgs +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/perl - -use rpmtools; - -sub chop_version($) { - ($_[0] =~ /(.*)-[^-]+-[^-]+/)[0] || $_[0]; -} - -sub read_compsslist { - my ($file) = @_; - my %compsslist; - - local *F; - open F, $file or die "closurepkgs: unable to open compsslist file $file\n"; - foreach (<F>) { - my ($name, $level) = /^\s*(\S+)\s+(\d+)/; - $compsslist{$name} = $level; - } - close F; - - \%compsslist; -} - -sub main { - my ($dir, $lang) = @_; - - #- compute depslist on line directly. - my $params = new rpmtools; - foreach (glob("$dir/*.cz*")) { $params->read_hdlists($_) } - $params->keep_only_cleaned_provides_files(); - foreach (glob("$dir/*.cz*")) { $params->read_hdlists($_) } - $params->compute_depslist(); - - my $compsslist = read_compsslist("$dir/compssList"); - - #- DO NOT FORGET TO UPDATE HERE ACCORDING TO gi/perl-install/install_any.pm - my @pkgs = qw(XFree86 XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa - dhcpcd pump dhcpxd dhcp-client isdn4net isdn4k-utils dev pptp-adsl-fr rp-pppoe ppp ypbind - rhs-printfilters lpr cups cups-drivers samba ncpfs ghostscript-utils - kernel-pcmcia-cs apmd cdrecord - ); - push @pkgs, "XFree86-$_" foreach qw(3DLabs 3dfx 8514 AGX FBDev I128 Mach8 Mach32 Mach64 Mono P9000 Rage128 S3 S3V SVGA VGA16 W32); - - #- closure the list of package to be kept for oem. - my %closure; - foreach (@pkgs) { - $closure{$_} = 1; - map { $closure{chop_version($_->{name})} = 1 } map { $params->{depslist}[$_] } map { split /\|/ } split ' ', $params->{info}{$_}{deps}; - } - #- only if dependancy is ok. - $closure{$_} = 1 foreach qw(xpp kups kisdn); - - #- closure the list of package to always install for oem. (level >= 50)... - my %install; - my @force_install; - if ($params->{info}{"locales-$lang"}) { - foreach (keys %{$params->{info}}) { - push @force_install, $_ if grep { $_ == $params->{info}{"locales-$lang"}{id} } split ' ', $params->{info}{$_}{deps}; - } - } else { - foreach (keys %{$params->{info}}) { - push @force_install, $_ if grep { $params->{depslist}[$_]{name} =~ /locales-/ } split ' ', $params->{info}{$_}{deps}; - } - } - push @force_install, qw(cups cups-drivers drakprofile draksync irda-utils numlock raidtools reiserfs-utils - Mesa Mesa-demos alsa alsa-utils); - foreach (qw( - Aurora xawtv kwintv xscreensaver-gl Mesa-demos xmms-mesa bzflag csmash gltron spacecup chromium tuxracer - ), @force_install, grep { $compsslist->{$_} >= 50 } keys %{$params->{info}}) { - $install{$_} = 1; - map { $install{chop_version($_->{name})} = 1 } map { $params->{depslist}[$_] } map { split /\|/ } split ' ', $params->{info}{$_}{deps}; - } - - #- remove base packages, which have to be installed, according to basesystem. - delete $closure{'basesystem'}; - $install{'basesystem'} = 1; - map { delete $closure{chop_version($_->{name})}; - $install{chop_version($_->{name})} = 1 } map { $params->{depslist}[$_] } map { split /\|/ } split ' ', $params->{info}{'basesystem'}{deps}; - - #- special packages that are to be move to closure always ... - foreach (qw(kernel-smp kernel-linus kernel-secure hackkernel-smp hackkernel-linus hackkernel-secure - Aurora xawtv kwintv xscreensaver-gl xmms-mesa bzflag csmash gltron spacecup chromium tuxracer - )) { - $params->{info}{$_} or next; - $closure{$_} = 1; - delete $install{$_}; - } - - #- dump out the list of package according to the 2 lists defined above. - my $total_install = 0; - my $total_closure = 0; - foreach (@{$params->{depslist}}) { - my $tiny_name = chop_version($_->{name}); - if (exists $install{$tiny_name}) { - my $p = $params->{info}{$tiny_name}; - $total_install += $p->{size}; - print "I:$p->{name}-$p->{version}-$p->{release}\n"; - } elsif (exists $closure{$tiny_name}) { - my $p = $params->{info}{$tiny_name}; - $total_closure += $p->{size}; - print "C:$p->{name}-$p->{version}-$p->{release}\n"; - } - } - print "\n\ntotal_install=$total_install\n"; - print "total_closure=$total_closure\n"; -} - -main(@ARGV); diff --git a/tools/cvslog2changelog.pl b/tools/cvslog2changelog.pl deleted file mode 100755 index be8d7872f..000000000 --- a/tools/cvslog2changelog.pl +++ /dev/null @@ -1,139 +0,0 @@ -#!/usr/bin/perl - -my %l; -{ -my ($date, $user, $file); -local $_; -while (<>) { - if (my $e = /^description:/ .. /^={77}/) { - next if $e == 1 || $e =~ /E0/; - if (/^-{28}/ .. /^date: /) { - if (/^date: (\S+)\s.*author: (\S+);/) { - ($date, $user) = ($1, $2); - } - } elsif (!/^branches: / && !/file .* was initially added on branch/ && !/empty log message/ && !/no_comment/) { - $l{$date}{$user}{$file} .= $_; - } - } elsif (/Working file: (.*)/) { - $file = $1; - } -} -} - - -my %users; -foreach my $date (reverse sort keys %l) { - foreach my $user (sort keys %{$l{$date}}) { - next if $ENV{AUTHOR} && $ENV{AUTHOR} ne $user; - - my $fuser = $users{$user} || $user; - print "$date $fuser\n\n"; - my %inv; - while (my ($file, $log) = each %{$l{$date}{$user}}) { - $log =~ s/^\s+( \*)?//ms; - $log =~ s/\s+$//ms; - $log = "\n$log" if $log =~ /^-/; - push @{$inv{$log}}, $file; - } - foreach my $log (keys %inv) { - my $line = join(', ', @{$inv{$log}}) . ($log !~ /^\(/ && ':') . " $log"; - print "\t* ", join("\n\t", auto_fill($line, 72)), "\n\n"; - } - } -} - -1; - -sub auto_fill { - my ($line, $col) = @_; - map { - my @l; - my $l = ''; - $_ = " $_" if /^-/; - while ($_) { - s/^(\s*)(\S*)//; - my $m = "$l$1$2"; - if (length $m > $col) { - push @l, $l; - $l = $2; - } else { - $l = $m - } - } - @l, $l; - } split("\n", $line); -} - -BEGIN { - %users = ( - 'abiro' => 'Arpad Biro <biro_arpad at yahoo.com>', - 'adelorbeau' => 'Arnaud de Lorbeau <adelorbeau at mandrakesoft.com>', - 'adesmons' => 'Arnaud Desmons', - 'aginies' => 'Antoine Ginies <aginies at mandrakesoft.com> ', - 'alafox' => 'Alice Lafox <alice at lafox.com.ua>', - 'alemaire' => 'Aurélien Lemaire', - 'alus' => 'Arkadiusz Lipiec <alipiec at elka.pw.edu.pl>', - 'amaury' => 'Amaury Amblard-Ladurantie', - 'baudens' => 'David Baudens <baudens at mandrakesoft.com>', - 'camille' => 'Camille Bégnis <camille at mandrakesoft.com>', - 'cbelisle' => 'Christian Belisle', - 'chmou' => 'Chmouel Boudjnah', - 'chmouel' => 'Chmouel Boudjnah', - 'croy' => 'Christian Roy <croy at mandrakesoft.com>', - 'damien' => 'dam\'s <dams at idm.fr>', - 'daouda' => 'Daouda Lo <daouda at mandrakesoft.com>', - 'dchaumette' => 'Damien Chaumette <dchaumette at mandrakesoft.com>', - 'dindinx' => 'David odin', - 'drdrake' => 'Dovix <dovix2003 at yahoo.com>', - 'erwan' => 'Erwan Velu <erwan at mandrakesoft.com>', - 'fabman' => 'Fabian Mandelbaum <fabman at 2vias.com.ar>', - 'fcrozat' => 'Frederic Crozat <fcrozat at mandrakesoft.com>', - 'flepied' => 'Frederic Lepied <flepied at mandrakesoft.com>', - 'florin' => 'Florin Grad <florin at mandrakesoft.com>', - 'fpons' => 'Fançois Pons', - 'fred' => 'Frederic Bastok', - 'fwang' => 'Funda Wang <fundawang at linux.net.cn>', - 'gb' => 'Gwenole Beauchesne <gbeauchesne at mandrakesoft.com>', - 'gbeauchesne' => 'Gwenole Beauchesne <gbeauchesne at mandrakesoft.com>', - 'gc' => 'Guillaume Cottenceau <gc at mandrakesoft.com>', - 'hilbert' => '(Hilbert) <h at mandrake.org>', - 'install' => 'DrakX <install at mandrakesoft.com>', - 'jdanjou' => 'Julien Danjou', - 'jjorge' => 'José JORGE <jjorge at free.fr>', - 'jpomerleau' => 'Joel Pomerleau', - 'keld' => 'Keld Jørn Simonsen <keld at dkuug.dk>', - 'lmontel' => 'Laurent Montel <lmontel at mandrakesoft.com>', - 'mscherer' => 'Michael Scherer <mscherer at mandrake.org>', - 'nplanel' => 'Nicolas Planel <nplanel at mandrakesoft.com>', - 'oblin' => 'Olivier Blin <oblin at mandrakesoft.com>', - 'othauvin' => 'Olivier Thauvin <thauvin at aerov.jussieu.fr>', - 'pablo' => 'Pablo Saratxaga <pablo at mandrakesoft.com>', - 'peroyvind' => 'Per Øyvind Karlsen <peroyvind at linux-mandrake.com>', - 'phetroy' => 'Philippe Libat', - 'philippe' => 'Philippe Libat', - 'prigaux' => 'Pixel <pixel at mandrakesoft.com>', - 'quintela' => 'Juan Quintela <quintela at mandrakesoft.com>', - 'rchaillat' => 'Renaud Chaillat', - 'rdalverny' => 'Romain d\'Alverny <rdalverny at mandrakesoft.com>', - 'redhog' => 'RedHog', - 'reinouts' => 'Reinout van Schouwen <reinout at cs.vu.nl>', - 'rgarciasuarez' => 'Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>', - 'rvojta' => 'Robert Vojta <robert.vojta at mandrake.cz>', - 'sbenedict' => 'Stew Benedict <sbenedict at mandrakesoft.com>', - 'sdetilly' => 'Sylvain de Tilly', - 'siegel' => 'Stefan Siegel <siegel at linux-mandrake.com>', - 'tbacklund' => 'Thomas Backlund <tmb at mandrake.org>', - 'tkamppeter' => 'Till Kamppeter <till at mandrakesoft.com>', - 'tpittich' => 'Tibor Pittich <Tibor.Pittich at phuture.sk>', - 'tsdgeos ' => 'Albert Astals Cid <astals11 at terra.es>', - 'tv' => 'Thierry Vignaud <tvignaud at mandrakesoft.com>', - 'tvignaud' => 'Thierry Vignaud <tvignaud at mandrakesoft.com>', - 'uid524' => 'Chmouel Boudjnah', - 'vdanen' => 'Vincent Danen <vdanen at mandrakesoft.com>', - 'vguardiola' => 'Vincent Guardiola <vguardiola at mandrakesoft.com>', - 'warly' => 'Warly <warly at mandrakesoft.com>', - 'yduret' => 'Yves Duret', - 'yoann' => 'Yoann Vandoorselaere', - 'yrahal' => 'Youcef Rabah Rahal <rahal at arabeyes.org>', - ); -} diff --git a/tools/dmidecode/.cvsignore b/tools/dmidecode/.cvsignore deleted file mode 100644 index 9b4923a2d..000000000 --- a/tools/dmidecode/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -dmidecode diff --git a/tools/dmidecode/Makefile b/tools/dmidecode/Makefile deleted file mode 100644 index fe53436f4..000000000 --- a/tools/dmidecode/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -CFLAGS=-Wall -O # -g -DDEBUG -TARGETS=dmidecode - -ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) - -ifeq (i386,$(ARCH)) - -dmidecode: dmidecode.o - -else -dmidecode: not_handled.c - gcc -o $@ $< -endif - -clean: - $(RM) $(TARGETS) *.o core diff --git a/tools/dmidecode/dmidecode.c b/tools/dmidecode/dmidecode.c deleted file mode 100644 index 576fd4fc1..000000000 --- a/tools/dmidecode/dmidecode.c +++ /dev/null @@ -1,856 +0,0 @@ -/* - * DMI decode rev 1.2 - * - * (C) 2000,2001 Alan Cox <alan@redhat.com> - * - * 2-July-2001 Matt Domsch <Matt_Domsch@dell.com> - * Additional structures displayed per SMBIOS 2.3.1 spec - * - * Licensed under the GNU Public license. If you want to use it in with - * another license just ask. - */ - -#include <stdio.h> -#include <unistd.h> -#include <fcntl.h> -#include <string.h> -#include <stdlib.h> - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; - -static void -dump_raw_data(void *data, unsigned int length) -{ - unsigned char buffer1[80], buffer2[80], *b1, *b2, c; - unsigned char *p = data; - unsigned long column=0; - unsigned int length_printed = 0; - const unsigned char maxcolumn = 16; - while (length_printed < length) { - b1 = buffer1; - b2 = buffer2; - for (column = 0; - column < maxcolumn && length_printed < length; - column ++) { - b1 += sprintf(b1, "%02x ",(unsigned int) *p); - if (*p < 32 || *p > 126) c = '.'; - else c = *p; - b2 += sprintf(b2, "%c", c); - p++; - length_printed++; - } - /* pad out the line */ - for (; column < maxcolumn; column++) - { - b1 += sprintf(b1, " "); - b2 += sprintf(b2, " "); - } - - printf("%s\t%s\n", buffer1, buffer2); - } -} - - - -struct dmi_header -{ - u8 type; - u8 length; - u16 handle; -}; - -static char *dmi_string(struct dmi_header *dm, u8 s) -{ - u8 *bp=(u8 *)dm; - if (!s) return ""; - - bp+=dm->length; - while(s>1) - { - bp+=strlen(bp); - bp++; - s--; - } - return bp; -} - -static void dmi_decode_ram(u16 data) -{ - if(data&(1<<0)) - printf("OTHER "); - if(data&(1<<1)) - printf("UNKNOWN "); - if(data&(1<<2)) - printf("STANDARD "); - if(data&(1<<3)) - printf("FPM "); - if(data&(1<<4)) - printf("EDO "); - if(data&(1<<5)) - printf("PARITY "); - if(data&(1<<6)) - printf("ECC "); - if(data&(1<<7)) - printf("SIMM "); - if(data&(1<<8)) - printf("DIMM "); - if(data&(1<<9)) - printf("Burst EDO "); - if(data&(1<<10)) - printf("SDRAM "); -} - -static void dmi_cache_size(u16 n) -{ - if(n&(1<<15)) - printf("%dK\n", (n&0x7FFF)*64); - else - printf("%dK\n", n&0x7FFF); -} - -static void dmi_decode_cache(u16 c) -{ - if(c&(1<<0)) - printf("Other "); - if(c&(1<<1)) - printf("Unknown "); - if(c&(1<<2)) - printf("Non-burst "); - if(c&(1<<3)) - printf("Burst "); - if(c&(1<<4)) - printf("Pipeline burst "); - if(c&(1<<5)) - printf("Synchronous "); - if(c&(1<<6)) - printf("Asynchronous "); -} - -static char *dmi_bus_name(u8 num) -{ - static char *bus[]={ - "", - "", - "", - "ISA ", - "MCA ", - "EISA ", - "PCI ", - "PCMCIA " - "VLB ", - "Proprietary ", - "CPU Slot ", - "Proprietary RAM ", - "I/O Riser ", - "NUBUS ", - "PCI-66 ", - "AGP ", - "AGP 2x ", - "AGP 4x " - }; - static char *jpbus[]={ - "PC98/C20", - "PC98/C24", - "PC98/E", - "PC98/LocalBus", - "PC98/Card" - }; - - if(num<=0x12) - return bus[num]; - if(num>=0xA0 && num<0xA5) - return jpbus[num]; - return ""; -} - -static char *dmi_bus_width(u8 code) -{ - static char *width[]={ - "", - "", - "", - "8bit ", - "16bit ", - "32bit ", - "64bit ", - "128bit " - }; - if(code>7) - return ""; - return width[code]; -} - -static char *dmi_card_size(u8 v) -{ - if(v==2) - return("Short "); - if(v==3) - return("Long "); - return ""; -} - -static void dmi_card_props(u8 v) -{ - printf("\t\tSlot Features: "); - if(v&(1<<1)) - printf("5v "); - if(v&(1<<2)) - printf("3.3v "); - if(v&(1<<3)) - printf("Shared "); - if(v&(1<<4)) - printf("PCCard16 "); - if(v&(1<<5)) - printf("CardBus "); - if(v&(1<<6)) - printf("Zoom-Video "); - if(v&(1<<7)) - printf("ModemRingResume "); - printf("\n"); -} - -static char *dmi_chassis_type(u8 code) -{ - static char *chassis_type[]={ - "", - "Other", - "Unknown", - "Desktop", - "Low Profile Desktop", - "Pizza Box", - "Mini Tower", - "Tower", - "Portable", - "Laptop", - "Notebook", - "Hand Held", - "Docking Station", - "All in One", - "Sub Notebook", - "Space-saving", - "Lunch Box", - "Main Server Chassis", - "Expansion Chassis", - "SubChassis", - "Bus Expansion Chassis", - "Peripheral Chassis", - "RAID Chassis", - "Rack Mount Chassis", - "Sealed-case PC", - }; - code &= ~0x80; - - if(code>0x18) - return ""; - return chassis_type[code]; - -} - -static char *dmi_port_connector_type(u8 code) -{ - static char *connector_type[]={ - "None", - "Centronics", - "Mini Centronics", - "Proprietary", - "DB-25 pin male", - "DB-25 pin female", - "DB-15 pin male", - "DB-15 pin female", - "DB-9 pin male", - "DB-9 pin female", - "RJ-11", - "RJ-45", - "50 Pin MiniSCSI", - "Mini-DIN", - "Micro-DIN", - "PS/2", - "Infrared", - "HP-HIL", - "Access Bus (USB)", - "SSA SCSI", - "Circular DIN-8 male", - "Circular DIN-8 female", - "On Board IDE", - "On Board Floppy", - "9 Pin Dual Inline (pin 10 cut)", - "25 Pin Dual Inline (pin 26 cut)", - "50 Pin Dual Inline", - "68 Pin Dual Inline", - "On Board Sound Input from CD-ROM", - "Mini-Centronics Type-14", - "Mini-Centronics Type-26", - "Mini-jack (headphones)", - "BNC", - "1394", - "PC-98", - "PC-98Hireso", - "PC-H98", - "PC-98Note", - "PC98Full", - }; - - if(code == 0xFF) - return "Other"; - - if (code > 0xA4) - return ""; - return connector_type[code]; - -} - -static char *dmi_port_type(u8 code) -{ - static char *port_type[]={ - "None", - "Parallel Port XT/AT Compatible", - "Parallel Port PS/2", - "Parallel Port ECP", - "Parallel Port EPP", - "Parallel Port ECP/EPP", - "Serial Port XT/AT Compatible", - "Serial Port 16450 Compatible", - "Serial Port 16650 Compatible", - "Serial Port 16650A Compatible", - "SCSI Port", - "MIDI Port", - "Joy Stick Port", - "Keyboard Port", - "Mouse Port", - "SSA SCSI", - "USB", - "FireWire (IEEE P1394)", - "PCMCIA Type I", - "PCMCIA Type II", - "PCMCIA Type III", - "Cardbus", - "Access Bus Port", - "SCSI II", - "SCSI Wide", - "PC-98", - "PC-98-Hireso", - "PC-H98", - "Video Port", - "Audio Port", - "Modem Port", - "Network Port", - "8251 Compatible", - "8251 FIFO Compatible", - }; - - if(code == 0xFF) - return "Other"; - - if (code > 0xA1) - return ""; - return port_type[code]; - -} - -static char *dmi_processor_type(u8 code) -{ - static char *processor_type[]={ - "", - "Other", - "Unknown", - "Central Processor", - "Math Processor", - "DSP Processor", - "Video Processor" - }; - - if(code == 0xFF) - return "Other"; - - if (code > 0xA1) - return ""; - return processor_type[code]; -} - -static char *dmi_processor_family(u8 code) -{ - static char *processor_family[]={ - "", - "Other", - "Unknown", - "8086", - "80286", - "Intel386 processor", - "Intel486 processor", - "8087", - "80287", - "80387", - "80487", - "Pentium processor Family", - "Pentium Pro processor", - "Pentium II processor", - "Pentium processor with MMX technology", - "Celeron processor", - "Pentium II Xeon processor", - "Pentium III processor", - "M1 Family", - "M1","M1","M1","M1","M1","M1", /* 13h - 18h */ - "K5 Family", - "K5","K5","K5","K5","K5","K5", /* 1Ah - 1Fh */ - "Power PC Family", - "Power PC 601", - "Power PC 603", - "Power PC 603+", - "Power PC 604", - }; - - if(code == 0xFF) - return "Other"; - - if (code > 0x24) - return ""; - return processor_family[code]; -} - -static char *dmi_onboard_type(u8 code) -{ - static char *onboard_type[]={ - "", - "Other", - "Unknown", - "Video", - "SCSI Controller", - "Ethernet", - "Token Ring", - "Sound", - }; - code &= 0x80; - if (code > 7) - return ""; - return onboard_type[code]; -} - - -static void dmi_table(int fd, u32 base, int len, int num) -{ - char *buf=malloc(len); - struct dmi_header *dm; - u8 *data; - int i=0; - - if(lseek(fd, (long)base, 0)==-1) - { - perror("dmi: lseek"); - return; - } - if(read(fd, buf, len)!=len) - { - perror("dmi: read"); - return; - } - data = buf; - while(i<num) - { - u32 u; - u32 u2; - dm=(struct dmi_header *)data; - printf("Handle 0x%04X\n\tDMI type %d, %d bytes.\n", - dm->handle, - dm->type, dm->length); - - switch(dm->type) - { - case 0: - printf("\tBIOS Information Block\n"); - printf("\t\tVendor: %s\n", - dmi_string(dm, data[4])); - printf("\t\tVersion: %s\n", - dmi_string(dm, data[5])); - printf("\t\tRelease: %s\n", - dmi_string(dm, data[8])); - printf("\t\tBIOS base: 0x%04X0\n", - data[7]<<8|data[6]); - printf("\t\tROM size: %dK\n", - 64*data[9]); - printf("\t\tCapabilities:\n"); - u=data[13]<<24|data[12]<<16|data[11]<<8|data[10]; - u2=data[17]<<24|data[16]<<16|data[15]<<8|data[14]; - printf("\t\t\tFlags: 0x%08X%08X\n", - u2,u); - break; - - case 1: - printf("\tSystem Information Block\n"); - printf("\t\tVendor: %s\n", - dmi_string(dm, data[4])); - printf("\t\tProduct: %s\n", - dmi_string(dm, data[5])); - printf("\t\tVersion: %s\n", - dmi_string(dm, data[6])); - printf("\t\tSerial Number: %s\n", - dmi_string(dm, data[7])); - break; - - case 2: - printf("\tBoard Information Block\n"); - printf("\t\tVendor: %s\n", - dmi_string(dm, data[4])); - printf("\t\tProduct: %s\n", - dmi_string(dm, data[5])); - printf("\t\tVersion: %s\n", - dmi_string(dm, data[6])); - printf("\t\tSerial Number: %s\n", - dmi_string(dm, data[7])); - break; - - case 3: - printf("\tChassis Information Block\n"); - printf("\t\tVendor: %s\n", - dmi_string(dm, data[4])); - printf("\t\tChassis Type: %s\n", - dmi_chassis_type(data[5])); - if (data[5] & 0x80) - printf("\t\t\tLock present\n"); - printf("\t\tVersion: %s\n", - dmi_string(dm, data[6])); - printf("\t\tSerial Number: %s\n", - dmi_string(dm, data[7])); - printf("\t\tAsset Tag: %s\n", - dmi_string(dm, data[8])); - break; - - case 4: - printf("\tProcessor\n"); - printf("\t\tSocket Designation: %s\n", - dmi_string(dm, data[4])); - printf("\t\tProcessor Type: %s\n", - dmi_processor_type(data[5])); - printf("\t\tProcessor Family: %s\n", - dmi_processor_family(data[6])); - printf("\t\tProcessor Manufacturer: %s\n", - dmi_string(dm, data[7])); - printf("\t\tProcessor Version: %s\n", - dmi_string(dm, data[0x10])); - if (dm->length <= 0x20) break; - printf("\t\tSerial Number: %s\n", - dmi_string(dm, data[0x20])); - printf("\t\tAsset Tag: %s\n", - dmi_string(dm, data[0x21])); - printf("\t\tVendor Part Number: %s\n", - dmi_string(dm, data[0x22])); - break; - - case 5: - printf("\tMemory Controller\n"); - break; - - case 6: - printf("\tMemory Bank\n"); - printf("\t\tSocket: %s\n", dmi_string(dm, data[4])); - if(data[5]!=0xFF) - { - printf("\t\tBanks: "); - if((data[5]&0xF0)!=0xF0) - printf("%d ", - data[5]>>4); - if((data[5]&0x0F)!=0x0F) - printf("%d", - data[5]&0x0F); - printf("\n"); - } - if(data[6]) - printf("\t\tSpeed: %dnS\n", data[6]); - printf("\t\tType: "); - dmi_decode_ram(data[8]<<8|data[7]); - printf("\n"); - printf("\t\tInstalled Size: "); - switch(data[9]&0x7F) - { - case 0x7D: - printf("Unknown");break; - case 0x7E: - printf("Disabled");break; - case 0x7F: - printf("Not Installed");break; - default: - printf("%dMbyte", - (1<<(data[9]&0x7F))); - } - if(data[9]&0x80) - printf(" (Double sided)"); - printf("\n"); - printf("\t\tEnabled Size: "); - switch(data[10]&0x7F) - { - case 0x7D: - printf("Unknown");break; - case 0x7E: - printf("Disabled");break; - case 0x7F: - printf("Not Installed");break; - default: - printf("%dMbyte", - (1<<(data[10]&0x7F))); - } - if(data[10]&0x80) - printf(" (Double sided)"); - printf("\n"); - if((data[11]&4)==0) - { - if(data[11]&(1<<0)) - printf("\t\t*** BANK HAS UNCORRECTABLE ERRORS (BIOS DISABLED)\n"); - if(data[11]&(1<<1)) - printf("\t\t*** BANK LOGGED CORRECTABLE ERRORS AT BOOT\n"); - } - break; - case 7: - { - static char *types[4]={ - "Internal ", "External ", - "", ""}; - static char *modes[4]={ - "write-through", - "write-back", - "",""}; - - printf("\tCache\n"); - printf("\t\tSocket: %s\n", - dmi_string(dm, data[4])); - u=data[6]<<8|data[5]; - printf("\t\tL%d %s%sCache: ", - 1+(u&7), (u&(1<<3))?"socketed ":"", - types[(u>>5)&3]); - if(u&(1<<7)) - printf("%s\n", - modes[(u>>8)&3]); - else - printf("disabled\n"); - printf("\t\tL%d Cache Size: ", 1+(u&7)); - dmi_cache_size(data[7]|data[8]<<8); - printf("\t\tL%d Cache Maximum: ", 1+(u&7)); - dmi_cache_size(data[9]|data[10]<<8); - printf("\t\tL%d Cache Type: ", 1+(u&7)); - dmi_decode_cache(data[13]); - printf("\n"); - } - break; - - case 8: - printf("\tPort Connector\n"); - printf("\t\tInternal Designator: %s\n", - dmi_string(dm, data[4])); - printf("\t\tInternal Connector Type: %s\n", - dmi_port_connector_type(data[5])); - printf("\t\tExternal Designator: %s\n", - dmi_string(dm, data[6])); - printf("\t\tExternal Connector Type: %s\n", - dmi_port_connector_type(data[7])); - printf("\t\tPort Type: %s\n", - dmi_port_type(data[8])); - break; - - - - case 9: - printf("\tCard Slot\n"); - printf("\t\tSlot: %s\n", - dmi_string(dm, data[4])); - printf("\t\tType: %s%s%s\n", - dmi_bus_width(data[6]), - dmi_card_size(data[8]), - dmi_bus_name(data[5])); - if(data[7]==3) - printf("\t\tStatus: Available.\n"); - if(data[7]==4) - printf("\t\tStatus: In use.\n"); - if(data[11]&0xFE) - dmi_card_props(data[11]); - break; - - case 10: - printf("\tOn Board Devices Information\n"); - for (u=0; u<((dm->length - 4)/2); u++) { - printf("\t\tDescription: %s : %s\n", - dmi_string(dm, data[5+(2*u)]), - (data[4+(2*u)]) & 0x80 ? - "Enabled" : "Disabled"); - printf("\t\tType: %s\n", - dmi_onboard_type(data[4+(2*u)])); - - } - - break; - - - case 11: - printf("\tOEM Data\n"); - for(u=1;u<=data[4];u++) - printf("\t\t%s\n", dmi_string(dm,u)); - break; - case 12: - printf("\tConfiguration Information\n"); - for(u=1;u<=data[4];u++) - printf("\t\t%s\n", dmi_string(dm,u)); - break; - - case 13: - printf("\tBIOS Language Information\n"); - break; - - case 14: - printf("\tGroup Associations\n"); - for (u=0; u<(dm->length - 5)/3 ; u++) { - printf("\t\tGroup Name: %s\n", - dmi_string(dm,data[4])); - printf("\t\t\tType: 0x%02x\n", *(data+5+(u*3))); - printf("\t\t\tHandle: 0x%04x\n", - *(u16*)(data+6+(u*3))); - } - break; - - - case 15: - printf("\tEvent Log\n"); - printf("\t\tLog Area: %d bytes.\n", - data[5]<<8|data[4]); - printf("\t\tLog Header At: %d.\n", - data[7]<<8|data[6]); - printf("\t\tLog Data At: %d.\n", - data[9]<<8|data[8]); - printf("\t\tLog Type: %d.\n", - data[10]); - if(data[11]&(1<<0)) - printf("\t\tLog Valid: Yes.\n"); - if(data[11]&(1<<1)) - printf("\t\t**Log Is Full**.\n"); - break; - - case 16: - printf("\tPhysical Memory Array\n"); - break; - case 17: - printf("\tMemory Device\n"); - break; - case 18: - printf("\t32-bit Memory Error Information\n"); - break; - case 19: - printf("\tMemory Array Mapped Address\n"); - break; - case 20: - printf("\tMemory Device Mapped Address\n"); - break; - case 24: - printf("\tHardware Security\n"); - break; - case 25: - printf("\tSystem Power Controls\n"); - break; - case 32: - printf("\tSystem Boot Information\n"); - break; - case 126: - printf("\tInactive\n"); - break; - - case 127: - printf("\tEnd-of-Table\n"); - break; - - default: - if (dm->length > 4) - dump_raw_data(data+4, dm->length-4); - break; - - - - } - data+=dm->length; - while(*data || data[1]) - data++; - data+=2; - i++; - } - free(buf); -} - - -char key[8]={'R','S','D',' ','P','T','R',' '}; - -char zot[16]; - -int main(int argc, char *argv[]) -{ - unsigned char buf[20]; - int fd=open("/dev/mem", O_RDONLY); - long fp=0xE0000L; - if(fd==-1) - { - perror("/dev/mem"); - exit(1); - } - if(lseek(fd,fp,0)==-1) - { - perror("seek"); - exit(1); - } - - - fp -= 16; - - while( fp < 0xFFFFF) - { - fp+=16; - if(read(fd, buf, 16)!=16) - perror("read"); -// if(memcmp(buf, zot, 16)==0) -// printf("*"); - if(memcmp(buf, "_SM_", 4)==0) { - printf("SMBIOS %d.%d present.\n", buf[6], buf[7]); - } - - if(memcmp(buf, "_SYSID_", 7)==0) - printf("SYSID present.\n"); - if(memcmp(buf, "_DMI_", 5)==0) - { - u16 num=buf[13]<<8|buf[12]; - u16 len=buf[7]<<8|buf[6]; - u32 base=buf[11]<<24|buf[10]<<16|buf[9]<<8|buf[8]; - - printf("DMI %d.%d present.\n", - buf[14]>>4, buf[14]&0x0F); - printf("%d structures occupying %d bytes.\n", - buf[13]<<8|buf[12], - buf[7]<<8|buf[6]); - printf("DMI table at 0x%08X.\n", - buf[11]<<24|buf[10]<<16|buf[9]<<8|buf[8]); - dmi_table(fd, base,len, num); - } - if(memcmp(buf, "$PnP", 4)==0) - printf("PNP BIOS present.\n"); - if(memcmp(buf, key, 8)==0) - { - int a; - unsigned char sum=0; - unsigned int i=0, checksum=0; - printf("RSD PTR found at 0x%lX\n", fp); - for (i=0; i<20; i++) checksum += buf[i]; - if (checksum != 0) { - printf("checksum failed.\n"); - } - - if(buf[15]!=0) - { - printf("Reserved check failed.\n"); - } - printf("OEM "); - fwrite(buf+9, 6, 1, stdout); - printf("\n"); - read(fd,buf+16,4); - lseek(fd, -4, 1); - for(a=0;a<20;a++) - sum+=buf[a]; - if(sum!=0) - printf("Bad checksum.\n"); - } - } - close(fd); - return 0; -} diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index abae8fb24..6565ec9e0 100644..100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -7,12 +7,47 @@ my $SLASH_LOCATION = '/tmp/drakx-in-chroot'; my $verbose = 0; my $prefix_ROOTED = '/mnt'; my $IMAGE_LOCATION_ROOTED = '/tmp/image'; +my $MEDIA_LOCATION_ROOTED = '/tmp/media'; my $STAGE2_LOCATION_ROOTED = '/tmp/stage2'; +my $LOOP_MOUNT_POINT = "$SLASH_LOCATION/tmp/loop"; my $LIVE_LOCATION_REL = 'install/stage2/live/'; -my $CLP_LOCATION_REL = 'install/stage2/'; -my $CLP_FILE_REL = $CLP_LOCATION_REL . 'mdkinst.clp'; +my $COMPRESSED_LOCATION_REL = 'install/stage2/'; +my $COMPRESSED_FILE_REL = $COMPRESSED_LOCATION_REL . 'mdkinst.sqfs'; +my $AUTO_INSTALL_ROOTED = '/tmp/auto_inst.cfg.pl'; +my $DEFCFG_ROOTED = '/tmp/defcfg.pl'; +my $RPMSRATE_ROOTED = '/tmp/rpmsrate'; +my $resolution = '1024x768'; +my ($disk_iso_repository, $repository_uri); + +@ARGV >= 2 or die "usage: drakx-in-chroot <root of distrib> <dir to install to> [options]\n +\nOptions specific to drakx-in-chroot: + --flang XX use XX locale + --disk-iso path of a distro + --resolution=XXXxYYYY (eg: --resolution=800x600)\n + --repository=<path> path of packages repository + --text text mode installer + --depth=XX set screen color depth + --stage2-update X,Y will mount --bind X on Y +"; (my $repository, my $dir, @ARGV) = @ARGV; +my ($wrapper); +foreach (@ARGV) { + if (/--resolution=(.*)/) { + $resolution = $1; + } elsif (/--disk-iso=(.*)/) { + $disk_iso_repository = $1; + } elsif (/--repository=(.*)/) { + $repository_uri = $1; + } elsif (/--gdb/) { + $wrapper = "gdb -q --args"; + } elsif (/--strace/) { + $wrapper = "strace -e file $ENV{STRACE_OPTIONS}"; + } elsif (/--depth=(.*)/) { + $resolution .= "x$1"; + } +} +my ($repository_without_arch, $repository_arch) = basename($repository) eq arch() ? (dirname($repository), '/' . arch()) : ($repository, ''); my $STAGE2_LOCATION = $SLASH_LOCATION . $STAGE2_LOCATION_ROOTED; my $sudo; @@ -21,63 +56,132 @@ if ($>) { $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } +my @mounts; +my $_b = before_leaving { sys("$sudo umount $_") foreach reverse @mounts }; + +undef $ENV{TMPDIR}; # prevent packdrake faillure on creating temporary files + if (-d $SLASH_LOCATION) { - umount_all() == 0 or die "$SLASH_LOCATION is busy\n"; - sys("$sudo rm -f $SLASH_LOCATION/var/lib/rpm"); + umount_all(1) == 0 or exit(1); + sys("$sudo rm -rf $SLASH_LOCATION/var/lib/rpm $SLASH_LOCATION/dev/mapper"); rm_rf($SLASH_LOCATION); } -mkdir_p("$SLASH_LOCATION$_") foreach '/dev', '/dev/usb', '/etc', '/var', '/proc', $STAGE2_LOCATION_ROOTED, $IMAGE_LOCATION_ROOTED, $prefix_ROOTED; +mkdir_p("$SLASH_LOCATION$_") foreach '/dev', '/etc', '/var', '/proc', '/sys', '/run', $STAGE2_LOCATION_ROOTED, $MEDIA_LOCATION_ROOTED, $prefix_ROOTED; -if (-d "$repository/$LIVE_LOCATION_REL") { - sys("$sudo mount -o bind $repository/$LIVE_LOCATION_REL $STAGE2_LOCATION"); -} elsif (-e "$repository/$CLP_FILE_REL") { - my $dev = find_free_loop(); - sys("$sudo losetup -r -e gz $dev $repository/$CLP_FILE_REL"); - sys("$sudo mount -r $dev $STAGE2_LOCATION"); +sys("$sudo rm -rf $dir") if $ENV{CLEAN}; +-e $dir or sys("$sudo mkdir -p $dir"); + +copy_auto_install_files(); + +my $remote_repository = $repository =~ m!^(ftp|http)://! && $1; +if ($remote_repository) { + my $local_mdkinst = "$SLASH_LOCATION/tmp/mdkinst.sqfs"; + sys("curl --silent -o $local_mdkinst $repository/$COMPRESSED_FILE_REL"); + mount_mdkinst($local_mdkinst); +} elsif (-d "$repository/$LIVE_LOCATION_REL") { + mount("$repository/$LIVE_LOCATION_REL", $STAGE2_LOCATION, "-o bind"); +} elsif (-e "$repository/$COMPRESSED_FILE_REL") { + mount_mdkinst("$repository/$COMPRESSED_FILE_REL"); } -sys("$sudo mount -o bind $dir $SLASH_LOCATION$prefix_ROOTED"); -sys("$sudo mount -o bind $repository $SLASH_LOCATION$IMAGE_LOCATION_ROOTED"); -sys("$sudo mount -t proc none $SLASH_LOCATION/proc"); +mount($dir, "$SLASH_LOCATION$prefix_ROOTED", "-o bind"); +$repository_uri ||= $repository_without_arch if !$remote_repository; +mount($repository_uri, "$SLASH_LOCATION$MEDIA_LOCATION_ROOTED", "-o bind") if $repository_uri; + +mount('/dev', "$SLASH_LOCATION/dev", " --bind -o ro"); +mount('none', "$SLASH_LOCATION/proc", "-t proc"); +mount('none', "$SLASH_LOCATION/sys", "-t sysfs"); +mount('none', "$SLASH_LOCATION/sys/kernel/debug", "-t debugfs"); +mount('none', "$SLASH_LOCATION/run", "-t tmpfs"); + +# - Ensure we mount the udev run dir for various extra metadata from udevadm +# - If dracut has been used (and thus udev has yummy metadata) make sure +# drakx knows about it when running in the chroot +# - Also speedup blkid by using its cache +foreach my $dir (qw(initramfs udev blkid)) { + next if !-d "/run/$dir"; + mkdir_p("$SLASH_LOCATION/run/$dir"); + mount("/run/$dir", "$SLASH_LOCATION/run/$dir", "-o bind"); +} + +if ($disk_iso_repository) { + my $repository_arch = $repository_arch || 'i586'; + mkdir_p($LOOP_MOUNT_POINT); + mount($disk_iso_repository, $LOOP_MOUNT_POINT, "-o loop,ro"); + symlinkf('loop/' . $repository_arch, "$SLASH_LOCATION$IMAGE_LOCATION_ROOTED"); # FIXME: arch() +} + +symlinkf('media' . $repository_arch, "$SLASH_LOCATION$IMAGE_LOCATION_ROOTED"); create_initial_symlinks(); -create_initial_devices(); + +apply_stage2_updates(); output("$SLASH_LOCATION/etc/hosts", "127.0.0.1 localhost\n") if ! -e "$SLASH_LOCATION/etc/hosts"; +#- in the chroot, we have no way to know which device corresponds to the "/" partition. +#- so helping it by giving the device which provide major/minor information +mkdir_p("$dir/dev"); +eval { cp_af($_, "$dir$_") } foreach qw(/dev/root); + +#- if the DISPLAY is remote, we may need to resolve the name: +eval { cp_af('/etc/resolv.conf', "$SLASH_LOCATION/etc/resolv.conf") }; + +{ + chomp(my $kernel_version = `uname -r`); + my $dir = "/modules/$kernel_version"; + mkdir_p("$SLASH_LOCATION$dir"); + output_p("$SLASH_LOCATION$dir" . $_, "\n") foreach "/lib/$dir/modules.dep", "/lib/$dir/modules.alias"; +} + my $Xnest_pid; -if (whereis_binary('Xnest')) { +if (!-f ($SLASH_LOCATION . $AUTO_INSTALL_ROOTED) && join('', @ARGV) !~ /--text/) { + my $Xnest_bin = find { whereis_binary($_) } 'Xephyr', 'Xnest' or die "Xephyr not found! Please install x11-server-xephyr!\n"; my $DISPLAY = ':8'; $Xnest_pid = fork(); if (!$Xnest_pid) { - exec 'Xnest', $DISPLAY, '-ac', '-geometry', '800x600' or die "Xnest failed\n"; + exec $Xnest_bin, $DISPLAY, '-ac', ($Xnest_bin eq 'Xephyr' ? '-screen' : '-geometry'), $resolution or die "Xnest failed\n"; } - $ENV{DISPLAY} = 'localhost' . $DISPLAY; + $ENV{DISPLAY} = $DISPLAY; } if (my $pid = fork()) { waitpid $pid, 0; umount_all() == 0 or warn "umounting failed\n"; - kill 15, $Xnest_pid; + $Xnest_pid and kill 15, $Xnest_pid; } else { + $ENV{TERM} = 'linux'; # we only have terminfo for terminal "linux" $ENV{HOME} = '/'; - my $cmd = join(' ', "/usr/bin/runinstall2 --local_install", @ARGV); - exec "$sudo chroot $SLASH_LOCATION $cmd" or die "exec $cmd in $SLASH_LOCATION failed\n"; + # to kept sync with mdk-stage1/init.c::env: + $ENV{LD_LIBRARY_PATH}='/lib:/usr/lib:/mnt/lib:/mnt/usr/lib:/lib64:/usr/lib64:/mnt/lib64:/mnt/usr/lib64'; + if ($remote_repository) { + $ENV{URLPREFIX} = $repository; + } + my $cmd = join(' ', "/usr/bin/runinstall2 --local_install", + if_($disk_iso_repository, "--method disk-iso"), + if_($remote_repository, "--method $remote_repository"), + @ARGV); + if ($wrapper) { + warn qq(GDB USAGE +Beware that debug info won't be found so on segfault +just generate a core dump with "gcore" and then +analyze it offline. +Thus you sessions will look like: +(gdb) run +(gdb) gcore +(gdb) exit +); + } + exec "$sudo $wrapper chroot $SLASH_LOCATION $cmd" or die "exec $cmd in $SLASH_LOCATION failed\n"; } sub system_verbose { warn join(' ', @_), "\n" if $verbose; system(@_) } sub sys { &system_verbose; $? and die qq(running "@_" failed: $?\n) } -sub find_free_loop() { - foreach (0..255) { - my $dev = "/dev/loop$_"; - system("$sudo losetup $dev >/dev/null 2>&1") != 0 or next; - warn "found $dev\n"; - return $dev; - } - die "no free loop found"; +sub mount_mdkinst { + my ($mdkinst) = @_; + mount($mdkinst, $STAGE2_LOCATION, "-t squashfs -o loop,ro"); } - sub create_initial_symlinks() { foreach (cat_or_die("$STAGE2_LOCATION/usr/share/symlinks")) { my ($from, $to_) = split; @@ -87,29 +191,40 @@ sub create_initial_symlinks() { symlink $from, $to or die "symlinking $to failed\n"; } } + my $from = "$STAGE2_LOCATION_ROOTED/usr"; + my $to = "$SLASH_LOCATION/usr"; + symlink $from, $to or die "symlinking $to failed\n"; + foreach ('bin', 'sbin', 'lib', 'lib64') { + $from = "usr/$_"; + $to = "$SLASH_LOCATION/$_"; + symlink $from, $to or die "symlinking $to failed\n"; + } } -sub create_initial_devices() { - foreach (cat_or_die("$STAGE2_LOCATION/usr/share/devices")) { - my ($node, $type, $major, $minor) = split; - sys("$sudo mknod $SLASH_LOCATION$node $type $major $minor") if ! -e "$SLASH_LOCATION$node"; - } +sub mount { + my ($from, $mntpt, @opts) = @_; + push @mounts, $mntpt; + sys("$sudo mount $from $mntpt " . join(' ', @opts)); } -sub umount_all() { +sub umount_all { + my ($b_umount_dev_too) = @_; my $err; - my @procs = ('/proc/bus/usb', '/proc', '/sys'); - foreach ((map { "$prefix_ROOTED$_" } @procs, ''), @procs, $STAGE2_LOCATION_ROOTED, $IMAGE_LOCATION_ROOTED) { + clean_stage2_updates(); + my @procs = (qw(/proc /sys/kernel/debug /sys /run/udev /run/blkid /run/initramfs /run)); + # special case for !draklive case (else a 2nd run would fail): + if ($b_umount_dev_too && cat_('/proc/mounts') =~ m! $SLASH_LOCATION/dev !) { + system_verbose "$sudo umount $SLASH_LOCATION/dev" and rm_rf("$SLASH_LOCATION/dev"); + } + foreach ((map { "$prefix_ROOTED$_" } @procs, '/dev', ''), @procs, $STAGE2_LOCATION_ROOTED, $LOOP_MOUNT_POINT, $MEDIA_LOCATION_ROOTED, $IMAGE_LOCATION_ROOTED) { my $dir = "$SLASH_LOCATION$_"; rmdir $dir; if (-d $dir) { - if (m!/proc/bus/usb! || begins_with($_, $prefix_ROOTED)) { + if (m!/sys/kernel/debug! || begins_with($_, $prefix_ROOTED)) { system_verbose "$sudo umount $dir 2>/dev/null"; next; } - my ($loop) = cat_('/proc/mounts') =~ m!^(/dev/loop\d+) \Q$dir\E !m; system_verbose "$sudo umount $dir"; - sys("$sudo losetup -d $loop") if $loop; } rmdir $dir; if (-d $dir) { @@ -117,5 +232,47 @@ sub umount_all() { $err++; } } + if (my @remaining = cat_('/proc/mounts') =~ m!($SLASH_LOCATION/mnt/\S+)!g) { + warn "umount those mount points first: ", join(' ', @remaining), "\n"; + $err++; + } $err; } + +sub copy_auto_install_files() { + my ($opt); + each_index { + if ($opt eq 'auto_install' && -f $_) { + cp_f($_, $SLASH_LOCATION . $AUTO_INSTALL_ROOTED); + $_ = $AUTO_INSTALL_ROOTED; + } elsif ($opt eq 'defcfg' && -f $_) { + cp_f($_, $SLASH_LOCATION . $DEFCFG_ROOTED); + $_ = $DEFCFG_ROOTED; + } elsif ($opt eq 'rpmsrate' && -f $_) { + cp_f($_, $SLASH_LOCATION . $RPMSRATE_ROOTED); + } + undef $opt; + /^--?(.*)/ and $opt = $1; + } @ARGV; +} + +my @stage2_updates; +sub apply_stage2_updates() { + each_index { + if ($_ eq '--stage2-update') { + my $file = $ARGV[$::i+1]; + my $dest = $ARGV[$::i+2]; + if (-f $file && $dest) { + undef $_; + undef $ARGV[$::i+1]; + undef $ARGV[$::i+2]; + push @stage2_updates, $dest; + mount($file, "$STAGE2_LOCATION/$dest", " --bind"); + } + } + } @ARGV; +} + +sub clean_stage2_updates() { + sys("$sudo umount $STAGE2_LOCATION/$_") foreach @stage2_updates; +} diff --git a/tools/find-drivers-needing-nonfree-firmware b/tools/find-drivers-needing-nonfree-firmware new file mode 100755 index 000000000..e8068baee --- /dev/null +++ b/tools/find-drivers-needing-nonfree-firmware @@ -0,0 +1,94 @@ +#!/usr/bin/perl +use MDK::Common; +use Data::Dumper; +use Data::Dumper::Perltidy; + +my $debug = member('--debug', @ARGV); + +my $path = '../../cache'; +my %cache = ( + version => "$path/version.txt", + modules => "$path/modules.txt", + firmwares => "$path/firmwares.txt", + modinfo => "$path/modinfo.", + ); + +mkdir_p($path) if !-d $path; +# version of main kernel flavor: +my $kernel = chomp_(cat_($cache{version})); +if (!$kernel) { + # get regular flavor: + ($kernel) = split('\|', chomp_(`urpmq -f kernel-desktop-latest`)); + # get real package name: + $kernel =~ s/-latest//; + # drop arch as it confuses urpmq: + $kernel =~ s/\.[^.]*$//; + output($cache{version}, $kernel); +} +warn ">> GOT '$kernel'\n" if $debug; + +# list of modules: +my @modules = cat_($cache{modules}); +if (!@modules) { + @modules = grep { /\.ko/ } `urpmq -l $kernel`; + output($cache{modules}, @modules); +} +@modules = map { chomp; $_ } @modules; + +# list of those module firmwares: +my %firmwares; +{ + my @firmwares = cat_($cache{firmwares}); + if (!@firmwares) { + @firmwares = `urpmf --qf '%name-%version-%release.%arch:%files' /lib/firmware/ |sort -u`; + output($cache{firmwares}, @firmwares); + } + %firmwares = map { chomp; s!^(.*):/lib/firmware/!!; $_ => $1 } @firmwares; +} + +#warn Data::Dumper->Dump([ \@modules ], [ 'modules' ]); +warn Data::Dumper->Dump([ \%firmwares ], [ 'firmwares' ]) if $debug; + +# compute list of module that needs nonfree firmwares: +my @non_free_fw_drivers; +foreach (uniq(@modules)) { + my ($raw) = m!([^/]*)$!; + my $cache = $cache{modinfo} . $raw; + my @firmwares = cat_($cache); + # speedup: cache might exists but being empty: + if (!-e $cache) { + #warn ">> run '/sbin/modinfo $_ | grep firmware:'\n" if $debug; + @firmwares = `/sbin/modinfo $_ | grep firmware:`; + output($cache, @firmwares); + } + @firmwares = map { chomp; s/^.*:\s+//; $_ } @firmwares; + next if !@firmwares; + warn Data::Dumper->Dump([ \@firmwares ], [ 'firmware' ]) if $debug; + if (any { $firmwares{$_} && $firmwares{$_} =~ /nonfree/ } @firmwares) { + push @non_free_fw_drivers, $_; + #last; + } +} + +# cleaning: +@non_free_fw_drivers = sort map { s!.*/!!; s!\.ko.*$!!; $_ } @non_free_fw_drivers; + +#$Data::Dumper::Perltidy::ARGV = '-it=2 -l 100'; +#warn Dumper(\@non_free_fw_drivers) . "\n"; + +# Pretty dump: +my $sep = ' '; +my $s = $sep . 'qw(' . join(' ', @non_free_fw_drivers) . ')'; +$s =~ s/(.{70}\S*)\s+/$1\n$sep/g; + +output('list_firmwares.pm', + "# generated using $kernel\n", + q(# This list is autogenerated ; Do NOT alter manually. + +package list_firmwares; + +our @modules_with_nonfree_firmware = +), + $s, ";\n\n1;\n"); + + diff --git a/tools/gencompss b/tools/gencompss deleted file mode 100755 index b12328e49..000000000 --- a/tools/gencompss +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/perl - -open F, "packdrake -c @ARGV | hdlist2groups - |"; -foreach (<F>) { - chop; - /(.*):(.*)/; - $l{$2}{$1} = undef; -} -close F or die; -foreach (sort keys %l) { - print "$_\n"; - print "\t$_\n" foreach sort keys %{$l{$_}}; - print "\n"; -} diff --git a/tools/gencryptofiles b/tools/gencryptofiles deleted file mode 100755 index d905c193c..000000000 --- a/tools/gencryptofiles +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/perl - -#- Mandrake cryptographic package hdlist and depslist generation tools. -#- Copyright (C) 1999 Mandrakesoft (fpons@mandrakesoft.com) -#- -#- This program is free software; you can redistribute it and/or modify -#- it under the terms of the GNU General Public License as published by -#- the Free Software Foundation; either version 2, or (at your option) -#- any later version. -#- -#- This program is distributed in the hope that it will be useful, -#- but WITHOUT ANY WARRANTY; without even the implied warranty of -#- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#- GNU General Public License for more details. -#- -#- You should have received a copy of the GNU General Public License -#- along with this program; if not, write to the Free Software -#- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -#- usage: gencryptofiles <crypto_dir> -#- build an hdlist and depslist file for crypto, need rpmtools also. - -my %resolver = ( - '/bin/sh' => 'bash', - '/bin/bash' => 'bash', - '/usr/bin/perl' => 'perl', - '/usr/bin/perl5' => 'perl', - - 'libBrokenLocale.so' => 'glibc', - 'libICE.so' => 'XFree86-libs', - 'libSM.so' => 'XFree86-libs', - 'libX11.so' => 'XFree86-libs', - 'libXext.so' => 'XFree86-libs', - 'libXmu.so' => 'XFree86-libs', - 'libXpm.so' => 'xpm', - 'libXt.so' => 'XFree86-libs', - 'libc.so.6' => 'glibc', - 'libgdbm.so' => 'gdbm', - 'libgpm.so' => 'gpm', - 'libm.so' => 'glibc', - 'libncurses.so' => 'ncurses', - 'libnsl.so' => 'glibc', - 'libpam.so' => 'pam', - 'libpthread.so' => 'glibc', - 'libreadline.so' => 'readline', - 'libstdc++-libc6.1-2.so' => 'libstdc++', - 'libstdc++.so' => 'libstdc++-compat', - 'libutil.so' => 'glibc', - 'libz.so' => 'zlib', - 'smtpdaemon' => 'postfix', - ); - -sub gendepslist_crypto { - my ($dir) = @_; - my %depslist; - - #- get information about each rpm. - local *DIR; - opendir DIR, $dir or die "cannot open directory: $!\n"; - while ($_ = readdir DIR) { - my ($key) = /(.*)\..*\.rpm$/ or next; - my ($name) = /(.*)-[^-]*-[^-]*-/; - - my $size = `rpm -qp --queryformat="%{SIZE}" $dir/$_`; - my @filelist = split "\n", `rpm -qpl $dir/$_`; - my @requires = split "\n", `rpm -qpR $dir/$_`; - - $depslist{$key} = { - key => $key, - size => $size, - filelist => \@filelist, - requires => \@requires, - deps => [], - }; - - foreach (@filelist) { - $resolver{$_} = $name; - m|.*/([^/]*)$| and $resolver{$1} = $name; - } - } - close DIR; - - #- resolve the dependancies. - foreach my $pkg (values %depslist) { - foreach (@{$pkg->{requires}}) { - $resolver{$_} and push(@{$pkg->{deps}}, $resolver{$_}), next; - m|^([^\s\(]*)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; - m|^.*/([^/\s\(]*)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; - m|^([^\s\(]*\.so)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; - m|^.*/([^\s\(]*\.so)| and $resolver{$1} and push(@{$pkg->{deps}}, $resolver{$1}), next; - m|^([\w-]*)(?:\s+.*)$| and push(@{$pkg->{deps}}, $1); #- last and default to package name. - } - } - - #- build depslist-crypto file. - local *F; - open F, ">$dir/depslist-crypto" or die "cannot open depslist-crypto file for writing: $!\n"; - foreach (values %depslist) { - my %deps; - @deps{@{$_->{deps}}} = (); - print F "$_->{key} $_->{size} ", join(" ", keys %deps), "\n"; - } - close F; -} - -sub main { - my ($dir) = @_; - -d $dir or die "usage: gencryptofiles <crypto_dir>\n"; - -x "/usr/bin/genhdlist_cz2" or die "I need rpmtools to work (ie /usr/bin/genhdlist_cz2)\n"; - - print `genhdlist_cz2 -o $dir/hdlist-crypto.cz2 $dir`; - gendepslist_crypto($dir); -} - -main(@ARGV); diff --git a/tools/genmodparm b/tools/genmodparm deleted file mode 100755 index 1b5453cc0..000000000 --- a/tools/genmodparm +++ /dev/null @@ -1,145 +0,0 @@ -#!/usr/bin/perl - -# Mandrake Graphic Install -# Copyright (C) 1999 Mandrakesoft (fpons@mandrakesoft.com) -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -$srctop = $ARGV[0]; - -unless (-d $srctop) { - print STDERR "usage: $0 <linux_src_top>\n"; - print STDERR " <linux_src_top> is the linux source top directory,\n"; - print STDERR " for example /usr/src/linux\n"; - exit 1; -} - -open (FILE_LIST, "find $srctop/ -name \"*.c\" |"); - -while (<FILE_LIST>) { - chomp; - - my $file = $_; - my $dir = $file; - my $module = $file; - my $incfile; - my @incfiles; - my %parms; - my $oldline; - my $descline; - my $default; - my %substvars; - - # get mormalized directory name. - $dir =~ s/^(.*)\/[^\/]*$/$1/; - - # get mormalized module name. - $module =~ s/^.*\/([^\/]*)\.c$/$1/; - - # search for recogniwed special keywords. - open (F, $file); - while (<F>) { - # track for include files. - if (/^\#\s*include\s+[\<\"]([\w-\.\/]*)[\"\>]/) { - # search from /usr/src/linux/include directory. - push @incfiles, "/usr/src/linux/include/$1"; - - # search from current working directory. - push @incfiles, "$dir/$1"; - } - - if (/^\s*MODULE_PARM\s*\((\w*)\s*,\s*\"/) { - $parms{$1}{type} = '?'; - } - if (/^\s*MODULE_PARM\s*\((\w*)\s*,\s*\"([^\"]*)\"\s*\)/) { - $parms{$1}{type} = $2; - } - if (/^\s*MODULE_PARM_DESC\s*\((\w*)\s*,\s*\"([^\"]*)\"\s*\)/) { - $parms{$1}{desc} = $2; - } - } - close F; - - # parse associated include file if exist. - foreach $incfile (@incfiles) { - if (-r $incfile) { - open (F, $incfile); - while (<F>) { - s/^(.*)\/\*.*$/$1/g; - if (/^\#\s*define\s*(\w*)\s*(.*)$/) { - $substvars{$1}=$2; - } - } - close F; - } - } - - # search for comments about each module parameter. - open (F, $file); - while (<F>) { - my $line = $_; - - # manage simple preprocessor. - s/^(.*)\/\*.*$/$1/g; - if (/^\#\s*define\s*(\w*)\s*(.*)$/) { - $substvars{$1}=$2; - } - - # parse for parameters definition. - foreach $parm (keys %parms) { - if ($line =~ /^\s*(static\s+)?((short|long|signed|unsigned)\s+)?\w+(\s*\**\s+|\s+\**\s*)$parm(\s*\[.*\]\s*)?\s*=\s*([^\;]*)\;/) { - $default = $descline = $6; - $default =~ s/^(.*)\/\*.*$/$1/g; - - # remove hypothetic couple of { }. - $default =~ s/^(\s*\{\s*)(.*)(\s*\}\s*)$/$2/; - - # subsitute variable. - foreach $substvar (keys %substvars) { - $default =~ s/$substvar/$substvars{$substvar}/g; - } - $default =~ s/NULL/0/g; - $default =~ s/^\s*(.*?)\s*$/$1/; - $default = '' if $default =~ /\(\s*\(\s*void*\s*\*\)\s*0\s*\)\s*,?/; - - # store value. - $parms{$parm}{default} = $default; - - # try to search a comment on the previous line. - if (!defined($parms{$parm}{desc})) { - if ($oldline =~ /^\s*\/\*\s*(.*)\s*\*\/\s*$/ || /\/\*\s*(.*)\s*\*\/\s*$/) { - $parms{$parm}{desc} = $1; - } - } - - # try to search a comment on the line (multiline not supported). - if (!defined($parms{$parm}{desc})) { - if ($descline =~ /^.*\/\*\s*(.*)\s*\*\/\s*$/) { - $parms{$parm}{desc} = $1; - } - } - } - } - $oldline = $_; - } - close F; - - # dump all result to stdout associated to current module. - foreach $parm (keys %parms) { - print "$module:$parm:$parms{$parm}{type}:$parms{$parm}{default}:$parms{$parm}{desc}\n"; - } -} - -close FILE_LIST; diff --git a/tools/hd_grub.cgi b/tools/hd_grub.cgi index 1b0930679..ac55b6eaf 100755 --- a/tools/hd_grub.cgi +++ b/tools/hd_grub.cgi @@ -31,7 +31,7 @@ sub menu_lst { timeout 0 default 0 -title Mandrake Install +title Mageia Install root ($hd,$grub_partition_number) kernel $directory/isolinux/alt0/vmlinuz $default_append $default_acpi $default_vga automatic=method:disk,partition:$hd_linux$partition_number,directory:$directory @@ -60,7 +60,7 @@ sub print_form { print p(), start_form(-name => 'form', -action => $cgi_name, -method => 'get'), - ul("Please choose the partition where Mandrakelinux is copied.", + ul("Please choose the partition where %s is copied.", li(popup_menu(-name => "hd", -default => 'hd0', -values => [ 'hd0' .. 'hd3' ], -labels => { hd0 => '1st BIOS hard drive (usually hda or sda)', @@ -94,7 +94,7 @@ sub print_form { })), ), p(), - ul("Please enter the directory containing the Mandrakelinux Distribution (relative to the partition chosen above)", + ul("Please enter the directory containing the %s Distribution (relative to the partition chosen above)", li(textfield(-name => 'directory', -default => '/cooker/i586', size => 40)), ), p(submit(-name => 'Go')), diff --git a/tools/i386/busybox b/tools/i386/busybox Binary files differdeleted file mode 100755 index cebd84853..000000000 --- a/tools/i386/busybox +++ /dev/null diff --git a/tools/i386/e2fsck.shared b/tools/i386/e2fsck.shared Binary files differdeleted file mode 100755 index ad4d660a0..000000000 --- a/tools/i386/e2fsck.shared +++ /dev/null diff --git a/tools/i386/mkreiserfs b/tools/i386/mkreiserfs Binary files differdeleted file mode 100755 index 65fdf49f6..000000000 --- a/tools/i386/mkreiserfs +++ /dev/null diff --git a/tools/i386/netboot/.cvsignore b/tools/i386/netboot/.cvsignore deleted file mode 100644 index 64daa531c..000000000 --- a/tools/i386/netboot/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -menu.lst -stage1 -stage2 -automatic.para diff --git a/tools/i386/netboot/3c503/nbgrub b/tools/i386/netboot/3c503/nbgrub Binary files differdeleted file mode 100644 index 5f4def496..000000000 --- a/tools/i386/netboot/3c503/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/3c503/pxegrub b/tools/i386/netboot/3c503/pxegrub Binary files differdeleted file mode 100644 index 7e662603d..000000000 --- a/tools/i386/netboot/3c503/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/3c503/stage1 b/tools/i386/netboot/3c503/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/3c503/stage1 +++ /dev/null diff --git a/tools/i386/netboot/3c503/stage2 b/tools/i386/netboot/3c503/stage2 Binary files differdeleted file mode 100644 index 6a4865d65..000000000 --- a/tools/i386/netboot/3c503/stage2 +++ /dev/null diff --git a/tools/i386/netboot/3c507/nbgrub b/tools/i386/netboot/3c507/nbgrub Binary files differdeleted file mode 100644 index 3f72e513e..000000000 --- a/tools/i386/netboot/3c507/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/3c507/pxegrub b/tools/i386/netboot/3c507/pxegrub Binary files differdeleted file mode 100644 index 1b7caa324..000000000 --- a/tools/i386/netboot/3c507/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/3c507/stage1 b/tools/i386/netboot/3c507/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/3c507/stage1 +++ /dev/null diff --git a/tools/i386/netboot/3c507/stage2 b/tools/i386/netboot/3c507/stage2 Binary files differdeleted file mode 100644 index 2b1d4f3f3..000000000 --- a/tools/i386/netboot/3c507/stage2 +++ /dev/null diff --git a/tools/i386/netboot/3c509/nbgrub b/tools/i386/netboot/3c509/nbgrub Binary files differdeleted file mode 100644 index feb8e46f2..000000000 --- a/tools/i386/netboot/3c509/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/3c509/pxegrub b/tools/i386/netboot/3c509/pxegrub Binary files differdeleted file mode 100644 index 6114a12b4..000000000 --- a/tools/i386/netboot/3c509/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/3c509/stage1 b/tools/i386/netboot/3c509/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/3c509/stage1 +++ /dev/null diff --git a/tools/i386/netboot/3c509/stage2 b/tools/i386/netboot/3c509/stage2 Binary files differdeleted file mode 100644 index 5c7a65a60..000000000 --- a/tools/i386/netboot/3c509/stage2 +++ /dev/null diff --git a/tools/i386/netboot/3c529/nbgrub b/tools/i386/netboot/3c529/nbgrub Binary files differdeleted file mode 100644 index cc5ab8381..000000000 --- a/tools/i386/netboot/3c529/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/3c529/pxegrub b/tools/i386/netboot/3c529/pxegrub Binary files differdeleted file mode 100644 index 14b767e58..000000000 --- a/tools/i386/netboot/3c529/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/3c529/stage1 b/tools/i386/netboot/3c529/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/3c529/stage1 +++ /dev/null diff --git a/tools/i386/netboot/3c529/stage2 b/tools/i386/netboot/3c529/stage2 Binary files differdeleted file mode 100644 index 64f9d89d5..000000000 --- a/tools/i386/netboot/3c529/stage2 +++ /dev/null diff --git a/tools/i386/netboot/3c595/nbgrub b/tools/i386/netboot/3c595/nbgrub Binary files differdeleted file mode 100644 index 74effed46..000000000 --- a/tools/i386/netboot/3c595/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/3c595/pxegrub b/tools/i386/netboot/3c595/pxegrub Binary files differdeleted file mode 100644 index 4d28d49c0..000000000 --- a/tools/i386/netboot/3c595/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/3c595/stage1 b/tools/i386/netboot/3c595/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/3c595/stage1 +++ /dev/null diff --git a/tools/i386/netboot/3c595/stage2 b/tools/i386/netboot/3c595/stage2 Binary files differdeleted file mode 100644 index 25126d668..000000000 --- a/tools/i386/netboot/3c595/stage2 +++ /dev/null diff --git a/tools/i386/netboot/3c90x/nbgrub b/tools/i386/netboot/3c90x/nbgrub Binary files differdeleted file mode 100644 index 0598d82d0..000000000 --- a/tools/i386/netboot/3c90x/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/3c90x/pxegrub b/tools/i386/netboot/3c90x/pxegrub Binary files differdeleted file mode 100644 index 32002398c..000000000 --- a/tools/i386/netboot/3c90x/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/3c90x/stage1 b/tools/i386/netboot/3c90x/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/3c90x/stage1 +++ /dev/null diff --git a/tools/i386/netboot/3c90x/stage2 b/tools/i386/netboot/3c90x/stage2 Binary files differdeleted file mode 100644 index 0841f1d3e..000000000 --- a/tools/i386/netboot/3c90x/stage2 +++ /dev/null diff --git a/tools/i386/netboot/cs89x0/nbgrub b/tools/i386/netboot/cs89x0/nbgrub Binary files differdeleted file mode 100644 index 28ecbebc7..000000000 --- a/tools/i386/netboot/cs89x0/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/cs89x0/pxegrub b/tools/i386/netboot/cs89x0/pxegrub Binary files differdeleted file mode 100644 index c7ae62678..000000000 --- a/tools/i386/netboot/cs89x0/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/cs89x0/stage1 b/tools/i386/netboot/cs89x0/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/cs89x0/stage1 +++ /dev/null diff --git a/tools/i386/netboot/cs89x0/stage2 b/tools/i386/netboot/cs89x0/stage2 Binary files differdeleted file mode 100644 index 28ad8dc0d..000000000 --- a/tools/i386/netboot/cs89x0/stage2 +++ /dev/null diff --git a/tools/i386/netboot/davicom/nbgrub b/tools/i386/netboot/davicom/nbgrub Binary files differdeleted file mode 100644 index 4bd5d8383..000000000 --- a/tools/i386/netboot/davicom/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/davicom/pxegrub b/tools/i386/netboot/davicom/pxegrub Binary files differdeleted file mode 100644 index 22a6a0d27..000000000 --- a/tools/i386/netboot/davicom/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/davicom/stage1 b/tools/i386/netboot/davicom/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/davicom/stage1 +++ /dev/null diff --git a/tools/i386/netboot/davicom/stage2 b/tools/i386/netboot/davicom/stage2 Binary files differdeleted file mode 100644 index b5d22c603..000000000 --- a/tools/i386/netboot/davicom/stage2 +++ /dev/null diff --git a/tools/i386/netboot/depca/nbgrub b/tools/i386/netboot/depca/nbgrub Binary files differdeleted file mode 100644 index 3e93ce716..000000000 --- a/tools/i386/netboot/depca/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/depca/pxegrub b/tools/i386/netboot/depca/pxegrub Binary files differdeleted file mode 100644 index b8285de5b..000000000 --- a/tools/i386/netboot/depca/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/depca/stage1 b/tools/i386/netboot/depca/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/depca/stage1 +++ /dev/null diff --git a/tools/i386/netboot/depca/stage2 b/tools/i386/netboot/depca/stage2 Binary files differdeleted file mode 100644 index 811d7ce66..000000000 --- a/tools/i386/netboot/depca/stage2 +++ /dev/null diff --git a/tools/i386/netboot/device.map b/tools/i386/netboot/device.map deleted file mode 100644 index bf3423b23..000000000 --- a/tools/i386/netboot/device.map +++ /dev/null @@ -1 +0,0 @@ -(fd0) /dev/fd0 diff --git a/tools/i386/netboot/eepro/nbgrub b/tools/i386/netboot/eepro/nbgrub Binary files differdeleted file mode 100644 index f62e82697..000000000 --- a/tools/i386/netboot/eepro/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/eepro/pxegrub b/tools/i386/netboot/eepro/pxegrub Binary files differdeleted file mode 100644 index 92e3f0461..000000000 --- a/tools/i386/netboot/eepro/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/eepro/stage1 b/tools/i386/netboot/eepro/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/eepro/stage1 +++ /dev/null diff --git a/tools/i386/netboot/eepro/stage2 b/tools/i386/netboot/eepro/stage2 Binary files differdeleted file mode 100644 index dd0e0120f..000000000 --- a/tools/i386/netboot/eepro/stage2 +++ /dev/null diff --git a/tools/i386/netboot/eepro100/nbgrub b/tools/i386/netboot/eepro100/nbgrub Binary files differdeleted file mode 100644 index 26cc23cd3..000000000 --- a/tools/i386/netboot/eepro100/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/eepro100/pxegrub b/tools/i386/netboot/eepro100/pxegrub Binary files differdeleted file mode 100644 index cbe97166f..000000000 --- a/tools/i386/netboot/eepro100/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/eepro100/stage1 b/tools/i386/netboot/eepro100/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/eepro100/stage1 +++ /dev/null diff --git a/tools/i386/netboot/eepro100/stage2 b/tools/i386/netboot/eepro100/stage2 Binary files differdeleted file mode 100644 index 0036c6822..000000000 --- a/tools/i386/netboot/eepro100/stage2 +++ /dev/null diff --git a/tools/i386/netboot/epic100/nbgrub b/tools/i386/netboot/epic100/nbgrub Binary files differdeleted file mode 100644 index 93e5adea2..000000000 --- a/tools/i386/netboot/epic100/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/epic100/pxegrub b/tools/i386/netboot/epic100/pxegrub Binary files differdeleted file mode 100644 index 7309b5913..000000000 --- a/tools/i386/netboot/epic100/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/epic100/stage1 b/tools/i386/netboot/epic100/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/epic100/stage1 +++ /dev/null diff --git a/tools/i386/netboot/epic100/stage2 b/tools/i386/netboot/epic100/stage2 Binary files differdeleted file mode 100644 index eb1b19cfa..000000000 --- a/tools/i386/netboot/epic100/stage2 +++ /dev/null diff --git a/tools/i386/netboot/exos205/nbgrub b/tools/i386/netboot/exos205/nbgrub Binary files differdeleted file mode 100644 index af9b29195..000000000 --- a/tools/i386/netboot/exos205/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/exos205/pxegrub b/tools/i386/netboot/exos205/pxegrub Binary files differdeleted file mode 100644 index 25ee4a267..000000000 --- a/tools/i386/netboot/exos205/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/exos205/stage1 b/tools/i386/netboot/exos205/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/exos205/stage1 +++ /dev/null diff --git a/tools/i386/netboot/exos205/stage2 b/tools/i386/netboot/exos205/stage2 Binary files differdeleted file mode 100644 index 81fcbe665..000000000 --- a/tools/i386/netboot/exos205/stage2 +++ /dev/null diff --git a/tools/i386/netboot/grub b/tools/i386/netboot/grub Binary files differdeleted file mode 100755 index 9031dd028..000000000 --- a/tools/i386/netboot/grub +++ /dev/null diff --git a/tools/i386/netboot/lance/nbgrub b/tools/i386/netboot/lance/nbgrub Binary files differdeleted file mode 100644 index 0667479cd..000000000 --- a/tools/i386/netboot/lance/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/lance/pxegrub b/tools/i386/netboot/lance/pxegrub Binary files differdeleted file mode 100644 index c58240700..000000000 --- a/tools/i386/netboot/lance/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/lance/stage1 b/tools/i386/netboot/lance/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/lance/stage1 +++ /dev/null diff --git a/tools/i386/netboot/lance/stage2 b/tools/i386/netboot/lance/stage2 Binary files differdeleted file mode 100644 index 9cf9522bf..000000000 --- a/tools/i386/netboot/lance/stage2 +++ /dev/null diff --git a/tools/i386/netboot/makeImages b/tools/i386/netboot/makeImages deleted file mode 100755 index 39d13df73..000000000 --- a/tools/i386/netboot/makeImages +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# compile multiple grub stages (1, 2, pxegrub and nbgrub) for all supported network cards -LOCALPATH=`pwd` -PATHGRUB="../grub-0.95" # Path were grub is stored -DRIVERTOCOMPILE=`grep NETBOOT_DRIVERS= ${PATHGRUB}/configure.ac | cut -d " " -f 4 | cut -d "." -f 1` - -echo "Cleaning old drivers" -for i in `ls` -do - if [ -d $i ] && [ $i != CVS ]; then - rm -rf $i - fi - -done - -cd ${PATHGRUB} - -echo "Compiling new ones" -for i in ${DRIVERTOCOMPILE} - do - make clean - ./configure --enable-$i --enable-diskless - make - mkdir ${LOCALPATH}/$i - cp stage1/stage1 ${LOCALPATH}/$i/stage1 - cp stage2/stage2 ${LOCALPATH}/$i/stage2 - cp stage2/pxegrub ${LOCALPATH}/$i/pxegrub - cp stage2/nbgrub ${LOCALPATH}/$i/nbgrub - echo "compil done for" $i -done -cp ${PATHGRUB}/grub/grub ${LOCALPATH} -f diff --git a/tools/i386/netboot/make_boot_network b/tools/i386/netboot/make_boot_network deleted file mode 100755 index b02e6657c..000000000 --- a/tools/i386/netboot/make_boot_network +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -type=$1 -[ -z "$type" ] && { echo "usage: $0 <network card type> (eg: 3c90x)" ; exit 1; } - -if [ ! -d "$type" ]; then - echo "$type: no such network driver" - echo "available drivers are:" - echo `find -not -name CVS -type d -maxdepth 1 -printf '%P\n'` - exit 1; -fi - -[ -e menu.lst ] || { echo "missing file menu.lst, create one based on menu.lst.example"; exit 1; } - -ln -sf ${type}/stage1 stage1 -ln -sf ${type}/stage2 stage2 - -mformat a: -mcopy {stage1,stage2} a: -mcopy menu.lst a:menu.lst - -./grub --batch <<EOF -install (fd0)/stage1 d (fd0) (fd0)/stage2 p (fd0)/menu.lst $automatic -EOF diff --git a/tools/i386/netboot/menu.lst.example b/tools/i386/netboot/menu.lst.example deleted file mode 100644 index 3465fac62..000000000 --- a/tools/i386/netboot/menu.lst.example +++ /dev/null @@ -1,21 +0,0 @@ -timeout 0 -default 0 - -title nfs -dhcp -tftpserver 192.168.100.39 -kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a -initrd (nd)/network.rdz - -title ftp -dhcp -tftpserver 192.168.100.39 -kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:ftp,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a -initrd (nd)/network.rdz - -title rescue -dhcp -tftpserver 192.168.100.39 -kernel (nd)/vmlinuz rescue rw root=/dev/ram3 ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a -initrd (nd)/network.rdz - diff --git a/tools/i386/netboot/natsemi/nbgrub b/tools/i386/netboot/natsemi/nbgrub Binary files differdeleted file mode 100644 index 7f3892c7e..000000000 --- a/tools/i386/netboot/natsemi/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/natsemi/pxegrub b/tools/i386/netboot/natsemi/pxegrub Binary files differdeleted file mode 100644 index a481cee5e..000000000 --- a/tools/i386/netboot/natsemi/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/natsemi/stage1 b/tools/i386/netboot/natsemi/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/natsemi/stage1 +++ /dev/null diff --git a/tools/i386/netboot/natsemi/stage2 b/tools/i386/netboot/natsemi/stage2 Binary files differdeleted file mode 100644 index 66761ddee..000000000 --- a/tools/i386/netboot/natsemi/stage2 +++ /dev/null diff --git a/tools/i386/netboot/ne/nbgrub b/tools/i386/netboot/ne/nbgrub Binary files differdeleted file mode 100644 index 209fec7a4..000000000 --- a/tools/i386/netboot/ne/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/ne/pxegrub b/tools/i386/netboot/ne/pxegrub Binary files differdeleted file mode 100644 index 44f6bc476..000000000 --- a/tools/i386/netboot/ne/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/ne/stage1 b/tools/i386/netboot/ne/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/ne/stage1 +++ /dev/null diff --git a/tools/i386/netboot/ne/stage2 b/tools/i386/netboot/ne/stage2 Binary files differdeleted file mode 100644 index c0777f634..000000000 --- a/tools/i386/netboot/ne/stage2 +++ /dev/null diff --git a/tools/i386/netboot/ne2100/nbgrub b/tools/i386/netboot/ne2100/nbgrub Binary files differdeleted file mode 100644 index ca4c56f07..000000000 --- a/tools/i386/netboot/ne2100/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/ne2100/pxegrub b/tools/i386/netboot/ne2100/pxegrub Binary files differdeleted file mode 100644 index 37ddbbf8a..000000000 --- a/tools/i386/netboot/ne2100/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/ne2100/stage1 b/tools/i386/netboot/ne2100/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/ne2100/stage1 +++ /dev/null diff --git a/tools/i386/netboot/ne2100/stage2 b/tools/i386/netboot/ne2100/stage2 Binary files differdeleted file mode 100644 index 6bd1acb02..000000000 --- a/tools/i386/netboot/ne2100/stage2 +++ /dev/null diff --git a/tools/i386/netboot/ni5010/nbgrub b/tools/i386/netboot/ni5010/nbgrub Binary files differdeleted file mode 100644 index b5b935ebd..000000000 --- a/tools/i386/netboot/ni5010/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/ni5010/pxegrub b/tools/i386/netboot/ni5010/pxegrub Binary files differdeleted file mode 100644 index fe5a6d0a2..000000000 --- a/tools/i386/netboot/ni5010/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/ni5010/stage1 b/tools/i386/netboot/ni5010/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/ni5010/stage1 +++ /dev/null diff --git a/tools/i386/netboot/ni5010/stage2 b/tools/i386/netboot/ni5010/stage2 Binary files differdeleted file mode 100644 index bf26459ab..000000000 --- a/tools/i386/netboot/ni5010/stage2 +++ /dev/null diff --git a/tools/i386/netboot/ni5210/nbgrub b/tools/i386/netboot/ni5210/nbgrub Binary files differdeleted file mode 100644 index 04b92c46f..000000000 --- a/tools/i386/netboot/ni5210/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/ni5210/pxegrub b/tools/i386/netboot/ni5210/pxegrub Binary files differdeleted file mode 100644 index 06f3020ad..000000000 --- a/tools/i386/netboot/ni5210/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/ni5210/stage1 b/tools/i386/netboot/ni5210/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/ni5210/stage1 +++ /dev/null diff --git a/tools/i386/netboot/ni5210/stage2 b/tools/i386/netboot/ni5210/stage2 Binary files differdeleted file mode 100644 index 220cb0816..000000000 --- a/tools/i386/netboot/ni5210/stage2 +++ /dev/null diff --git a/tools/i386/netboot/ni6510/nbgrub b/tools/i386/netboot/ni6510/nbgrub Binary files differdeleted file mode 100644 index 91f390b52..000000000 --- a/tools/i386/netboot/ni6510/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/ni6510/pxegrub b/tools/i386/netboot/ni6510/pxegrub Binary files differdeleted file mode 100644 index 8ab495c37..000000000 --- a/tools/i386/netboot/ni6510/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/ni6510/stage1 b/tools/i386/netboot/ni6510/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/ni6510/stage1 +++ /dev/null diff --git a/tools/i386/netboot/ni6510/stage2 b/tools/i386/netboot/ni6510/stage2 Binary files differdeleted file mode 100644 index 3ebadf22a..000000000 --- a/tools/i386/netboot/ni6510/stage2 +++ /dev/null diff --git a/tools/i386/netboot/ns8390/nbgrub b/tools/i386/netboot/ns8390/nbgrub Binary files differdeleted file mode 100644 index ddf5b55c0..000000000 --- a/tools/i386/netboot/ns8390/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/ns8390/pxegrub b/tools/i386/netboot/ns8390/pxegrub Binary files differdeleted file mode 100644 index be75a76a8..000000000 --- a/tools/i386/netboot/ns8390/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/ns8390/stage1 b/tools/i386/netboot/ns8390/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/ns8390/stage1 +++ /dev/null diff --git a/tools/i386/netboot/ns8390/stage2 b/tools/i386/netboot/ns8390/stage2 Binary files differdeleted file mode 100644 index e3815fa64..000000000 --- a/tools/i386/netboot/ns8390/stage2 +++ /dev/null diff --git a/tools/i386/netboot/otulip/nbgrub b/tools/i386/netboot/otulip/nbgrub Binary files differdeleted file mode 100644 index e98fe5290..000000000 --- a/tools/i386/netboot/otulip/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/otulip/pxegrub b/tools/i386/netboot/otulip/pxegrub Binary files differdeleted file mode 100644 index e741218a6..000000000 --- a/tools/i386/netboot/otulip/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/otulip/stage1 b/tools/i386/netboot/otulip/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/otulip/stage1 +++ /dev/null diff --git a/tools/i386/netboot/otulip/stage2 b/tools/i386/netboot/otulip/stage2 Binary files differdeleted file mode 100644 index 286952eba..000000000 --- a/tools/i386/netboot/otulip/stage2 +++ /dev/null diff --git a/tools/i386/netboot/rtl8139/nbgrub b/tools/i386/netboot/rtl8139/nbgrub Binary files differdeleted file mode 100644 index 5ef3d141b..000000000 --- a/tools/i386/netboot/rtl8139/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/rtl8139/pxegrub b/tools/i386/netboot/rtl8139/pxegrub Binary files differdeleted file mode 100644 index 143ed5462..000000000 --- a/tools/i386/netboot/rtl8139/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/rtl8139/stage1 b/tools/i386/netboot/rtl8139/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/rtl8139/stage1 +++ /dev/null diff --git a/tools/i386/netboot/rtl8139/stage2 b/tools/i386/netboot/rtl8139/stage2 Binary files differdeleted file mode 100644 index 4fb729d6e..000000000 --- a/tools/i386/netboot/rtl8139/stage2 +++ /dev/null diff --git a/tools/i386/netboot/sis900/nbgrub b/tools/i386/netboot/sis900/nbgrub Binary files differdeleted file mode 100644 index 856771aae..000000000 --- a/tools/i386/netboot/sis900/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/sis900/pxegrub b/tools/i386/netboot/sis900/pxegrub Binary files differdeleted file mode 100644 index 59e0244d0..000000000 --- a/tools/i386/netboot/sis900/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/sis900/stage1 b/tools/i386/netboot/sis900/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/sis900/stage1 +++ /dev/null diff --git a/tools/i386/netboot/sis900/stage2 b/tools/i386/netboot/sis900/stage2 Binary files differdeleted file mode 100644 index 9ad200099..000000000 --- a/tools/i386/netboot/sis900/stage2 +++ /dev/null diff --git a/tools/i386/netboot/sk_g16/nbgrub b/tools/i386/netboot/sk_g16/nbgrub Binary files differdeleted file mode 100644 index 5f8a4973c..000000000 --- a/tools/i386/netboot/sk_g16/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/sk_g16/pxegrub b/tools/i386/netboot/sk_g16/pxegrub Binary files differdeleted file mode 100644 index 9d2fd22ce..000000000 --- a/tools/i386/netboot/sk_g16/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/sk_g16/stage1 b/tools/i386/netboot/sk_g16/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/sk_g16/stage1 +++ /dev/null diff --git a/tools/i386/netboot/sk_g16/stage2 b/tools/i386/netboot/sk_g16/stage2 Binary files differdeleted file mode 100644 index 0aa999bd3..000000000 --- a/tools/i386/netboot/sk_g16/stage2 +++ /dev/null diff --git a/tools/i386/netboot/smc9000/nbgrub b/tools/i386/netboot/smc9000/nbgrub Binary files differdeleted file mode 100644 index d6208c387..000000000 --- a/tools/i386/netboot/smc9000/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/smc9000/pxegrub b/tools/i386/netboot/smc9000/pxegrub Binary files differdeleted file mode 100644 index 335d1b2d3..000000000 --- a/tools/i386/netboot/smc9000/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/smc9000/stage1 b/tools/i386/netboot/smc9000/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/smc9000/stage1 +++ /dev/null diff --git a/tools/i386/netboot/smc9000/stage2 b/tools/i386/netboot/smc9000/stage2 Binary files differdeleted file mode 100644 index 959ba63f0..000000000 --- a/tools/i386/netboot/smc9000/stage2 +++ /dev/null diff --git a/tools/i386/netboot/tiara/nbgrub b/tools/i386/netboot/tiara/nbgrub Binary files differdeleted file mode 100644 index c6e1be61c..000000000 --- a/tools/i386/netboot/tiara/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/tiara/pxegrub b/tools/i386/netboot/tiara/pxegrub Binary files differdeleted file mode 100644 index 8958b93bc..000000000 --- a/tools/i386/netboot/tiara/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/tiara/stage1 b/tools/i386/netboot/tiara/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/tiara/stage1 +++ /dev/null diff --git a/tools/i386/netboot/tiara/stage2 b/tools/i386/netboot/tiara/stage2 Binary files differdeleted file mode 100644 index ac890c297..000000000 --- a/tools/i386/netboot/tiara/stage2 +++ /dev/null diff --git a/tools/i386/netboot/tulip/nbgrub b/tools/i386/netboot/tulip/nbgrub Binary files differdeleted file mode 100644 index b55321acb..000000000 --- a/tools/i386/netboot/tulip/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/tulip/pxegrub b/tools/i386/netboot/tulip/pxegrub Binary files differdeleted file mode 100644 index d6400bc08..000000000 --- a/tools/i386/netboot/tulip/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/tulip/stage1 b/tools/i386/netboot/tulip/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/tulip/stage1 +++ /dev/null diff --git a/tools/i386/netboot/tulip/stage2 b/tools/i386/netboot/tulip/stage2 Binary files differdeleted file mode 100644 index bb787876a..000000000 --- a/tools/i386/netboot/tulip/stage2 +++ /dev/null diff --git a/tools/i386/netboot/via_rhine/nbgrub b/tools/i386/netboot/via_rhine/nbgrub Binary files differdeleted file mode 100644 index 6d32a2801..000000000 --- a/tools/i386/netboot/via_rhine/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/via_rhine/pxegrub b/tools/i386/netboot/via_rhine/pxegrub Binary files differdeleted file mode 100644 index 1c1a04437..000000000 --- a/tools/i386/netboot/via_rhine/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/via_rhine/stage1 b/tools/i386/netboot/via_rhine/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/via_rhine/stage1 +++ /dev/null diff --git a/tools/i386/netboot/via_rhine/stage2 b/tools/i386/netboot/via_rhine/stage2 Binary files differdeleted file mode 100644 index cae5cd9c6..000000000 --- a/tools/i386/netboot/via_rhine/stage2 +++ /dev/null diff --git a/tools/i386/netboot/w89c840/nbgrub b/tools/i386/netboot/w89c840/nbgrub Binary files differdeleted file mode 100644 index ea30621cd..000000000 --- a/tools/i386/netboot/w89c840/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/w89c840/pxegrub b/tools/i386/netboot/w89c840/pxegrub Binary files differdeleted file mode 100644 index 4a87da113..000000000 --- a/tools/i386/netboot/w89c840/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/w89c840/stage1 b/tools/i386/netboot/w89c840/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/w89c840/stage1 +++ /dev/null diff --git a/tools/i386/netboot/w89c840/stage2 b/tools/i386/netboot/w89c840/stage2 Binary files differdeleted file mode 100644 index cad6e1beb..000000000 --- a/tools/i386/netboot/w89c840/stage2 +++ /dev/null diff --git a/tools/i386/netboot/wd/nbgrub b/tools/i386/netboot/wd/nbgrub Binary files differdeleted file mode 100644 index 9d75d57da..000000000 --- a/tools/i386/netboot/wd/nbgrub +++ /dev/null diff --git a/tools/i386/netboot/wd/pxegrub b/tools/i386/netboot/wd/pxegrub Binary files differdeleted file mode 100644 index d41c51e8f..000000000 --- a/tools/i386/netboot/wd/pxegrub +++ /dev/null diff --git a/tools/i386/netboot/wd/stage1 b/tools/i386/netboot/wd/stage1 Binary files differdeleted file mode 100755 index 3d96f6eca..000000000 --- a/tools/i386/netboot/wd/stage1 +++ /dev/null diff --git a/tools/i386/netboot/wd/stage2 b/tools/i386/netboot/wd/stage2 Binary files differdeleted file mode 100644 index 7f1575c0b..000000000 --- a/tools/i386/netboot/wd/stage2 +++ /dev/null diff --git a/tools/i386/sh b/tools/i386/sh Binary files differdeleted file mode 100755 index 084a97837..000000000 --- a/tools/i386/sh +++ /dev/null diff --git a/tools/ia64/e2fsck.shared b/tools/ia64/e2fsck.shared Binary files differdeleted file mode 100755 index 1ca570a7b..000000000 --- a/tools/ia64/e2fsck.shared +++ /dev/null diff --git a/tools/ia64/elilo.efi b/tools/ia64/elilo.efi Binary files differdeleted file mode 100755 index 39151b8e3..000000000 --- a/tools/ia64/elilo.efi +++ /dev/null diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list index dbe5169a9..64c70b9c6 100755 --- a/tools/install-xml-file-list +++ b/tools/install-xml-file-list @@ -1,8 +1,10 @@ #!/usr/bin/perl +use FileHandle; use MDK::Common; use XML::Parser; use Data::Dumper; +use File::Glob; use Config; use Cwd 'cwd'; @@ -17,14 +19,17 @@ if ($>) { $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } +my $verbose; #$verbose = 1; my $initial_dir = cwd(); my $ARCH = arch() =~ /i.86/ ? 'i386' : arch(); +$ARCH =~ s/^(arm).*/$1/; my $LIB = arch() =~ /x86_64/ ? "lib64" : "lib"; my $base_cpio_options = '-pumd --quiet'; +my $problem; my $tree = XML::Parser->new(Style => 'Tree')->parsefile($xml_file_list); my $main_node = decompose($tree); @@ -33,13 +38,21 @@ $main_node->{tag} eq 'list' or die "bad file $xml_file_list (main tag should be handle_nodes({}, $main_node); +$problem and exit 1; + install_needed_libraries(); final_cleanup(); +sub error { + my ($err) = @_; + warn "FATAL: $err\n"; + $problem = 1; +} + sub final_cleanup() { #- cpio creates directory 700, that's not nice - system("find $DEST -type d | xargs $sudo chmod 755"); + system("find $DEST -type d -print0 | xargs -0 $sudo chmod 755"); } sub handle_nodes { @@ -80,7 +93,7 @@ sub valid_cond { sub add_to_env { my ($env, $tag, $attr) = @_; - my %env = map_each { $::a => +{%$::b} } %$env; + my %env = map_each { $::a => +{ %$::b } } %$env; foreach (keys %$attr) { !$env{$tag}{$_} or die qq(overriding attribute <$tag $_="$env{$tag}{$_}"> with $_="$attr->{$_}"\n); $env{$tag}{$_} = $attr->{$_}; @@ -128,28 +141,35 @@ sub collect_needed_libraries { my $to_check = join(' ', @to_check); my @l = `ldd $to_check 2>/dev/null` =~ m! => (/\S+)!g; foreach (@l) { - s!^(/lib(64)?/).*?/!$1! if $main_node->{attr}{'no-arch-libraries'}; #- replace /lib/tls or /lib/i686 with /lib + if ($main_node->{attr}{'no-arch-libraries'}) { + #- replace /lib/tls or /lib/i686 with /lib + s!^(/lib(64)?/).*?/!$1! if arch() !~ /x86_64/; + } } @to_check = grep { !$needed_libraries{$_}++ } @l; @to_check = (); } } -sub install_needed_libraries { +sub install_needed_libraries() { copy_files('', $DEST, [ keys %needed_libraries ], '', '--dereference'); } sub collect_needed_perl_files { - my ($local_rep, $dest, @scripts) = @_; + my ($local_rep, @scripts) = @_; my (%local, %global); foreach my $script (@scripts) { foreach (`strace -efile perl -cw -I$local_rep $script 2>&1`) { - my ($f) = /^open\("(.*?)",.*\)\s*=\s*\d+$/ or next; + my ($f) = /^open(?:at\([^,]*, |)"(.*?)",.*\)\s*=\s*\d+$/ or next; if ($f =~ m!^\Q$local_rep\E/(.*)!) { $local{$1} = 1; } elsif (begins_with($f, '/dev/')) { # skip } elsif (begins_with($f, '/')) { + if ($main_node->{attr}{'no-arch-libraries'}) { + #- replace /lib/tls or /lib/i686 with /lib + $f =~ s!^(/lib(64)?/).*?/!$1! if arch() !~ /x86_64/; + } $global{$f} = 1; } } @@ -169,7 +189,7 @@ sub copy_files { } } else { my $options = join(' ', $base_cpio_options, @options); - warn "cpio $options to_dir $to_dir from $working_dir: @$files\n" if $verbose; + warn "cpio $options to_dir=$to_dir from=$working_dir: @$files\n" if $verbose; open(my $F, "| cd $working_dir ; $sudo cpio $options $to_dir"); print $F "$_\n" foreach @$files; close($F) or die "cpio $to_dir failed\n"; @@ -196,30 +216,38 @@ sub install { my @l = $f; chdir $working_dir; if ($f =~ /\*/ || $b_full_glob) { - @l = glob($f) or die "no match for $f\n"; - - @l == 1 || $b_full_glob or die "multiple match for $f\n"; - } else { - -e $f or die "missing file $f ($rel) in $working_dir\n"; + @l = File::Glob::bsd_glob($f); #- using bsd_glob because CORE::glob() splits on whitespace and we don't want this + if (@l == 0) { + error("no match for $f"); + } elsif (@l == 1 || $b_full_glob) { + } else { + error("multiple match for $f"); + @l = (); + } + } elsif (! -e $f) { + error("missing file $f ($rel) in $working_dir"); + @l = (); } if (@l == 1 && -d $l[0] && $b_recursive_dirs) { @l = all_files_rec_($l[0]); } - @l = grep { !m!/CVS($|/)! } @l; - if (my $re = $env->{from}{matching}) { + @l = grep { !m!/(\.svn|CVS)($|/)! } @l; + if (my $re = expand_macros($env->{from}{matching})) { @l = grep { eval $re } @l; } - collect_needed_libraries(grep { -x $_ } @l); + collect_needed_libraries(grep { -f $_ && -x $_ } @l); chdir $initial_dir; @l; }; + my @text_l = $env->{from}{spaces_in_filename} ? $text =~ /^\s*(.*?)\s*$/ : split(' ', $text); my @files; if ($expand eq 'tar') { - foreach (split(' ', $text)) { - system('tar', 'xfj', $from_file->($_), '-C', $to_dir); + foreach (@text_l) { + my ($tarball) = $from_file->($_) or next; + system('tar', 'xfj', $tarball, '-C', $to_dir); } # not filling @files, things are already done @@ -228,14 +256,16 @@ sub install { } elsif ($expand eq 'glob') { #- glob done in $from_file - @files = split(' ', $text); + @files = @text_l; } elsif ($expand eq 'binary') { $disallow_from_dir->(); - my @PATH = qw(/sbin /bin /usr/bin /usr/sbin /usr/X11R6/bin); - foreach my $name (map { expand_macros($_) } split(' ', $text)) { + my @PATH = qw(/usr/sbin /usr/bin /usr/X11R6/bin); + unshift(@PATH, "/bin") unless -l "/bin"; + unshift(@PATH, "/sbin") unless -l "/sbin"; + foreach my $name (map { expand_macros($_) } @text_l) { my @l = grep { -x $_ } map { "$_/$name" } @PATH; - @l or die "can't find binary $name\n"; + @l or error("can't find binary $name"), next; if (@l > 1) { my @m = grep { ! -l $_ } @l; if (@m == 1) { @@ -250,6 +280,7 @@ sub install { my $f = $l[0]; while (1) { push @files, $f; + $copy_mode ne 'dereference' or last; my $l = readlink($f) or last; if ($l =~ m!/! && $l !~ m!^\.\..*/s?bin/[^/]+$!) { warn "keeping symlink $f -> $l as is\n"; @@ -257,39 +288,48 @@ sub install { } $f = dirname($f) . '/' . $l; } - } - $copy_mode = 'keep-links'; + } + $copy_mode ||= 'keep-links'; $env->{filter}{command} ||= 'strip'; } elsif ($expand eq 'rpm') { $disallow_from_dir->(); - foreach my $rpm (split(' ', $text)) { - my @l = chomp_(`rpm -ql $rpm`) or die "rpm $rpm must be installed\n"; + foreach my $rpm (@text_l) { + my @l = chomp_(`rpm -ql $rpm`) or error("rpm $rpm must be installed"); push @files, @l; } + } elsif ($expand eq 'perl-bin') { + $disallow_from_dir->(); + $from_dir = '/usr/LIB/perl5/vendor_perl/'; + @files = @text_l; } elsif ($expand eq 'perl') { $disallow_from_dir->(); - $from_dir = '/usr/lib/perl5/vendor_perl/*'; - @files = split(' ', $text); + $from_dir = '/usr/share/perl5/vendor_perl/'; + @files = @text_l; } elsif ($expand eq 'main-perl') { $disallow_from_dir->(); $from_dir = $Config{privlib}; - @files = split(' ', $text); + @files = @text_l; + } elsif ($expand eq 'main-perl-bin') { + $disallow_from_dir->(); + $from_dir = $Config{archlib}; + @files = @text_l; } elsif ($expand =~ /collect-perl-files/) { my (undef, $local, $to) = split(' ', $expand); - @files = split(' ', $text); + @files = @text_l; warn "collect-perl-files $local $to @files ($env->{filter}{command})\n"; - my ($local_perl_files, $global_perl_files) = collect_needed_perl_files($local, $to, @files); + my ($local_perl_files, $global_perl_files) = collect_needed_perl_files($local, @files); warn "collect-perl-files gave: ", join(' ', @$local_perl_files), "\n"; - copy_and_filter("$working_dir/$local", "$DEST$to", $local_perl_files, $env->{filter}, '', '--dereference'); +# warn " and: ", join(' ', @$global_perl_files), "\n"; + copy_and_filter($local =~ m!/! ? $local : "$working_dir/$local", "$DEST$to", $local_perl_files, $env->{filter}, '', '--dereference'); copy_and_filter('', $DEST, $global_perl_files, $env->{filter}, '', '--dereference'); } elsif ($expand) { die "unknown expand method $expand\n"; } else { - @files = split(' ', $text); + @files = @text_l; $env->{filter}{command} ||= 'strip' if $to_dir =~ m!/bin$!; } @@ -304,7 +344,9 @@ sub install { my @options = ( if_($copy_mode ne 'keep-links', '--dereference'), ); - copy_and_filter($working_dir, $to_dir, \@all_files, $env->{filter}, $env->{to}{flatten}, @options); + if (@all_files) { + copy_and_filter($working_dir, $to_dir, \@all_files, $env->{filter}, $env->{to}{flatten}, @options); + } } sub copy_and_filter { @@ -320,15 +362,16 @@ sub apply_filter { chdir $to_dir; foreach (group_by_n(20, $all_files)) { my @l = $b_flatten ? (map { basename($_) } @$_) : (map { "./$_" } @$_); - @l = grep { ! -d $_ } @l; + @l = grep { ! -d $_ } @l or next; if (my $subst = $filter->{subst}) { + warn "running substition $subst \n" if $verbose; system('perl', '-pi', '-e', $subst, @l); } if (my $command = $filter->{command}) { $command = $initial_dir . "/$command" if $command =~ m!^..?/!; if ($command =~ /simplify-drakx-modules/) { - @l = grep { !/\.so($|\.)/ } @l; + @l = grep { !/\.so($|\.)/ } @l or next; } my @options = ( if_($command eq 'gzip', '-9f'), diff --git a/tools/mailchangelog.pl b/tools/mailchangelog.pl deleted file mode 100755 index 6e7793eb7..000000000 --- a/tools/mailchangelog.pl +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/perl - -open F, '|/usr/sbin/sendmail -oi -t'; - -chomp($ver = <STDIN>); - -print F -q(Subject: [DrakX] DrakX snapshot #), $ver, q( uploaded -From: DrakX Builder Robot <devel@mandrakesoft.com> -To: changelog@linux-mandrake.com -Reply-To: install@mandrakesoft.com - -); -print F foreach <STDIN>; diff --git a/tools/make_lang_png_transparent.c b/tools/make_lang_png_transparent.c index b5e9a1683..9a037e864 100644 --- a/tools/make_lang_png_transparent.c +++ b/tools/make_lang_png_transparent.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc at mandrakesoft.com) + * Guillaume Cottenceau (gc at mandriva.com) * - * Copyright 2002 Mandrakesoft + * Copyright 2002-2005 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/tools/mdkinst_stage2_tool b/tools/mdkinst_stage2_tool index f383cdf1c..0019ffc86 100755 --- a/tools/mdkinst_stage2_tool +++ b/tools/mdkinst_stage2_tool @@ -1,44 +1,69 @@ #!/bin/sh -[ $# != 1 ] && { - echo "usage: mdkinst_stage2_tool <stage2 dir>" ; - echo " example: misc/mdkinst_stage2_tool install/stage2" - exit +error() { + cat <<EOF; +usage: mdkinst_stage2_tool [--clean] [--compress | --uncompress] <stage2 dir> [<compressed file>] +EOF + exit 1 } -STAGE2_DIR="$1" -LIVE_DIR="$STAGE2_DIR/live" -CLP="$STAGE2_DIR/mdkinst.clp" +if [ "$1" = "--clean" ]; then + CLEAN=1 + shift +fi + +[ $# = 2 -o $# = 3 ] || error + +if [ "$1" = "--compress" -o "$1" == "--uncompress" ]; then + ACTION=$1 + shift + STAGE2_DIR="$1" + shift + LIVE_DIR="$STAGE2_DIR/live" + if [ -n "$1" ]; then + COMPRESSED_IMAGE=$1 + shift + else + COMPRESSED_IMAGE="$STAGE2_DIR/mdkinst.sqfs" + fi +else + error +fi + +if [ $ACTION = "--compress" ]; then + which mksquashfs >/dev/null 2>/dev/null || { echo "missing command mksquashfs (from squashfs-tools)"; exit 1; } -if [ -d $LIVE_DIR ]; then - echo "Creating $CLP from $LIVE_DIR" + [ -d "$LIVE_DIR" ] || error + echo "Creating $COMPRESSED_IMAGE from $LIVE_DIR" rm -f $STAGE2_DIR/.room - mkisofs -quiet -D -R $LIVE_DIR | create_compressed_fs - 65536 $CLP 200 2>/dev/null + if ! mksquashfs $LIVE_DIR $COMPRESSED_IMAGE -all-root -noappend >/dev/null; then + echo "mksquashfs failed" + exit 1 + fi + chmod 755 $COMPRESSED_IMAGE echo foo > $STAGE2_DIR/.room if [ -s $STAGE2_DIR/.room ]; then - rm -rf $LIVE_DIR $STAGE2_DIR/.room + rm -f $STAGE2_DIR/.room + [ -n "$CLEAN" ] && rm -rf $LIVE_DIR else echo "not enough space" - rm -f $CLP + rm -f $COMPRESSED_IMAGE exit 1 fi else - echo "Creating $LIVE_DIR from $CLP" + which unsquashfs >/dev/null 2>/dev/null || { echo "missing command unsquashfs (from squashfs-tools)"; exit 1; } - TMPDIR=${TMPDIR=/tmp} - MNTPOINT=$TMPDIR/stage2_img + [ -f "$COMPRESSED_IMAGE" ] || error + echo "Creating $LIVE_DIR from $COMPRESSED_IMAGE" if [ $EUID != "0" ]; then SUDO="sudo" PATH="/sbin:/usr/sbin:$PATH" fi - $SUDO umount $MNTPOINT 2>/dev/null - mkdir -p $MNTPOINT - extract_compressed_fs $CLP > $CLP.iso 2>/dev/null - mkdir $LIVE_DIR || { echo "not enough space"; exit 1; } - $SUDO mount -o loop $CLP.iso $MNTPOINT || { echo "can not loopback mount $CLP"; exit 1; } - cp -a $MNTPOINT/* $LIVE_DIR/ || { rm -rf $LIVE_DIR; exit 1; } - $SUDO umount $MNTPOINT - rm -f $CLP.iso $CLP + unsquashfs -dest $LIVE_DIR $COMPRESSED_IMAGE || { rm -rf $LIVE_DIR; exit 1; } + + [ -n "$CLEAN" ] && rm -f $COMPRESSED_IMAGE fi + +exit 0 diff --git a/tools/patch_pcmcia_config.pl b/tools/patch_pcmcia_config.pl deleted file mode 100755 index 6e8614cc0..000000000 --- a/tools/patch_pcmcia_config.pl +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/perl - -use MDK::Common; - -listlength(@ARGV) == 2 or die "usage: $0 /path/to/etc/pcmcia/config /path/to/modules.dep\n"; - -my ($pcmcia_config, $modules_dep) = @ARGV; - - -my @ignore_modules_in_deps = qw(pcmcia_core pcmcia ds); - -my @conf_contents = cat_($pcmcia_config); -die "uhm, problem, <$pcmcia_config> seems short in lines\n" if listlength(@conf_contents) < 10; - -foreach (cat_($modules_dep)) { - /^(\S+): (.*)/ and $deps{$1} = [ split ' ', $2 ] or die "could not understand `$_' in <$modules_dep>\n"; -} - -foreach my $confline (@conf_contents) { - $confline =~ /class.*\s+module\s+(.*)/ or next; - my @modules = map { /"([^"]+)"(.*)/ && [ $1, $2 ] } split ',', $1; - $_->[0] =~ s|.*/([^/]+)$|$1|g foreach @modules; #- remove directories since we don't support that during install - my @deps = grep { !member($_, @ignore_modules_in_deps, map { $_->[0] } @modules) } map { @{$deps{$_->[0]}} } @modules; - my $new_modz = join ', ', (map { "\"$_\"" } @deps), (map { "\"$_->[0]\"$_->[1]" } @modules); - $confline =~ s/(class.*\s+module\s+).*/$1$new_modz/; -} - -output($pcmcia_config, @conf_contents); diff --git a/tools/ppc/README b/tools/ppc/README deleted file mode 100644 index fd1aaae03..000000000 --- a/tools/ppc/README +++ /dev/null @@ -1,39 +0,0 @@ -Mini-Howto on burning Mandrake PPC Bootable CD's for Apple G3/G4 systems -------------------------------------------------------------------------- -email: John Buswell <johnb@mandrakesoft.com> - -To create a disk image simply use the mkINSTALLCD script provided in this -directory. The path you provide the script should point to the root directory -for the CD. - -For example after you have built the gi install with /export, simply pass -/export to the script as the distribution path and a name for the image. -Once the image is built you can use hmount, humount, hdir, hcd and hattrib -to modify and inspect the image before you commit it to CD-R. - -Before you run the script make sure the CD version of iBoot is in the -iBoot directory below /export (eg. /export/iBoot), if you want to use some -other directory then simply modify the script. Beware, HFS is not case -sensitive, so if you already have an INSTALL file you cannot create install. - -Currently iBoot sports two trees, one for the install CD and another for -regular usage. These will be merged shortly and a simply #define can be used -in the Makefile to implement one or the other from a single binary. - -Enjoy!! - - -Addendum: 3/15/2001 Stew Benedict <sbenedict@mandrakesoft.com> --------------------------------------------------------------------------- - -A couple of changes. - -I've opted to standardize on yaboot, which is user configurable, so the script -is modified now to use yaboot. - -Secondly, since mkhybrid merged with mkisofs, the hybrid images it creates are -read-only, so one is unable to mount the image and bless the boot directory for -booting. Consequently, I've included the binary for mkhybrid-1.12b5.4, which -does work. - - diff --git a/tools/ppc/Xpmac b/tools/ppc/Xpmac Binary files differdeleted file mode 100755 index ec50e6aa0..000000000 --- a/tools/ppc/Xpmac +++ /dev/null diff --git a/tools/ppc/convert b/tools/ppc/convert deleted file mode 100755 index a2622c630..000000000 --- a/tools/ppc/convert +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -mv $1.orig $1.Unix -tr "\n" "\r" < $1.Unix > $1.MacOS -perl -e '@line = <>; $line = join("\r\n", split(/\n/, join("", @line))); print $line; print "\r\n";' < $1.Unix > $1.DOS diff --git a/tools/ppc/e2fsck.shared b/tools/ppc/e2fsck.shared Binary files differdeleted file mode 100644 index 32e506c31..000000000 --- a/tools/ppc/e2fsck.shared +++ /dev/null diff --git a/tools/ppc/magic b/tools/ppc/magic deleted file mode 100755 index 91f4193ea..000000000 --- a/tools/ppc/magic +++ /dev/null @@ -1,89 +0,0 @@ -# -# Example magic file for mkhybrid -# -# The "message" for the offset MUST be 4 characters for the CREATOR -# and 4 characters for the TYPE - white space is optional between them. -# Any other characters on this line are ignored. Continuation lines (starting -# with '>') are also ignored i.e. only the initial offset lines are used. -# -# The continuation lines are given here, but they do not need to exist. - -# -# James Pearson 20/5/98 - -# Modified by Christian Walther, 2003/01/17: -# changed gzip to StuffIt Expander -# added perl & shell script - -# off type test message - -# GIF -0 string GIF8 8BIM GIFf ->4 string 7a \b, version 8%s, ->4 string 9a \b, version 8%s, ->6 leshort >0 %hd x ->8 leshort >0 %hd, -#>10 byte &0x80 color mapped, -#>10 byte&0x07 =0x00 2 colors -#>10 byte&0x07 =0x01 4 colors -#>10 byte&0x07 =0x02 8 colors -#>10 byte&0x07 =0x03 16 colors -#>10 byte&0x07 =0x04 32 colors -#>10 byte&0x07 =0x05 64 colors -#>10 byte&0x07 =0x06 128 colors -#>10 byte&0x07 =0x07 256 colors - -# JPEG images -# -0 ubeshort 0xffd8 8BIM JPEG image data - -# StuffIt -# -0 string SIT! SIT!SIT! - -# standard unix compress -0 string \037\235 LZIV ZIVU ->2 byte&0x80 >0 block compressed ->2 byte&0x1f x %d bits - -# gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver) -0 string \037\213 Gzip SITx gzip compressed data ->2 byte <8 \b, reserved method, ->2 byte 8 \b, deflated, ->3 byte &0x01 ASCII, ->3 byte &0x02 continuation, ->3 byte &0x04 extra field, ->3 byte &0x08 original filename, ->3 byte &0x10 comment, ->3 byte &0x20 encrypted, ->4 ledate x last modified: %s, ->8 byte 2 max compression, ->8 byte 4 max speed, ->9 byte =0x00 os: MS-DOS ->9 byte =0x01 os: Amiga ->9 byte =0x02 os: VMS ->9 byte =0x03 os: Unix ->9 byte =0x05 os: Atari ->9 byte =0x06 os: OS/2 ->9 byte =0x07 os: MacOS ->9 byte =0x0A os: Tops/20 ->9 byte =0x0B os: Win/32 - -# Postscript -0 string %! ASPSTEXT ->2 string PS-Adobe- conforming ->>11 string >\0 at level %.3s ->>>15 string EPS - type %s ->>>15 string Query - type %s ->>>15 string ExitServer - type %s -# Some PCs have the annoying habit of adding a ^D as a document separator -0 string \004%! ASPS TEXT PostScript document text ->3 string PS-Adobe- conforming ->>12 string >\0 at level %.3s ->>>16 string EPS - type %s ->>>16 string Query - type %s ->>>16 string ExitServer - type %s - -# scripts -0 string #!/usr/bin/perl McPL TEXT -0 string #!/bin/sh ttxt TEXT diff --git a/tools/ppc/mapping b/tools/ppc/mapping deleted file mode 100755 index 35d5d3d1c..000000000 --- a/tools/ppc/mapping +++ /dev/null @@ -1,29 +0,0 @@ -# Example filename mapping file -# Modified by Christian Walther, 2003/01/17 -# -# EXTN XLate CREATOR TYPE Comment -COPYING Ascii 'ttxt' 'ttro' "Text File" -CREDITS Ascii 'ttxt' 'ttro' "Text File" -README Ascii 'ttxt' 'ttro' "Text File" -RPM-PGP-KEY Ascii 'ttxt' 'ttro' "Text File" -VERSION Ascii 'ttxt' 'ttro' "Text File" -.gz Raw 'SITx' 'Gzip' "GZip Compressed File" -.sit Raw 'SIT!' 'SITD' "StuffIt Archive" -.hqx Ascii 'SITx' 'TEXT' "BinHex Encoded File" -.html Ascii 'MOSS' 'TEXT' "HTML File" -.htm Ascii 'MOSS' 'TEXT' "HTML File" -.gif Raw 'ogle' 'GIFf' "GIF Image" -.jpg Raw 'ogle' 'JPEG' "JPEG Image" -.tif Raw 'ogle' 'TIFF' "TIFF Image" -.bz2 Raw 'SITx' 'Bzp2' "BZip2 Compressed File" -.png Raw 'ogle' 'PNGf' "PNG Image" -.rpm Raw 'mRPM' 'RPMf' "RPM Software Package" -.pl Ascii 'McPL' 'TEXT' "Perl Script" -.pl Ascii 'McPL' 'TEXT' "Perl Module" -.doc Raw 'MSWD' 'WDBN' "Word file" -.mov Raw 'TVOD' 'MooV' "QuickTime Movie" -.txt Ascii 'ttxt' 'TEXT' "Text File" -.conf Ascii 'ttxt' 'TEXT' "config file" -.tbxi Raw 'chrp' 'tbxi' "Macintosh Toolbox ROM file" -.sea Raw 'aust' 'APPL' "Self Expanding Archive" -* Raw '????' '????' "Unknown" diff --git a/tools/ppc/mkINSTALLCD b/tools/ppc/mkINSTALLCD deleted file mode 100755 index d7686f01d..000000000 --- a/tools/ppc/mkINSTALLCD +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# shell script to build a bootable hybrid PPC CD - -if ! rpm -q hfsutils ; then - echo 'You need hfsutils installed!!' - exit 1 -fi - -if [ -e $2 ] ; then - echo "Output image $2 exists, please delete" - echo "usage: $0 <CD tree> <output image name>" - exit 1 -fi - -if [ ! -d $1 ] ; then - echo "CD tree $1 is not a directory!" - echo "usage: $0 <CD tree> <output image name>" - exit 1 -fi - -# select the appropriate mkhybrid binary depending on if -# we are on x86 or ppc - -MKHYBRID=mkisofs - -#Change these when you build the CD.. -ApplicationID="Linux-Mandrake" -PublisherID="Mandrakesoft" -PreparerID="sbenedict@mandrakesoft.com" -SystemID=PPC -volid=ppc -hfsVolid=Linux-Mandrake -curPwd=`pwd` - -$MKHYBRID -part -hfs -r -l -J \ --A $ApplicationID \ --P $PublisherID \ --p $PreparerID \ --abstract "README" \ --sysid $SystemID \ --V $volid \ --volset "Update" \ --volset-size 2 \ --volset-seqno 1 \ --hfs-volid $hfsVolid \ --map $curPwd/mapping \ --magic $curPwd/magic \ --m "*.orig" \ --hide '*.MacOS' -hide '*.DOS' \ --hide-joliet '*.Unix' -hide-joliet '*.MacOS' \ --hide-hfs '*.Unix' -hide-hfs '*.DOS' \ --hfs-bless $1/boot \ --hfs-unlock \ --pad \ --o $2 \ -$1 - -#Bless boot folder so yaboot can boot -hmount $2 -hattrib -b boot -hcd boot -hattrib -t tbxi -c UNIX ofboot.b -hattrib -t boot -c UNIX yaboot -hattrib -t boot -c UNIX vmlinux -hattrib -t boot -c UNIX vmlinux-2.4 -hattrib -t conf -c UNIX yaboot.conf -hcd -hcd BootX -hrename Mandrake_Linux_Install.sit 'Mandrake Linux Install.sit' -hattrib -t APPL -c STi0 'Mandrake Linux Install.sit' -humount diff --git a/tools/ppc/mkhybrid-1.12b5.4 b/tools/ppc/mkhybrid-1.12b5.4 Binary files differdeleted file mode 100755 index 0e0901314..000000000 --- a/tools/ppc/mkhybrid-1.12b5.4 +++ /dev/null diff --git a/tools/ppc/mkhybrid-1.12b5.4-x86 b/tools/ppc/mkhybrid-1.12b5.4-x86 Binary files differdeleted file mode 100755 index fd5b21709..000000000 --- a/tools/ppc/mkhybrid-1.12b5.4-x86 +++ /dev/null diff --git a/tools/ppc/yaboot b/tools/ppc/yaboot Binary files differdeleted file mode 100644 index 72b19b911..000000000 --- a/tools/ppc/yaboot +++ /dev/null diff --git a/tools/serial_probe/.cvsignore b/tools/serial_probe/.cvsignore deleted file mode 100644 index e8e3e2d94..000000000 --- a/tools/serial_probe/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -serial_probe diff --git a/tools/serial_probe/serial.c b/tools/serial_probe/serial.c index c84cbcff5..5159c3dae 100644 --- a/tools/serial_probe/serial.c +++ b/tools/serial_probe/serial.c @@ -663,7 +663,6 @@ static int parse_pnp_string( unsigned char *pnp_id_string, int pnp_len, unsigned char *endfield; unsigned char *temppos; unsigned char *pnp_string; - unsigned char end_char; int no_more_extensions=0; int stage; @@ -719,7 +718,6 @@ static int parse_pnp_string( unsigned char *pnp_id_string, int pnp_len, /* setup end character we are looking for based on the start character */ if (start == p2) { pnp_id->xlate_6bit = 1; - end_char = EndPnP2; /* we need to xlate data in PnP fields */ /* remember to skip the revision fields (bytes 1 and 2 after start) */ temppos=start; @@ -734,7 +732,6 @@ static int parse_pnp_string( unsigned char *pnp_id_string, int pnp_len, } } else { pnp_id->xlate_6bit = 0; - end_char = EndPnP1; } /* move everything before the start of the PnP block */ @@ -881,7 +878,6 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags, int fd; int temp; int pnp_strlen; - int devicetype=-1; unsigned char pnp_string[100]; char port[20]; struct termios origattr; @@ -918,19 +914,11 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags, maj = major(sb.st_rdev); if (maj != 4 && (maj < 136 || maj > 143)) { if (ioctl (fd, TIOCLINUX, &twelve) < 0) { - #ifdef __powerpc__ - // we could have gotten an error for another reason - like EINVAL - // skipping ttyS0 on PPC - which is where most modems reside - if (errno == ENOTTY) { - #endif if (ioctl (fd, TIOCGSERIAL, &si) >= 0) { if (si.line > 0) { console = 1 << si.line; } else { console = 0; - #ifdef __powerpc__ - } - #endif } } else console = 0; } @@ -986,7 +974,6 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags, /* try twiddling RS232 control lines and see if it talks to us */ - devicetype=-1; pnp_strlen = 0; if (attempt_pnp_retrieve( fd, pnp_string, &pnp_strlen, sizeof(pnp_string) - 1 ) == PNP_COM_FATAL) diff --git a/tools/shift_img.c b/tools/shift_img.c index bd347b79f..36cb53e48 100644 --- a/tools/shift_img.c +++ b/tools/shift_img.c @@ -1,7 +1,7 @@ /* - * Guillaume Cottenceau (gc at mandrakesoft.com) + * Guillaume Cottenceau (gc at mandriva.com) * - * Copyright 2002 Mandrakesoft + * Copyright 2002-2005 Mandriva * * This software may be freely redistributed under the terms of the GNU * public license. diff --git a/tools/sparc/e2fsck.shared b/tools/sparc/e2fsck.shared Binary files differdeleted file mode 100755 index b423986e5..000000000 --- a/tools/sparc/e2fsck.shared +++ /dev/null diff --git a/tools/syncrpms b/tools/syncrpms deleted file mode 100755 index a2668bb93..000000000 --- a/tools/syncrpms +++ /dev/null @@ -1,267 +0,0 @@ -#!/usr/bin/perl - -#- Synchronize mulitple RPMS/SRPMS directories. -#- Copyright (C) 1999 Mandrakesoft (fpons@mandrakesoft.com) -#- -#- This program is free software; you can redistribute it and/or modify -#- it under the terms of the GNU General Public License as published by -#- the Free Software Foundation; either version 2, or (at your option) -#- any later version. -#- -#- This program is distributed in the hope that it will be useful, -#- but WITHOUT ANY WARRANTY; without even the implied warranty of -#- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -#- GNU General Public License for more details. -#- -#- You should have received a copy of the GNU General Public License -#- along with this program; if not, write to the Free Software -#- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -use strict qw(subs vars refs); - -#- compare a version string. -use URPM; - -#- keep some packages... -my $keep = 'kernel-BOOT'; - -#- get basename for a file. -sub basename { $_[0] =~ /([^\/]*)$/ ? $1 : $_[0]; } - -#- system functions. -sub cp { - my $pid; - if ($pid = fork()) { - waitpid($pid, 0); - } else { - exec '/bin/cp', @_; - } -} -sub mv { - my $pid; - if ($pid = fork()) { - waitpid($pid, 0); - } else { - exec '/bin/mv', @_; - } -} -sub rm { - my $pid; - if ($pid = fork()) { - waitpid($pid, 0); - } else { - exec '/bin/rm', '-f', @_; - } -} - -#- get a hash on name of srpms/rpms in a directory. -sub get_rpms { - my ($dir, $rpms, $flag, $modifiable) = @_; - - opendir D, $dir or die "cannot open directory $dir\n"; - map { - if (/([^\/]*?)-([^-]*)-([^-]*)\.([^-\.]*)\.rpm$/) { - my $key = "$1 $4"; #- get name including architecture. - if ($rpms->{$key}) { - if (URPM::ranges_overlap("== $2-$3", "> $rpms->{$key}{version}-$rpms->{$key}{release}")) { - if ($modifiable) { - if ($flag->{sorted}) { - print "you said rpms directory is sorted, so I keep obsoleted $rpms->{$key}{file} by $_ in $rpms->{$key}{dir}\n" if $flag->{verbose}; - } else { - if (-d $flag->{conflict}) { - print "moving obsoleted $rpms->{$key}{file} by $_ in $rpms->{$key}{dir}\n" if $flag->{verbose}; - mv("$rpms->{$key}{dir}/$rpms->{$key}{file}", $flag->{conflict}); - } elsif ($flag->{clean}) { - print "removing obsoleted $rpms->{$key}{file} by $_ in $rpms->{$key}{dir}\n" if $flag->{verbose}; - rm("$rpms->{$key}{dir}/$rpms->{$key}{file}"); - } - } - } - $rpms->{$key} = { key => $key, - name => $1, - version => $2, - release => $3, - arch => $4, - dir => $dir, - file => $_, - }; - } else { - if ($modifiable) { - if (-d $flag->{conflict}) { - print "copying older or equal $_ by $rpms->{$key}{file} in $flag->{conflict}\n" if $flag->{verbose}; - cp("$dir/$_", $flag->{conflict}); - chmod 0644, "$flag->{conflict}/$_"; - } elsif ($flag->{clean}) { - print "removing older or equal $_ by $rpms->{$key}{file} in $dir\n" if $flag->{verbose}; - rm("$dir/$_"); - } - } - } - } else { - $rpms->{$key} = { key => $key, - name => $1, - version => $2, - release => $3, - arch => $4, - dir => $dir, - file => $_, - }; - } - } else { - print STDERR "unable to parse filename $_\n"; - } - } grep { /\.rpm$/ } readdir D; - closedir D; -} - -#- sync packages list according to hashes of rpms. -sub sync_medium { - my ($rpmsdirs, $list, $rpms, $flag) = @_; - my %pkg2dir; - - #- build a hash according to rpmsdirs and list for package name. - my $i = 0; - foreach (@$list) { - local *F; - open F, $_ or die "unable to open packages list file \"$_\"\n"; - foreach (<F>) { - chomp; - print STDERR "package \"$_\" is listed in mulitple list files!\n" if $pkg2dir{$_}; - $pkg2dir{$_} = $rpmsdirs->[$i]; - print "package \"$_\" listed in list files does not exists in rpms directory\n" if $flag->{verbose} && !$rpms->{$_}; - } - close F; - - ++$i; - } - - #- check for right directory, and move if necessary. - foreach (values %$rpms) { - unless ($pkg2dir{$_->{key}}) { - print "file $_->{file} in $_->{dir} define package \"$_->{name}\" not listed in list files\n" if $flag->{verbose}; - } elsif ($_->{dir} ne $pkg2dir{$_->{key}}) { - print "moving file $_->{file} in $_->{dir} to $pkg2dir{$_->{key}}\n" if $flag->{verbose}; - mv("$_->{dir}/$_->{file}", $pkg2dir{$_->{key}}); - $_->{dir} = $pkg2dir{$_->{key}}; - } - } -} - -#- sync two hashes of rpms, update rpms and printer newer version that are not taken into account. -sub sync_rpms { - my ($source, $target, $flag) = @_; - - #- search in target part. - foreach (keys %$target) { - /$keep/ and next; - unless ($source->{$_}) { - if ($flag->{verbose}) { - print "removing $target->{$_}{file}" . ($flag->{remove} ? " from $target->{$_}{dir}\n" : " is neccessary!\n"); - my $k = $_; - } - if ($flag->{remove}) { - rm("$target->{$_}{dir}/$target->{$_}{file}"); - } - } - } - - #- search in both part. - foreach (keys %$source) { - /$keep/ and next; - if ($target->{$_}) { - if (URPM::ranges_overlap("== $source->{$_}{version}-$source->{$_}{release}", - ">= $target->{$_}{version}-$target->{$_}{release}")) { - if ("$source->{$_}{version}-$source->{$_}{release}" eq "$target->{$_}{version}-$target->{$_}{release}") { - -s "$source->{$_}{dir}/$source->{$_}{file}" == -s "$target->{$_}{dir}/$target->{$_}{file}" and next; - } - if ($flag->{verbose}) { - print "updating $target->{$_}{dir}/$target->{$_}{file} with newer version $source->{$_}{file}\n"; - } - if ($flag->{update}) { - cp("$source->{$_}{dir}/$source->{$_}{file}", $target->{$_}{dir}); - chmod 0644, "$target->{$_}{dir}/$source->{$_}{file}"; - unless (-e "$target->{$_}{dir}/$source->{$_}{file}") { - die "unable to copy $source->{$_}{file} from $source->{$_}{dir} into $target->{$_}{dir}\n"; - } - rm("$target->{$_}{dir}/$target->{$_}{file}") unless $source->{$_}{file} eq $target->{$_}{file}; #- copy on eq - } - } elsif ($source->{$_}{version} ne $target->{$_}{version} || $source->{$_}{release} ne $target->{$_}{release}) { - if ($flag->{verbose}) { - print STDERR "keeping more up-to-date version $target->{$_}{dir}/$target->{$_}{file} against $source->{$_}{dir}/$source->{$_}{file}, check your repository !\n"; - } - } #- say nothing if source is equal to target. - } - } - - #- search in source part. - foreach (keys %$source) { - /$keep/ and next; - unless ($target->{$_}) { - if ($flag->{verbose}) { - print "adding $source->{$_}{file}" . (-d $flag->{add} ? " to $flag->{add}\n" : " is neccessary!\n"); - } - if (-d $flag->{add}) { - cp("$source->{$_}{dir}/$source->{$_}{file}", $flag->{add}); - chmod 0644, "$flag->{add}/$source->{$_}{file}"; - } - } - } -} - -#- main program. -sub main { - my @from_rpms; - my @to_rpms; - my @list; - my $target; - my %flag; - my %source; - my %target; - - foreach (@_) { - if (/^--(\w*)$/) { - if ($1 eq 'verbose' || $1 eq 'update' || $1 eq 'remove' || $1 eq 'clean' || $1 eq 'sorted') { - $flag{$1} = 1; - } elsif ($1 eq 'add' || $1 eq 'conflict') { - $flag{$1} = undef; - } elsif ($1 eq 'from') { - $target = \@from_rpms; - } elsif ($1 eq 'to') { - $target = \@to_rpms; - } elsif ($1 eq 'list') { - $target = \@list; - } else { - die "unknown option: $1\n"; - } - } else { - if (exists $flag{add} && ! $flag{add}) { - $flag{add} = $_; - die "cannot add to non-directory: $_\n" unless -d $flag{add}; - } elsif (exists $flag{conflict} && ! $flag{conflict}) { - $flag{conflict} = $_; - die "cannot add to non-directory: $_\n" unless -d $flag{conflict}; - } else { - die "unknown parameter: $_\n" unless $target; - push @$target, $_; - } - } - } - - die "usage: syncrpms [--update] [--remove] [--clean] [--sorted] [--add <dir>] [--conflict <dir>] --from <dir_sources> --to <dir_targets> [--list <files>]\n" - unless scalar(@from_rpms) > 0 || scalar(@to_rpms) > 0; - - #- parse directory structures. - get_rpms($_, \%source, \%flag, 0) foreach @from_rpms; - print STDERR "reading " . scalar(keys %source) . " packages as source rpms from\n"; - print STDERR " $_\n" foreach @from_rpms; - - get_rpms($_, \%target, \%flag, 1) foreach @to_rpms; - print STDERR "reading " . scalar(keys %target) . " packages as target rpms from\n"; - print STDERR " $_\n" foreach @to_rpms; - - sync_medium(\@to_rpms, \@list, \%target, \%flag) if scalar(@list) > 0 && scalar(@to_rpms) > 0; - sync_rpms(\%source, \%target, \%flag) if scalar(@from_rpms) > 0 && scalar(@to_rpms) > 0; -} - -main(@ARGV); diff --git a/tools/update_images b/tools/update_images deleted file mode 100755 index 1cc5ea533..000000000 --- a/tools/update_images +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/perl - -@ARGV == 3 or die "Usage: $0 filename.img imagetype path_to_mar_bin\n ex. $0 cdrom-changedisk.img cdrom\n\nPut the old images (*.img), new vmlinuz, new modules.dep and new *.mar files in a fresh directory, and update each image file one by one."; - -$file = $ARGV[0]; -$img = $ARGV[1]; -$marbin = $ARGV[2]; - -sub __ { print @_, "\n"; system(@_); } -sub _ { __ @_; $? and die; } - -$topdir = '/tmp/updimg'; - -print "Updating boot image file $file of type $img\n"; - -_ "rm -rf $topdir"; -_ "mkdir $topdir"; - -_ "mkdir $topdir/img"; -_ "mount -o loop $file $topdir/img"; - -$rdz = glob("$topdir/img/*.rdz"); -$rdz or die "Could not glob rdz file in $topdir/img/*.rdz\n"; - -_ "zcat $rdz > /tmp/meuh"; -_ "mkdir $topdir/initrd"; -_ "mount -o loop /tmp/meuh $topdir/initrd"; - -print "\n\tOld sizes:\n"; -print `ls -l $topdir/img/vmlinuz`; -print `ls -l $topdir/initrd/modules/modules.mar`; -system("df $topdir/img"); -print "\n"; - -_ "cp -f vmlinuz $topdir/img/vmlinuz"; -system("$marbin -l $topdir/initrd/modules/modules.mar | sort > $topdir/oldmar"); -system("$marbin -l ${img}_modules.mar | sort > $topdir/newmar"); -_ "cp -f ${img}_modules.mar $topdir/initrd/modules/modules.mar"; -_ "cp -f modules.dep $topdir/initrd/modules/modules.dep"; - -_ "umount $topdir/initrd"; -_ "gzip -c /tmp/meuh > $rdz"; - -print "\n\tNew sizes:\n"; -print `ls -l vmlinuz`; -print `ls -l ${img}_modules.mar`; -system("df $topdir/img"); -print "\nDiff from old to new marfiles:\n"; -print `diff -u $topdir/oldmar $topdir/newmar`; -print "\n"; - -_ "umount $topdir/img"; diff --git a/tools/x86_64/busybox b/tools/x86_64/busybox Binary files differdeleted file mode 100755 index 07df11980..000000000 --- a/tools/x86_64/busybox +++ /dev/null |