From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Thu, 13 Dec 2001 12:18:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Thu, 13 Dec 2001 12:18:46 -0500 Received: from adsl-64-109-202-217.dsl.milwwi.ameritech.net ([64.109.202.217]:60660 "EHLO alphaflight.d6.dnsalias.org") by vger.kernel.org with ESMTP id ; Thu, 13 Dec 2001 12:18:37 -0500 Date: Thu, 13 Dec 2001 11:18:35 -0600 From: "M. R. Brown" To: Keith Owens Cc: linux-kernel@vger.kernel.org, marcelo@conectiva.com.br Subject: Re: Any arch specific changes to scripts directory? Message-ID: <20011213171835.GA19987@0xd6.org> In-Reply-To: <20011213055943.GB7669@0xd6.org> <24711.1008223525@kao2.melbourne.sgi.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="aM3YZ0Iwxop3KEKx" Content-Disposition: inline In-Reply-To: <24711.1008223525@kao2.melbourne.sgi.com> User-Agent: Mutt/1.3.24i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org --aM3YZ0Iwxop3KEKx Content-Type: multipart/mixed; boundary="FL5UXtIhxfXey3p5" Content-Disposition: inline --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Keith Owens on Thu, Dec 13, 2001: > On Wed, 12 Dec 2001 23:59:43 -0600,=20 > "M. R. Brown" wrote: > >On an somewhat-related subject, here are a couple of utility scripts that > >make it easier to use drop-in trees with various stock kernels. These a= re > >used by linux-mips, linuxconsole (Ruby), and linuxsh developers, so it's > >assumed they'd be useful to anyone else who needs to build those kernels. >=20 > This facility and more is built into kbuild 2.5, which is going into > 2.5 soon. I don't see the point in adding this to 2.4 now, especially > since kbuild 2.5 can also run on 2.4 kernels. >=20 True, but IMO the majority of people aren't using kbuild with 2.4 yet. Plus the fact that kbuild isn't included in 2.4 - I'm thinking of the newbie/more-than-casual user who just wants to a) grab vanilla, b) run the provided treelink scripts to drop in their second kernel. Patching the kernel with kbuild 2.5 would be a bit too intrusive for this. Marcelo, can these scripts go into 2.4? M. R. --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="treescripts.diff" --- /usr/src/linux/scripts/treelink.sh Wed Dec 12 23:50:08 2001 +++ linux-2.4-branch/scripts/treelink.sh Tue Oct 16 16:25:24 2001 @@ -0,0 +1,45 @@ +#!/bin/sh +# +# treelink.sh - Tree Linking Script +# +# Copyright (C) 2001 Paul Mundt +# +# Modified by M. R. Brown +# +# A simple shell script for linking a drop in tree into a stock +# kernel tree. Usable for drop in trees such as the linux-mips +# and linuxconsole trees. +# +# Released under the terms of the GNU GPL v2 +# +[ "$#" -ne "2" ] && echo "Usage: $0 " && exit 1 + +ODIR=${PWD} +cd $1 || exit 1 +LDIR=${PWD} +echo -n "Building file list ... " +LIST=`find * \( -type d -name CVS -prune \) -o -type f -print` +echo -e "done." +cd ${ODIR} + +cd $2 || exit 1 + +# Make this a seperate step so that the user can cancel the operation +echo -n "Saving originals ..... " +for file in $LIST; do + if [ -e $file -a ! -h $file ]; then + DIR=`dirname $file` + ofile=`basename $file` + [ ! -d ${DIR}/.orig ] && mkdir -p ${DIR}/.orig + cp $file ${DIR}/.orig/$ofile + fi +done +echo -e "done." + +echo -n "Linking files ........ " +for file in $LIST; do + DIR=`dirname $file` + [ ! -d $DIR ] && mkdir -p $DIR + ln -sf $LDIR/$file $file +done +echo -e "done." --- /usr/src/linux/scripts/treeunlink.sh Wed Dec 12 23:50:10 2001 +++ linux-2.4-branch/scripts/treeunlink.sh Tue Oct 16 16:25:24 2001 @@ -0,0 +1,31 @@ +#!/bin/sh +# +# treeunlink.sh - Tree Unlinking Script +# +# Copyright (c) 2001 M. R. Brown +# +# This script attempts to restore a previously tree-linked tree. +# It's the anti-thesis of (and based on) treelink.sh by Paul Mundt. +# +# Released under the terms of the GNU GPL v2 + +[ "$#" -ne "1" ] && echo "Usage: $0 " && exit 1 + +cd $1 || exit 1 +echo -n "Building file list ... " +LIST=`find * \( -type d -name CVS -prune \) -o -type l -print` +echo -e "done." + +[ -z "$LIST" ] && echo "No linked files to unlink." && exit 1 + +echo -n "Restoring originals .. " +for file in $LIST; do + DIR=`dirname $file` + ofile=`basename $file` + rm -f $file + if [ -d ${DIR}/.orig -a -e ${DIR}/.orig/$ofile ]; then + mv ${DIR}/.orig/$ofile $file + [ -z "`ls ${DIR}/.orig`" ] && rmdir ${DIR}/.orig + fi +done +echo -e "done." --FL5UXtIhxfXey3p5-- --aM3YZ0Iwxop3KEKx Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) iD8DBQE8GOLraK6pP/GNw0URAqnMAJ4rhzqJ0MgT1LftaOzy3BYHCrSTJwCg0R3x af2YB5S7n024K+8JFmmwv2U= =+ieO -----END PGP SIGNATURE----- --aM3YZ0Iwxop3KEKx--