NetBSD Problem Report #30099

From brook@biology.nmsu.edu  Sat Apr 30 16:41:14 2005
Return-Path: <brook@biology.nmsu.edu>
Received: from trillium.aquilegia.com (salix.NMSU.Edu [128.123.95.217])
	by narn.netbsd.org (Postfix) with ESMTP id C106363B116
	for <gnats-bugs@gnats.netbsd.org>; Sat, 30 Apr 2005 16:41:09 +0000 (UTC)
Message-Id: <200504301640.j3UGesP02111@trillium.aquilegia.com>
Date: Sat, 30 Apr 2005 10:40:54 -0600 (MDT)
From: brook@biology.nmsu.edu
Reply-To: brook@biology.nmsu.edu
To: gnats-bugs@netbsd.org
Subject: Allow multiple makefile fragments to be appended to /etc/mk.conf.
X-Send-Pr-Version: 3.95

>Number:         30099
>Category:       pkg
>Synopsis:       Allow pkgtoosl/pkg_comp to append multiple makefile fragments to the chroot /etc/mk.conf.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    jmmv
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Apr 30 16:42:00 +0000 2005
>Closed-Date:    Mon Jun 06 18:50:49 +0000 2005
>Last-Modified:  Mon Jun 06 18:51:01 +0000 2005
>Originator:     brook@biology.nmsu.edu
>Release:        NetBSD 1.6.1
>Organization:
Brook G. Milligan                      Internet:  brook@nmsu.edu
Department of Biology
New Mexico State University            Telephone:  (505) 646-7980
Las Cruces, New Mexico  88003  U.S.A.  FAX:        (505) 646-5665
>Environment:


System: NetBSD viola.nmsu.edu 1.6.1 NetBSD 1.6.1 (VIOLA) #0: Thu Dec 2 22:13:05 MST 2004 root@viola.nmsu.edu:/usr/src-1.6.1/sys/arch/i386/compile/VIOLA i386
Architecture: i386
Machine: i386
>Description:
	The current version of pkgtools/pkg_comp includes a
configuration variable, EXTRAMK, that allows a single makefile
fragment to be appended to /etc/mk.conf during the construction of a
chroot environment.  It may be desirable to divide the information
required for /etc/mk.conf into more than a single file.  The attached
patch allows EXTRAMK to contain a space-separated list of files, each
of which will be appended to /etc/mk.conf.  Note that this has no
effect on the original behavior in which an empty variable did nothing
and a single file name appended the single file.
>How-To-Repeat:
	Try to use pkgtools/pkg_comp to install multiple makefile
fragments into the chroot /etc/mk.conf.
>Fix:
	Apply the following patch in the pkgtools/pkg_comp directory.

--- files/pkg_comp.8.orig	Thu Jul 15 08:18:32 2004
+++ files/pkg_comp.8	Sat Apr 30 10:31:46 2005
@@ -198,7 +198,7 @@
 Defaults to
 .Pa /var/pub/NetBSD .
 .It EXTRAMK
-Specifies a file that must be appended to
+Specifies a space-separated list of files that must be appended to
 .Pa $DESTDIR/etc/mk.conf .
 This is useful to add special items to this configuration file.
 Defaults to nothing.
--- files/pkg_comp.sh.orig	Thu Jul 15 08:18:32 2004
+++ files/pkg_comp.sh	Sat Apr 30 10:31:13 2005
@@ -555,11 +555,13 @@
     done

     if [ -n "$EXTRAMK" ]; then
-        if [ ! -f "$EXTRAMK" ]; then
-            err "Cannot find $EXTRAMK"
-        else
-            cat $EXTRAMK >> $file
-        fi
+        for mkfile in $EXTRAMK; do
+	    if [ ! -f "$mkfile" ]; then
+		err "Cannot find $mkfile"
+	    else
+		cat $mkfile >> $file
+	    fi
+        done
     fi

     if [ "$USE_AUDIT_PACKAGES" != "yes" ]; then

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->jmmv
Responsible-Changed-By: wiz@netbsd.org
Responsible-Changed-When: Sat, 30 Apr 2005 16:45:37 +0000
Responsible-Changed-Why:
Over to maintainer.


State-Changed-From-To: open->closed
State-Changed-By: jmmv@netbsd.org
State-Changed-When: Mon, 06 Jun 2005 18:50:49 +0000
State-Changed-Why:
Feature implemented; thanks.


From: "Julio M. Merino Vidal" <jmmv@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: PR/30099 CVS commit: pkgsrc/pkgtools/pkg_comp
Date: Mon,  6 Jun 2005 18:50:07 +0000 (UTC)

 Module Name:	pkgsrc
 Committed By:	jmmv
 Date:		Mon Jun  6 18:50:07 UTC 2005

 Modified Files:
 	pkgsrc/pkgtools/pkg_comp: Makefile
 	pkgsrc/pkgtools/pkg_comp/files: pkg_comp.8 pkg_comp.sh

 Log Message:
 Update to 1.21:
 - Make the EXTRA_MK variable be a list of files rather a single one.
   From brook at biology.nmsu.edu in PR pkg/30099.
 - Directly recognize pkg_* commands to be executed within the sandbox
   (i.e., no need to use the chroot keyword).
   From Robert Elz in PR pkg/29749.
 - Fix a typo in the manual page.


 To generate a diff of this commit:
 cvs rdiff -r1.28 -r1.29 pkgsrc/pkgtools/pkg_comp/Makefile
 cvs rdiff -r1.24 -r1.25 pkgsrc/pkgtools/pkg_comp/files/pkg_comp.8
 cvs rdiff -r1.22 -r1.23 pkgsrc/pkgtools/pkg_comp/files/pkg_comp.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