From owner-freebsd-hackers Fri Jan 29 09:28:46 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id JAA12906 for freebsd-hackers-outgoing; Fri, 29 Jan 1999 09:28:46 -0800 (PST) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from relay.ucb.crimea.ua (relay.ucb.crimea.ua [212.110.138.1]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id JAA12726; Fri, 29 Jan 1999 09:27:11 -0800 (PST) (envelope-from ru@ucb.crimea.ua) Received: (from ru@localhost) by relay.ucb.crimea.ua (8.9.2/8.9.2/UCB) id TAA28147; Fri, 29 Jan 1999 19:25:48 +0200 (EET) Date: Fri, 29 Jan 1999 19:25:48 +0200 From: Ruslan Ermilov To: "Jordan K. Hubbard" Cc: FreeBSD Hackers Subject: Patches for 2.2-3.0 upgrade process [Was: ALERT: New Jordan's a.out->ELF upgrade is broken!!!] Message-ID: <19990129192548.A23285@ucb.crimea.ua> Mail-Followup-To: "Jordan K. Hubbard" , FreeBSD Hackers References: <19990127200951.A19404@ucb.crimea.ua> <80570.917461685@zippy.cdrom.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=7JfCtLOvnd9MIVvH X-Mailer: Mutt 0.94.17i In-Reply-To: <80570.917461685@zippy.cdrom.com>; from Jordan K. Hubbard on Wed, Jan 27, 1999 at 10:28:05AM -0800 X-Operating-System: FreeBSD 2.2.8-STABLE i386 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii On Wed, Jan 27, 1999 at 10:28:05AM -0800, Jordan K. Hubbard wrote: > > There is still more work which needs to be done on the ordering and > TOC for what's installed. Your own changes were overly simplistic and > had other problems of their own. I'll be further refining this over > the next couple of days - I just took "kickme" to 4.0 with it and only > one failure (to reboot, which was comparatively minor). This is > and harder problem to solve than you seem to give it credit for, > and I'd also appreciate it if you'd start sending me diffs rather > than commentaries. Don't tell me what you THINK it does or should > do, show me changes which have been empirically proven to do it > better. > > - Jordan OK, here is the first problem and a patch for it. Several people have already reported it. Suppose, you have an *EMPTY* /usr/local/lib. (This is the usual thing, if you have installed at least one port, and you have no ports with libraries in /usr/local/lib). During the second phase of upgrade process (aout-to-elf-install), the `move_aout_libs.sh' script won't create /usr/local/lib/aout for it, because this directory has no aout libraries at all, and then Makefile.upgrade will fail on line 155 (rev 1.9.2.6), that `ldconfig could not find /usr/local/lib/aout'. Patch is attached (in two variants). Best regards, -- Ruslan Ermilov Sysadmin and DBA of the ru@ucb.crimea.ua United Commercial Bank +380.652.247.647 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="move_aout_libs.sh.patch" Index: move_aout_libs.sh =================================================================== RCS file: /usr/FreeBSD-CVS/src/tools/tools/upgrade/move_aout_libs.sh,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 move_aout_libs.sh --- move_aout_libs.sh 1999/01/26 09:15:53 1.2.2.1 +++ move_aout_libs.sh 1999/01/29 16:55:23 @@ -111,8 +111,9 @@ do # Make sure the directory exists, or ldconfig will choke later. if test ! -d $dir; then - mkdir -p $dir $dir/aout + mkdir -p $dir fi + mkdir -p $dir/aout echo "Searching library directory $dir for a.out libraries..." # Get a list of archive libraries. --7JfCtLOvnd9MIVvH Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="move_aout_libs.sh.patch2" Index: move_aout_libs.sh =================================================================== RCS file: /usr/FreeBSD-CVS/src/tools/tools/upgrade/move_aout_libs.sh,v retrieving revision 1.2.2.1 diff -u -r1.2.2.1 move_aout_libs.sh --- move_aout_libs.sh 1999/01/26 09:15:53 1.2.2.1 +++ move_aout_libs.sh 1999/01/29 17:23:25 @@ -110,9 +110,8 @@ for dir in $libdirs do # Make sure the directory exists, or ldconfig will choke later. - if test ! -d $dir; then - mkdir -p $dir $dir/aout - fi + mkdir -p $dir $dir/aout + echo "Searching library directory $dir for a.out libraries..." # Get a list of archive libraries. --7JfCtLOvnd9MIVvH-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message