Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/scripts mkspec,NONE,1.1 mkversion,NONE,1.1 Configure,1.1.1.1,1.2 Lindent,1.1.1.1,1.2 Menuconfig,1.1.1.1,1.2 checkconfig.pl,1.1.1.2,1.2 docgen,1.1.1.1,1.2 docproc.c,1.1.1.1,1.2 header.tk,1.1.1.1,1.2 kernel-doc,1.1.1.1,1.2 mkdep.c,1.1.1.1,1.2 patch-kernel,1.1.1.1,1.2 split-include.c,1.1.1.1,1.2 tkgen.c,1.1.1.1,1.2 ver_linux,1.1.1.1,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 16:38:55
|
Update of /cvsroot/linux-vax/kernel-2.4/scripts In directory usw-pr-cvs1:/tmp/cvs-serv4925 Modified Files: Configure Lindent Menuconfig checkconfig.pl docgen docproc.c header.tk kernel-doc mkdep.c patch-kernel split-include.c tkgen.c ver_linux Added Files: mkspec mkversion Log Message: synch 2.4.15 commit 26 --- NEW FILE --- #!/bin/sh # # Output a simple RPM spec file that uses no fancy features requring # RPM v4. This is intended to work with any RPM distro. # # The only gothic bit here is redefining install_post to avoid # stripping the symbols from files in the kernel which we want # echo "Name: kernel" echo "Summary: The Linux Kernel" echo "Version: "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION | sed -e "s/-//" # we need to determine the NEXT version number so that uname and # rpm -q will agree echo "Release: `. scripts/mkversion`" echo "License: GPL" echo "Group: System Environment/Kernel" echo "Vendor: The Linux Community" echo "URL: http://www.kernel.org" echo -n "Source: kernel-$VERSION.$PATCHLEVEL.$SUBLEVEL" echo "$EXTRAVERSION.tar.gz" | sed -e "s/-//" echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root" echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :" echo "" echo "%description" echo "The Linux Kernel, the operating system core itself" echo "" echo "%prep" echo "%setup -q" echo "" echo "%build" echo "make oldconfig dep clean bzImage modules" echo "" echo "%install" echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib $RPM_BUILD_ROOT/lib/modules' echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make modules_install' echo 'cp arch/i386/boot/bzImage $RPM_BUILD_ROOT'"/boot/vmlinuz-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo 'cp System.map $RPM_BUILD_ROOT'"/boot/System.map-$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo "" echo "%clean" echo '#echo -rf $RPM_BUILD_ROOT' echo "" echo "%files" echo '%defattr (-, root, root)' echo "%dir /lib/modules" echo "/lib/modules/$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" echo "/boot/*" echo "" --- NEW FILE --- if [ ! -f .version ] then echo 1 else expr 0`cat .version` + 1 fi Index: Configure =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/Configure,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Configure 14 Jan 2001 19:57:20 -0000 1.1.1.1 +++ Configure 9 Apr 2002 16:38:51 -0000 1.2 @@ -92,6 +92,7 @@ /^#/b /^[^ ]/q + /<file:\\([^>]*\\)>/s//\\1/g p }" Documentation/Configure.help) if [ -z "$text" ] Index: Lindent =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/Lindent,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Lindent 25 Feb 2001 23:15:23 -0000 1.1.1.1 +++ Lindent 9 Apr 2002 16:38:51 -0000 1.2 @@ -1,2 +1,2 @@ -#!/bin/bash -indent -kr -i8 -ts8 -br -ce -bap -sob -l80 -pcs -cs -ss -bs -di1 -nbc -lp -psl $@ +#!/bin/sh +indent -kr -i8 -ts8 -sob -l80 -ss -bs -psl "$@" Index: Menuconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/Menuconfig,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Menuconfig 14 Jan 2001 19:57:39 -0000 1.1.1.1 +++ Menuconfig 9 Apr 2002 16:38:51 -0000 1.2 @@ -347,7 +347,7 @@ echo -e " function $firstchoice () \ - { l_choice '$title' \"$choices\" $current ;}" >>MCradiolists + { l_choice '$title' \"$choices\" \"$current\" ;}" >>MCradiolists } } # END load_functions() @@ -376,6 +376,7 @@ /^#/b /^[^ ]/q s/^ // + /<file:\\([^>]*\\)>/s//\\1/g p }" Documentation/Configure.help) @@ -1334,7 +1335,7 @@ then echo -e "\n\007Your display is too small to run Menuconfig!" echo "It must be at least 19 lines by 80 columns." - exit 0 + exit 1 fi ROWS=$((ROWS-4)) COLS=$((COLS-5)) Index: checkconfig.pl =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/checkconfig.pl,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- checkconfig.pl 25 Feb 2001 23:15:23 -0000 1.1.1.2 +++ checkconfig.pl 9 Apr 2002 16:38:51 -0000 1.2 @@ -25,6 +25,13 @@ $fInComment && (s+^.*?\*/+ +o ? ($fInComment = 0) : next); m+/\*+o && (s+/\*.*?\*/+ +go, (s+/\*.*$+ +o && ($fInComment = 1))); + # Pick up definitions. + if ( m/^\s*#/o ) + { + $iLinuxConfig = $. if m/^\s*#\s*include\s*"linux\/config\.h"/o; + $configList{uc $1} = 1 if m/^\s*#\s*include\s*"config\/(\S*)\.h"/o; + } + # Strip strings. $fInString && (s+^.*?"+ +o ? ($fInString = 0) : next); m+"+o && (s+".*?"+ +go, (s+".*$+ +o && ($fInString = 1))); @@ -52,7 +59,7 @@ # Report superfluous includes. if ( $iLinuxConfig && ! $fUseConfig ) - { print "$file: $iLinuxConfig: <linux/config.h> not needed.\n"; } + { print "$file: $iLinuxConfig: linux/config.h not needed.\n"; } close(FILE); } Index: docgen =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/docgen,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- docgen 14 Jan 2001 19:57:43 -0000 1.1.1.1 +++ docgen 9 Apr 2002 16:38:51 -0000 1.2 @@ -1,3 +1,10 @@ #!/bin/sh -X=`$TOPDIR/scripts/gen-all-syms "$*"` -$TOPDIR/scripts/docproc $X +set -e +if [ -z "$scripts_objtree" ] +then + X=`$TOPDIR/scripts/gen-all-syms "$*"` + $TOPDIR/scripts/docproc $X +else + X=`${scripts_objtree}gen-all-syms "$*"` + TOPDIR=. ${scripts_objtree}docproc $X +fi Index: docproc.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/docproc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- docproc.c 14 Jan 2001 19:57:43 -0000 1.1.1.1 +++ docproc.c 9 Apr 2002 16:38:51 -0000 1.2 @@ -18,6 +18,7 @@ char type[64]; int i; int vp=2; + int ret=0; pid_t pid; @@ -96,8 +97,8 @@ perror("exec scripts/kernel-doc"); exit(1); default: - waitpid(pid, NULL,0); + waitpid(pid, &ret ,0); } } - exit(0); + exit(ret); } Index: header.tk =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/header.tk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- header.tk 14 Jan 2001 19:57:23 -0000 1.1.1.1 +++ header.tk 9 Apr 2002 16:38:51 -0000 1.2 @@ -466,6 +466,7 @@ /^#/b /^\[^ \]/q s/^ // + /<file:\\(\[^>\]*\\)>/s//\\1/g p } " Documentation/Configure.help] Index: kernel-doc =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/kernel-doc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- kernel-doc 14 Jan 2001 19:57:46 -0000 1.1.1.1 +++ kernel-doc 9 Apr 2002 16:38:51 -0000 1.2 @@ -1,16 +1,42 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w + +use strict; ## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## -## Copyright (C) 2000 Tim Waugh <tw...@re...> ## +## Copyright (C) 2000, 1 Tim Waugh <tw...@re...> ## +## Copyright (C) 2001 Simon Huggins ## +## ## +## #define enhancements by Armin Kuster <ak...@mv...> ## [...1633 lines suppressed...] } elsif ($state == 4) { # Documentation block @@ -953,7 +1630,7 @@ $contents = ""; $function = ""; %constants = (); - %parameters = (); + %parameterdescs = (); %parametertypes = (); @parameterlist = (); %sections = (); @@ -973,7 +1650,7 @@ $contents = ""; $function = ""; %constants = (); - %parameters = (); + %parameterdescs = (); %parametertypes = (); @parameterlist = (); %sections = (); Index: mkdep.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/mkdep.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- mkdep.c 14 Jan 2001 19:57:41 -0000 1.1.1.1 +++ mkdep.c 9 Apr 2002 16:38:51 -0000 1.2 @@ -2,7 +2,7 @@ * Originally by Linus Torvalds. * Smart CONFIG_* processing by Werner Almesberger, Michael Chastain. * - * Usage: mkdep file ... + * Usage: mkdep cflags -- file ... * * Read source files and output makefile dependency lines for them. * I make simple dependency lines for #include <*.h> and #include "*.h". @@ -22,10 +22,17 @@ * 2.3.99-pre1, Andrew Morton <an...@uo...> * - Changed so that 'filename.o' depends upon 'filename.[cS]'. This is so that * missing source files are noticed, rather than silently ignored. + * + * 2.4.2-pre3, Keith Owens <ka...@oc...> + * - Accept cflags followed by '--' followed by filenames. mkdep extracts -I + * options from cflags and looks in the specified directories as well as the + * defaults. Only -I is supported, no attempt is made to handle -idirafter, + * -isystem, -I- etc. */ #include <ctype.h> #include <fcntl.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -44,11 +51,10 @@ struct path_struct { int len; - char buffer[256-sizeof(int)]; -} path_array[2] = { - { 0, "" }, - { 0, "" } + char *buffer; }; +struct path_struct *path_array; +int paths; /* Current input file */ @@ -181,9 +187,10 @@ /* * Handle an #include line. */ -void handle_include(int type, const char * name, int len) +void handle_include(int start, const char * name, int len) { - struct path_struct *path = path_array+type; + struct path_struct *path; + int i; if (len == 14 && !memcmp(name, "linux/config.h", len)) return; @@ -191,13 +198,58 @@ if (len >= 7 && !memcmp(name, "config/", 7)) define_config(name+7, len-7-2); - memcpy(path->buffer+path->len, name, len); - path->buffer[path->len+len] = '\0'; - if (access(path->buffer, F_OK) != 0) - return; + for (i = start, path = path_array+start; i < paths; ++i, ++path) { + memcpy(path->buffer+path->len, name, len); + path->buffer[path->len+len] = '\0'; + if (access(path->buffer, F_OK) == 0) { + do_depname(); + printf(" \\\n %s", path->buffer); + return; + } + } - do_depname(); - printf(" \\\n %s", path->buffer); +} + + + +/* + * Add a path to the list of include paths. + */ +void add_path(const char * name) +{ + struct path_struct *path; + char resolved_path[PATH_MAX+1]; + const char *name2; + + if (strcmp(name, ".")) { + name2 = realpath(name, resolved_path); + if (!name2) { + fprintf(stderr, "realpath(%s) failed, %m\n", name); + exit(1); + } + } + else { + name2 = ""; + } + + path_array = realloc(path_array, (++paths)*sizeof(*path_array)); + if (!path_array) { + fprintf(stderr, "cannot expand path_arry\n"); + exit(1); + } + + path = path_array+paths-1; + path->len = strlen(name2); + path->buffer = malloc(path->len+1+256+1); + if (!path->buffer) { + fprintf(stderr, "cannot allocate path buffer\n"); + exit(1); + } + strcpy(path->buffer, name2); + if (path->len && *(path->buffer+path->len-1) != '/') { + *(path->buffer+path->len) = '/'; + *(path->buffer+(++(path->len))) = '\0'; + } } @@ -210,7 +262,7 @@ char *pc; int i; - pc = path_array[0].buffer + path_array[0].len; + pc = path_array[paths-1].buffer + path_array[paths-1].len; memcpy(pc, "config/", 7); pc += 7; @@ -228,7 +280,7 @@ define_config(pc, len); do_depname(); - printf(" \\\n $(wildcard %s.h)", path_array[0].buffer); + printf(" \\\n $(wildcard %s.h)", path_array[paths-1].buffer); } @@ -239,7 +291,7 @@ * Thus, there is one memory access per sizeof(unsigned long) characters. */ -#if defined(__alpha__) || defined(__i386__) || defined(__ia64__) || defined(__MIPSEL__) \ +#if defined(__alpha__) || defined(__i386__) || defined(__ia64__) || defined(__x86_64__) || defined(__MIPSEL__) \ || defined(__arm__) #define LE_MACHINE #endif @@ -387,7 +439,7 @@ GETNEXT CASE('\n', start); NOTCASE('"', pound_include_dquote); - handle_include(1, map_dot, next - map_dot - 1); + handle_include(0, map_dot, next - map_dot - 1); goto start; /* #\s*include\s*<(.*)> */ @@ -395,7 +447,7 @@ GETNEXT CASE('\n', start); NOTCASE('>', pound_include_langle); - handle_include(0, map_dot, next - map_dot - 1); + handle_include(1, map_dot, next - map_dot - 1); goto start; /* #\s*d */ @@ -524,7 +576,7 @@ int main(int argc, char **argv) { int len; - char *hpath; + const char *hpath; hpath = getenv("HPATH"); if (!hpath) { @@ -532,12 +584,26 @@ "Don't bypass the top level Makefile.\n", stderr); return 1; } - len = strlen(hpath); - memcpy(path_array[0].buffer, hpath, len); - if (len && hpath[len-1] != '/') - path_array[0].buffer[len++] = '/'; - path_array[0].buffer[len] = '\0'; - path_array[0].len = len; + + add_path("."); /* for #include "..." */ + + while (++argv, --argc > 0) { + if (strncmp(*argv, "-I", 2) == 0) { + if (*((*argv)+2)) { + add_path((*argv)+2); + } + else { + ++argv; + --argc; + add_path(*argv); + } + } + else if (strcmp(*argv, "--") == 0) { + break; + } + } + + add_path(hpath); /* must be last entry, for config files */ while (--argc > 0) { const char * filename = *++argv; Index: patch-kernel =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/patch-kernel,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- patch-kernel 14 Jan 2001 19:57:21 -0000 1.1.1.1 +++ patch-kernel 9 Apr 2002 16:38:51 -0000 1.2 @@ -1,8 +1,22 @@ #! /bin/sh # Script to apply kernel patches. -# usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] ] ] +# usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ] # The source directory defaults to /usr/src/linux, and the patch # directory defaults to the current directory. +# e.g. +# scripts/patch-kernel . .. +# Update the kernel tree in the current directory using patches in the +# directory above to the latest Linus kernel +# scripts/patch-kernel . .. -ac +# Get the latest Linux kernel and patch it with the latest ac patch +# scripts/patch-kernel . .. 2.4.9 +# Gets standard kernel 2.4.9 +# scripts/patch-kernel . .. 2.4.9 -ac +# Gets 2.4.9 with latest ac patches +# scripts/patch-kernel . .. 2.4.9 -ac11 +# Gets 2.4.9 with ac patch ac11 +# Note: It uses the patches relative to the Linus kernels, not the +# ac to ac relative patches # # It determines the current kernel version from the top-level Makefile. # It then looks for patches for the next sublevel in the patch directory. @@ -21,74 +35,159 @@ # Put the full version number (i.e. 2.3.31) as the last parameter # Dave Gilbert <li...@tr...>, 11th December 1999. +# Fixed previous patch so that if we are already at the correct version +# not to patch up. +# +# Added -ac option, use -ac or -ac9 (say) to stop at a particular version +# Dave Gilbert <li...@tr...>, 29th September 2001. + # Set directories from arguments, or use defaults. sourcedir=${1-/usr/src/linux} patchdir=${2-.} stopvers=${3-imnotaversion} -# set current VERSION, PATCHLEVEL, SUBLEVEL -eval `sed -n 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' $sourcedir/Makefile` +# See if we have any -ac options +for PARM in $* +do + case $PARM in + -ac*) + gotac=$PARM; + + esac; +done + +# --------------------------------------------------------------------------- +# Find a file, first parameter is basename of file +# it tries many compression mechanisms and sets variables to say how to get it +function findFile { + filebase=$1; + + if [ -r ${filebase}.gz ]; then + ext=".gz" + name="gzip" + uncomp="gunzip -dc" + elif [ -r ${filebase}.bz ]; then + ext=".bz" + name="bzip" + uncomp="bunzip -dc" + elif [ -r ${filebase}.bz2 ]; then + ext=".bz2" + name="bzip2" + uncomp="bunzip2 -dc" + elif [ -r ${filebase}.zip ]; then + ext=".zip" + name="zip" + uncomp="unzip -d" + elif [ -r ${filebase}.Z ]; then + ext=".Z" + name="uncompress" + uncomp="uncompress -c" + elif [ -r ${filebase} ]; then + ext="" + name="plaintext" + uncomp="cat" + else + return 1; + fi + + return 0; +} + +# --------------------------------------------------------------------------- +# Apply a patch and check it goes in cleanly +# First param is patch name (e.g. patch-2.4.9-ac5) - without path or extension + +function applyPatch { + echo -n "Applying $1 (${name})... " + if $uncomp ${patchdir}/$1${ext} | patch -p1 -s -N -E -d $sourcedir + then + echo "done." + else + echo "failed. Clean up yourself." + return 1; + fi + if [ "`find $sourcedir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] + then + echo "Aborting. Reject files found." + return 1; + fi + # Remove backup files + find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \; + + return 0; +} + +# set current VERSION, PATCHLEVEL, SUBLEVEL, EXTERVERSION +eval `sed -n -e 's/^\([A-Z]*\) = \([0-9]*\)$/\1=\2/p' -e 's/^\([A-Z]*\) = \(-[-a-z0-9]*\)$/\1=\2/p' $sourcedir/Makefile` if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ] then echo "unable to determine current kernel version" >&2 exit 1 fi -echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL" +echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION}" + +if [ x$EXTRAVERSION != "x" ] +then + echo "I'm sorry but patch-kernel can't work with a kernel source tree that is not a base version" + exit 1; +fi while : do + CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL" + if [ $stopvers = $CURRENTFULLVERSION ] + then + echo "Stoping at $CURRENTFULLVERSION base as requested." + break + fi + SUBLEVEL=`expr $SUBLEVEL + 1` FULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL" patch=patch-$FULLVERSION - if [ -r $patchdir/${patch}.gz ]; then - ext=".gz" - name="gzip" - uncomp="gunzip -dc" - elif [ -r $patchdir/${patch}.bz ]; then - ext=".bz" - name="bzip" - uncomp="bunzip -dc" - elif [ -r $patchdir/${patch}.bz2 ]; then - ext=".bz2" - name="bzip2" - uncomp="bunzip2 -dc" - elif [ -r $patchdir/${patch}.zip ]; then - ext=".zip" - name="zip" - uncomp="unzip -d" - elif [ -r $patchdir/${patch}.Z ]; then - ext=".Z" - name="uncompress" - uncomp="uncompress -c" - elif [ -r $patchdir/${patch} ]; then - ext="" - name="plaintext" - uncomp="cat" - else - break - fi - echo -n "Applying ${patch} (${name})... " - if $uncomp ${patchdir}/${patch}${ext} | patch -p1 -s -N -E -d $sourcedir - then - echo "done." - else - echo "failed. Clean up yourself." - break - fi - if [ "`find $sourcedir/ '(' -name '*.rej' -o -name '.*.rej' ')' -print`" ] - then - echo "Aborting. Reject files found." - break - fi - # Remove backup files - find $sourcedir/ '(' -name '*.orig' -o -name '.*.orig' ')' -exec rm -f {} \; + # See if the file exists and find extension + findFile $patchdir/${patch} || break - if [ $stopvers = $FULLVERSION ] - then - echo "Stoping at $FULLVERSION as requested. Enjoy." - break - fi + # Apply the patch and check all is OK + applyPatch $patch || break done + +if [ x$gotac != x ]; then + # Out great user wants the -ac patches + # They could have done -ac (get latest) or -acxx where xx=version they want + if [ $gotac == "-ac" ] + then + # They want the latest version + HIGHESTPATCH=0 + for PATCHNAMES in $patchdir/patch-${CURRENTFULLVERSION}-ac*\.* + do + ACVALUE=`echo $PATCHNAMES | sed -e 's/^.*patch-[0-9.]*-ac\([0-9]*\).*/\1/'` + # Check it is actually a recognised patch type + findFile $patchdir/patch-${CURRENTFULLVERSION}-ac${ACVALUE} || break + + if [ $ACVALUE -gt $HIGHESTPATCH ] + then + HIGHESTPATCH=$ACVALUE + fi + done + + if [ $HIGHESTPATCH -ne 0 ] + then + findFile $patchdir/patch-${CURRENTFULLVERSION}-ac${HIGHESTPATCH} || break + applyPatch patch-${CURRENTFULLVERSION}-ac${HIGHESTPATCH} + else + echo "No ac patches found" + fi + else + # They want an exact version + findFile $patchdir/patch-${CURRENTFULLVERSION}${gotac} || { + echo "Sorry, I couldn't find the $gotac patch for $CURRENTFULLVERSION. Hohum." + exit 1 + } + applyPatch patch-${CURRENTFULLVERSION}${gotac} + fi +fi + + Index: split-include.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/split-include.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- split-include.c 14 Jan 2001 19:57:42 -0000 1.1.1.1 +++ split-include.c 9 Apr 2002 16:38:51 -0000 1.2 @@ -188,7 +188,7 @@ * So by having an initial \n, strstr will find exact matches. */ - fp_find = popen("find * -type f -print", "r"); + fp_find = popen("find * -type f -name \"*.h\" -print", "r"); if (fp_find == 0) ERROR_EXIT( "find" ); Index: tkgen.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/tkgen.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- tkgen.c 14 Jan 2001 19:57:30 -0000 1.1.1.1 +++ tkgen.c 9 Apr 2002 16:38:51 -0000 1.2 @@ -155,7 +155,7 @@ printf("\"catch {focus $oldFocus}; " ); /* * We are checking which windows should be destroyed and which are - * common parrents with the next one. Remember that menu_num field + * common parents with the next one. Remember that menu_num field * in mainmenu_option record reports number of its *parent* menu. */ if ( menu_num < tot_menu_num Index: ver_linux =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/scripts/ver_linux,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ver_linux 14 Jan 2001 19:57:43 -0000 1.1.1.1 +++ ver_linux 9 Apr 2002 16:38:51 -0000 1.2 @@ -5,30 +5,68 @@ # differ on your system. # PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH -echo '-- Versions installed: (if some fields are empty or look' -echo '-- unusual then possibly you have very old versions)' +echo 'If some fields are empty or look unusual you may have an old version.' +echo 'Compare to the current minimal requirements in Documentation/Changes.' +echo ' ' + uname -a -insmod -V 2>&1 | awk 'NR==1 {print "Kernel modules ",$NF}' +echo ' ' + echo "Gnu C " `gcc --version` + make --version 2>&1 | awk -F, '{print $1}' | awk \ - '/GNU Make/{print "Gnu Make ",$NF}' + '/GNU Make/{print "Gnu make ",$NF}' + ld -v 2>&1 | awk -F\) '{print $1}' | awk \ - '/BFD/{print "Binutils ",$NF}' -ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed -e 's/\.so$//' \ - | awk -F'[.-]' '{print "Linux C Library " $(NF-2)"."$(NF-1)"."$NF}' -echo -n "Dynamic linker " -ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -1 + '/BFD/{print "binutils ",$NF}' + +fdformat --version | awk -F\- '{print "util-linux ", $NF}' + +mount --version | awk -F\- '{print "mount ", $NF}' + +insmod -V 2>&1 | awk 'NR==1 {print "modutils ",$NF}' + +tune2fs 2>&1 | grep "^tune2fs" | sed 's/,//' | awk \ +'NR==1 {print "e2fsprogs ", $2}' + +reiserfsck 2>&1 | grep reiserfsprogs | awk \ +'NR==1{print "reiserfsprogs ", $NF}' + +cardmgr -V 2>&1| grep version | awk \ +'NR==1{print "pcmcia-cs ", $3}' + +pppd --version 2>&1| grep version | awk \ +'NR==1{print "PPP ", $3}' + +isdnctrl 2>&1 | grep version | awk \ +'NR==1{print "isdn4k-utils ", $NF}' + +ls -l `ldd /bin/sh | awk '/libc/{print $3}'` | sed \ +-e 's/\.so$//' | awk -F'[.-]' '{print "Linux C Library " \ +$(NF-2)"."$(NF-1)"."$NF}' + +ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -1 | awk \ +'NR==1{print "Dynamic linker (ldd) ", $NF}' + ls -l /usr/lib/lib{g,stdc}++.so 2>/dev/null | awk -F. \ '{print "Linux C++ Library " $4"."$5"."$6}' + ps --version 2>&1 | awk 'NR==1{print "Procps ", $NF}' -mount --version | awk -F\- '{print "Mount ", $NF}' -hostname -V 2>&1 | awk 'NR==1{print "Net-tools ", $NF}' + +ifconfig --version 2>&1 | grep tools | awk \ +'NR==1{print "Net-tools ", $NF}' + # Kbd needs 'loadkeys -h', loadkeys -h 2>&1 | awk \ '(NR==1 && ($3 !~ /option/)) {print "Kbd ", $3}' + # while console-tools needs 'loadkeys -V'. loadkeys -V 2>&1 | awk \ '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools ", $3}' + expr --v 2>&1 | awk 'NR==1{print "Sh-utils ", $NF}' -X=`cat /proc/modules | sed -e "s/ .*$//"` -echo "Modules Loaded "$X + +if [ -e /proc/modules ]; then + X=`cat /proc/modules | sed -e "s/ .*$//"` + echo "Modules Loaded "$X +fi |
