documentation/3230: Misleading comments in distrib/i386 source

From: Christo Butcher <christo(at)fox-it.com>
Date: Wed Apr 23 2003 - 17:23:52 EDT

>Number: 3230
>Category: documentation
>Synopsis: Misleading comments in distrib/i386 source
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: doc-bug
>Submitter-Id: net
>Arrival-Date: Wed Apr 23 21:30:01 GMT 2003
>Closed-Date:
>Last-Modified:
>Originator: Christo Butcher
>Release: OpenBSD STABLE_3_2 as of Wed Apr 23 16:56:05 CEST 2003
>Organization:

Fox-IT Forensic IT Experts
>Environment:

	System      : OpenBSD 3.2
	Architecture: OpenBSD.i386
	Machine     : i386

>Description:

	The OpenBSD distribution build system in /usr/src/distrib/i386
	is a very complex thing. While working on a custom extension I
	notices that about a year ago some changes were made. For
	example, distrib/miniroot/makeconf.awk support was added for
	automatic crunchgen configuration generation. This caused some
	Makefile variables to become obsolete and a few comments were
	no longer accurate. These were however not removed or updated.

	That's what this bug report is about. Just a simple non-
	critical update. Perhaps this will help other developers in
	their struggles to understand the OpenBSD distribution
	building system.

>How-To-Repeat:

	Look in /usr/src/distrib/i386/common/Makefile.inc,
	/usr/src/distrib/i386/ramdiskC/list.local and
	/usr/src/distrib/i386/ramdisk_cd/list.local

>Fix:

	Here are three patches for the files mentioned above.

	The first one removes the Makefile variable
	${CRUNCHCONFS} which is no longer used and uses the
	variable ${CRUNCHCONF} instead of  ${CBIN}.conf in the
	${CRUNCHCONF} target.

	The second and third update the comments in
	ramdiskC/list.local and ramdisk_cd/list.local to
	mention the new makeconf.awk system.

--- distrib/i386/common/Makefile.inc.orig	Wed Apr 23 15:03:47 2003
+++ distrib/i386/common/Makefile.inc	Wed Apr 23 15:04:20 2003
@@ -6,7 +6,6 @@
 IMAGE=		mr.fs
 CBIN?=		instbin
 CRUNCHCONF?=	${CBIN}.conf
-CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
 LISTS?=		${.CURDIR}/../common/list
 UTILS?=		${.CURDIR}/../../miniroot
 
@@ -109,7 +108,7 @@
 	make -f ${CBIN}.mk all
 
 ${CRUNCHCONF}: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
+	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CRUNCHCONF}
 
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
Do you need help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related openbsd.org Links
advocacy
announce
bugs
ipv6
misc
ports
ports-changes
security-announce
smp
source-changes
tech
Request more information about Pantek


--- distrib/i386/ramdiskC/list.local.orig	Wed Apr 23 15:13:59 2003
+++ distrib/i386/ramdiskC/list.local	Wed Apr 23 15:10:28 2003

@@ -1,5 +1,8 @@
 # $OpenBSD: list.local,v 1.2 2002/04/30 03:23:57 deraadt Exp $  

-# add local links; use instbin since instbin has already been unlinked
+# add local links; if the first word is LINK or SYMLINK and
+# the second word is instbin, then the linked programs will
+# automatically be added to the crunchgen configuration by
+# the awk script distrib/common/miniroot/makeconf.awk
 LINK	instbin					sbin/wicontrol
 LINK	instbin					sbin/ancontrol


--- distrib/i386/ramdisk_cd/list.local.orig	Wed Apr 23 15:14:56 2003
+++ distrib/i386/ramdisk_cd/list.local	Wed Apr 23 15:10:38 2003

@@ -1,5 +1,8 @@
 # $OpenBSD: list.local,v 1.2 2002/04/30 03:23:57 deraadt Exp $  

-# add local links; use bin/sh since instbin has already been unlinked
+# add local links; if the first word is LINK or SYMLINK and
+# the second word is instbin, then the linked programs will
+# automatically be added to the crunchgen configuration by
+# the awk script distrib/common/miniroot/makeconf.awk
 LINK	instbin					sbin/wicontrol
 LINK	instbin					sbin/ancontrol

>Release-Note:
Received on Wed Apr 23 17:38:36 2003