NetBSD Problem Report #45061

From www@NetBSD.org  Tue Jun 14 14:18:59 2011
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 9FAAB63C563
	for <gnats-bugs@gnats.NetBSD.org>; Tue, 14 Jun 2011 14:18:59 +0000 (UTC)
Message-Id: <20110614141858.AF8A963B970@www.NetBSD.org>
Date: Tue, 14 Jun 2011 14:18:58 +0000 (UTC)
From: tcort@minix3.org
Reply-To: tcort@minix3.org
To: gnats-bugs@NetBSD.org
Subject: pkgtools/bootstrap-mk-files bootstrap.sh not processing ${OPSYS}.bsd.own.mk.in
X-Send-Pr-Version: www-1.0

>Number:         45061
>Category:       pkg
>Synopsis:       pkgtools/bootstrap-mk-files bootstrap.sh not processing ${OPSYS}.bsd.own.mk.in
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 14 14:20:00 +0000 2011
>Closed-Date:    Fri Jun 17 11:01:13 +0000 2011
>Last-Modified:  Fri Jun 17 11:05:02 +0000 2011
>Originator:     Thomas Cort
>Release:        N/A
>Organization:
Minix3
>Environment:
Minix 192.168.122.201 3.2.0 i686
>Description:
OS specific makefiles in files/mods, if they exist, 
get installed instead of the default makefiles in 
files/. In files/bootstrap.sh there is a special case
for handling bsd.own.mk.in. It looks for
mods/${OPSYS}.own.mk.in, but it should really look for
mods/${OPSYS}.bsd.own.mk.in. mods/IRIX.bsd.own.mk.in 
and mods/OpenBSD.bsd.own.mk.in exist, but are never
be processed. There are no files matching
mods/${OPSYS}.own.mk.in.

We discovered this issue when porting pkgsrc to Minix 
because Minix has it's own mods/Minix.bsd.own.mk.in file.

This patch was moved from pkg/45045 so that the PR would
only deal with one problem.
>How-To-Repeat:
On an IRIX or OpenBSD system, or a Minix system with the
minix pkgsrc repository, run the following commands...

cd /usr/pkgsrc/pkgtools/bootstrap-mk-files
bmake replace

If you look at the bsd.own.mk file it will be the default,
not the platform specific makefile.
>Fix:
diff --git a/pkgtools/bootstrap-mk-files/files/bootstrap.sh b/pkgtools/bootstrap-mk-files/files/bootstrap.sh
index 1084f656..b27bacf 100755
--- a/pkgtools/bootstrap-mk-files/files/bootstrap.sh
+++ b/pkgtools/bootstrap-mk-files/files/bootstrap.sh
@@ -25,8 +25,8 @@ done

 subst_pattern='s|@ROOT_GROUP@|'${ROOT_GROUP}'|g;s|@ROOT_USER@|'${ROOT_USER}'|g;s|@SYSCONFDIR@|'${SYSCONFDIR}'|g'

-if [ -f mods/${OPSYS}.own.mk.in ]; then
-	${SED} -e "${subst_pattern}" mods/${OPSYS}.own.mk.in > ${MK_DST}/bsd.own.mk
+if [ -f mods/${OPSYS}.bsd.own.mk.in ]; then
+	${SED} -e "${subst_pattern}" mods/${OPSYS}.bsd.own.mk.in > ${MK_DST}/bsd.own.mk
 else
 	${SED} -e "${subst_pattern}" mods/bsd.own.mk.in > ${MK_DST}/bsd.own.mk
 fi

>Release-Note:

>Audit-Trail:

State-Changed-From-To: open->closed
State-Changed-By: obache@NetBSD.org
State-Changed-When: Fri, 17 Jun 2011 11:01:13 +0000
State-Changed-Why:
Committed.  Thanks!


From: "OBATA Akio" <obache@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45061 CVS commit: pkgsrc/pkgtools/bootstrap-mk-files/files
Date: Fri, 17 Jun 2011 11:00:37 +0000

 Module Name:	pkgsrc
 Committed By:	obache
 Date:		Fri Jun 17 11:00:36 UTC 2011

 Modified Files:
 	pkgsrc/pkgtools/bootstrap-mk-files/files: bootstrap.sh

 Log Message:
 Fixes bsd.own.mk handling in bootstrap.sh script to same as pkg's Makefile.
 PR#45061.


 To generate a diff of this commit:
 cvs rdiff -u -r1.1 -r1.2 \
     pkgsrc/pkgtools/bootstrap-mk-files/files/bootstrap.sh

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

Home	PR Database Search