[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.15:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.15:
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:46:05 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c614c9450bcc
branches:  trunk
changeset: 527519:c614c9450bcc
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Apr 10 02:23:34 2007 +0000

description:
Update to 0.15:

* Added a new target 'fetch' that will fetch the specified sets from
  the specified URL.
* Fixed permissions on /tmp. (Reported by Zafer Aydogan).
* Renamed BOOTKERN to KERNEL_CONFIG, because it's more appropiate.
* Fix a problem with options accepting a 'yes' argument, now
  the value can be case insensitive.
* Remove the example kernel config, too old and useless.
* Use mktemp(1) to create the temporary file.
* Updated manpage with reality.

diffstat:

 sysutils/mklivecd/Makefile          |   10 +-
 sysutils/mklivecd/PLIST             |    3 +-
 sysutils/mklivecd/files/livecd      |    3 +-
 sysutils/mklivecd/files/mklivecd.8  |   96 +++++++++++-----
 sysutils/mklivecd/files/mklivecd.sh |  200 ++++++++++++++++++++++-------------
 5 files changed, 199 insertions(+), 113 deletions(-)

diffs (truncated from 727 to 300 lines):

diff -r ebfb6e42f75f -r c614c9450bcc sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Tue Apr 10 00:50:24 2007 +0000
+++ b/sysutils/mklivecd/Makefile        Tue Apr 10 02:23:34 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2007/03/10 00:05:46 xtraeme Exp $
+# $NetBSD: Makefile,v 1.37 2007/04/10 02:23:34 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.14.5
+DISTNAME=      mklivecd-0.15
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -28,8 +28,6 @@
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man8 sbin share/mklivecd
 
-FILES=     KERN-LIVECD personal_config
-
 do-install:
 .for f in livecd mklivecd.sh mklivecd.8
        @${SED} -e "s,@PREFIX@,${PREFIX},g" \
@@ -42,8 +40,6 @@
        ${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd
        ${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/${PKGMANDIR}/man8
        ${INSTALL_DATA} ${WRKDIR}/livecd ${PREFIX}/share/mklivecd
-.for F in ${FILES}
-       ${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd
-.endfor
+       ${INSTALL_DATA} ${FILESDIR}/personal_config ${PREFIX}/share/mklivecd
 
 .include "../../mk/bsd.pkg.mk"
diff -r ebfb6e42f75f -r c614c9450bcc sysutils/mklivecd/PLIST
--- a/sysutils/mklivecd/PLIST   Tue Apr 10 00:50:24 2007 +0000
+++ b/sysutils/mklivecd/PLIST   Tue Apr 10 02:23:34 2007 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/11 20:48:55 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/04/10 02:23:34 xtraeme Exp $
 man/man8/mklivecd.8
 sbin/mklivecd
-share/mklivecd/KERN-LIVECD
 share/mklivecd/livecd
 share/mklivecd/personal_config
 @dirrm share/mklivecd
diff -r ebfb6e42f75f -r c614c9450bcc sysutils/mklivecd/files/livecd
--- a/sysutils/mklivecd/files/livecd    Tue Apr 10 00:50:24 2007 +0000
+++ b/sysutils/mklivecd/files/livecd    Tue Apr 10 02:23:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: livecd,v 1.5 2006/10/13 14:58:34 xtraeme Exp $ 
+# $NetBSD: livecd,v 1.6 2007/04/10 02:23:34 xtraeme Exp $ 
 #
 # Mount ramfs directories and unpack the required files
 # before anything.
@@ -28,6 +28,7 @@
        for f in dev etc root tmp var
        do
                /rescue/mkdir /ramfs/$f
+               [ "$f" = "tmp" ] && /rescue/chmod 01777 /ramfs/$f
                /rescue/mount_null /ramfs/$f /$f
                if [ "$f" = "var" ]; then
                        echo "/$f."
diff -r ebfb6e42f75f -r c614c9450bcc sysutils/mklivecd/files/mklivecd.8
--- a/sysutils/mklivecd/files/mklivecd.8        Tue Apr 10 00:50:24 2007 +0000
+++ b/sysutils/mklivecd/files/mklivecd.8        Tue Apr 10 02:23:34 2007 +0000
@@ -1,20 +1,28 @@
-.\" $NetBSD: mklivecd.8,v 1.15 2006/10/14 07:42:25 wiz Exp $
+.\" $NetBSD: mklivecd.8,v 1.16 2007/04/10 02:23:34 xtraeme Exp $
+.\"
+.\" mklivecd - Make your own NetBSD/x86 Live CD-ROM/DVD-ROM
 .\"
-.\" mklivecd - Make your own NetBSD/i386 Live CD-ROM/DVD-ROM
+.\" Copyright (c) 2004-2007 Juan Romero Pardines.
+.\" All rights reserved.
 .\"
-.\" Copyright (c) 2004-2006 Juan Romero Pardines  <xtraeme%NetBSD.org@localhost>
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Juan Romero Pardines.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Neither the name of The NetBSD Foundation nor the names of its
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"        This product includes software developed by the NetBSD
+.\"        Foundation, Inc. and its contributors.
+.\" 4. Neither the name of The NetBSD Foundation nor the names of its
 .\"    contributors may be used to endorse or promote products derived
 .\"    from this software without specific prior written permission.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\"    be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 .\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -28,14 +36,14 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 8, 2006
+.Dd April 10, 2007
 .Dt MKLIVECD 8
 .Os
 .Sh NAME
 .Nm mklivecd
 .Nd Make your own
 .Nx
-/ i386 Live CD-ROM/DVD-ROM
+/ x86 Live CD-ROM/DVD-ROM
 .Sh SYNOPSIS
 .Nm
 .Fl v
@@ -56,11 +64,12 @@
 .Pa the GNU Grub bootloader
 or the
 .Nx
-cdboot bootloader (since
+ISO9660 bootloader (since
 .Nx 4.0 ) .
-By default it will use the first option:
-.Pa the GNU Grub bootloader .
-You may want to change this by changing the option
+By default on i386 will use the first option:
+.Pa the GNU Grub bootloader ,
+and the NetBSD ISO9660 booloader on amd64. You may want to
+change this by changing the option
 .Pa USE_GNU_GRUB
 to
 .Sy no .
@@ -77,7 +86,7 @@
 .Bl -tag -width XkXkernel
 .It Fl k Ar kernel
 Overrides the
-.Ar BOOTKERN
+.Ar KERNEL_CONFIG
 value specified in the configuration file,
 .Ar KERNEL_NAME
 will be modified automatically too.
@@ -105,6 +114,17 @@
 Primary directory used to store the main directories and the final ISO image.
 Defaults to
 .Pa $HOME/livecd .
+.It FETCH_SETS
+If it's set to yes, it will download the sets in the target
+.Pa fetch ,
+from the URL specified in
+.Pa REMOTE_SETS_URL .
+.It REMOTE_SETS_URL
+This is the URL containing the base/x11 sets for the
+.Pa fetch
+target and if
+.Pa FETCH_SETS
+is set to yes.
 .It BASE_SETS_DIR
 The base sets directory.
 Defaults to
@@ -180,10 +200,10 @@
 The X11 sets directory.
 Defaults to
 .Pa $BASE_SETS_DIR .
-.It BOOTKERN
+.It KERNEL_CONFIG
 Name of the
 .Nx
-kernel used for the boot image.
+configuration kernel (e.g. GENERIC) used for the boot image.
 Defaults to
 .Sy KERN-LIVECD .
 .It KERNEL_NAME
@@ -239,7 +259,7 @@
 Defaults to
 .Sy no .
 .It GRUB_FILES_DIR
-Directory where the grub files are stored.
+Directory where the grub files are stored. 
 Defaults to
 .Sy @LOCALBASE@/lib/grub/@MACHINE_ARCH@-/ .
 .It HOSTNAME
@@ -294,7 +314,8 @@
 Used to select the bootloader for the Live CD.
 When it's disabled the
 .Nx
-CDBootloader will be used.
+CD Bootloader will be used. Note that you cannot use GRUB
+on amd64, so the option shouldn't be touched on this arch.
 Defaults to
 .Sy yes .
 .It VND_COMPRESSION
@@ -356,10 +377,18 @@
 change the default configuration, especially paths.
 .It Ar kernel
 Builds the specified kernel
-.Pa $BOOTKERN
+.Pa $KERNEL_CONFIG
 into the
 .Pa $ISODIR
 directory.
+.It Ar fetch
+Downloads the sets defined in
+.Pa $BASE_SETS
+from
+.Pa $REMOTE_SETS_URL
+and if
+.Pa $FETCH_SETS
+is enabled.
 .It Ar base
 Install the
 .Pa $BASE_SETS
@@ -435,7 +464,7 @@
 .Ar APMKERN ,
 both are kernel configuration files, you'll need
 to define the variables named
-.Ar BOOTKERN_${foo}
+.Ar KERNEL_CONFIG_${foo}
 and
 .Ar KERNEL_NAME_${foo}
 for every kernel specified on the
@@ -444,14 +473,14 @@
 The following example shows that:
 .Bd -literal -offset indent
 MULTIPLE_KERNELS="ACPIKERN APMKERN"
-BOOTKERN_ACPIKERN="LIVECD_ACPI"
-BOOTKERN_APMKERN="LIVECD_APM"
+KERNEL_CONFIG_ACPIKERN="LIVECD_ACPI"
+KERNEL_CONFIG_APMKERN="LIVECD_APM"
 KERNEL_NAME_ACPIKERN="KERN_ACPI_LIVECD"
 KERNEL_NAME_APMKERN="KERN_APM_LIVECD"
 .Ed
 .Pp
 Note that when using this option, the
-.Pa BOOTKERN
+.Pa KERNEL_CONFIG
 and
 .Pa KERNEL_NAME
 variables, will don't have any effect.
@@ -470,15 +499,12 @@
 directory will be copied instead of the one located in
 .Pa $ISODIR .
 .Pp
-An example kernel config file,
-.Pa KERN-LIVECD ,
-has been installed into
-.Ar @PREFIX@/share/mklivecd ,
-based on the 2.0 branch.
-You should copy your own kernel config file into
+By default there's no default kernel, so you should copy
+your own kernel (or kernels if MULTIPLE_KERNELS is set) config
+file into
 .Ar $HOME/.mklivecd .
 The
-.Sy BOOTKERN
+.Sy KERNEL_CONFIG
 variable should point at it, if you're not using
 .Sy MULTIPLE_KERNELS .
 The important thing about the kernel is the line:
@@ -496,6 +522,7 @@
 $ mklivecd config
   [edit the config file]
 $ mklivecd kernel
+$ mklivecd fetch [to download the sets if enabled]
 $ mklivecd base
 $ mklivecd chroot
   [edit what you like in there, e.g. config files]
@@ -514,3 +541,12 @@
 .An Juan Romero Pardines Aq xtraeme%NetBSD.org@localhost .
 .Sh BUGS
 It is not perfect but at least it does its task correctly.
+.Sh SUPPORT
+Many Live CDs are built with this software, and sometimes
+.Nm
+is not even mentioned, that's not good. If you use
+this software to build a Live CD, please say so in your
+README file or FAQ.
+If you want more features implemented, please make a
+hardware or monetary donation to continue improving
+NetBSD development.
diff -r ebfb6e42f75f -r c614c9450bcc sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Tue Apr 10 00:50:24 2007 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Tue Apr 10 02:23:34 2007 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.32 2007/03/10 00:01:23 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.33 2007/04/10 02:23:34 xtraeme Exp $
 #
 # Copyright (c) 2004-2007 Juan Romero Pardines.
 # All rights reserved.
@@ -37,13 +37,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 # ======================================================================== #
-#  mklivecd - Make your own NetBSD/i386 Live CD-ROM/DVD-ROM                #
+#  mklivecd - Make your own NetBSD/x86 Live CD-ROM/DVD-ROM                #
 # ======================================================================== #
 
 : ${progname:=$(basename $0)}
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/sendmail grammar fix
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/gconfmm to 2.18.0
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/sendmail grammar fix
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/gconfmm to 2.18.0
Indexes:
Home | Main Index | Thread Index | Old Index