pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update sysutils/mklivecd to 0.7.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ba91d6c0d8ea
branches: trunk
changeset: 482552:ba91d6c0d8ea
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Fri Oct 29 17:47:30 2004 +0000
description:
Update sysutils/mklivecd to 0.7.
Changes:
* s/DEPENDS/BUILD_DEPENDS/ for grub and cdrecord.
* Don't use "j" flag in tar(1), it is not available on NetBSD 1.6.x,
use "z" flag instead.
* Replace harcoded tar with @TAR@ in the scripts.
* s/.tbz/.tgz/g
Thanks to Raoul Bhoedjang for his comments in private email.
diffstat:
doc/CHANGES | 3 ++-
sysutils/mklivecd/MESSAGE | 8 +++-----
sysutils/mklivecd/Makefile | 17 +++++++++++------
sysutils/mklivecd/files/mfs_rcd | 4 ++--
sysutils/mklivecd/files/mklivecd.sh | 26 +++++++++++++-------------
5 files changed, 31 insertions(+), 27 deletions(-)
diffs (189 lines):
diff -r ea6058a0b6ac -r ba91d6c0d8ea doc/CHANGES
--- a/doc/CHANGES Fri Oct 29 17:39:41 2004 +0000
+++ b/doc/CHANGES Fri Oct 29 17:47:30 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7605 2004/10/29 17:39:41 tv Exp $
+$NetBSD: CHANGES,v 1.7606 2004/10/29 17:47:30 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -4969,3 +4969,4 @@
Updated evolution to 2.0.2nb3 [jmmv 2004-10-29]
Added dpkg-1.10.24 [erh 2004-10-29]
Updated entropy to 0.8.2.418nb2 [tv 2004-10-29]
+ Updated mklivecd to 0.7 [xtraeme 2004-10-29]
diff -r ea6058a0b6ac -r ba91d6c0d8ea sysutils/mklivecd/MESSAGE
--- a/sysutils/mklivecd/MESSAGE Fri Oct 29 17:39:41 2004 +0000
+++ b/sysutils/mklivecd/MESSAGE Fri Oct 29 17:47:30 2004 +0000
@@ -1,10 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/06/20 21:08:13 xtraeme Exp $
+$NetBSD: MESSAGE,v 1.5 2004/10/29 17:47:30 xtraeme Exp $
-In order to use ${PKGNAME}, you'll have to install sysutils/grub.
-
-Don't forget to create the ``menu.lst'' in $ISODIR/boot/grub to specify
-what kernels you want to boot.
+Don't forget to create the ``menu.lst'' file in $ISODIR/boot/grub
+to specify what kernels you want to boot.
Good luck!
diff -r ea6058a0b6ac -r ba91d6c0d8ea sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile Fri Oct 29 17:39:41 2004 +0000
+++ b/sysutils/mklivecd/Makefile Fri Oct 29 17:47:30 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/07/28 20:36:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/29 17:47:30 xtraeme Exp $
-DISTNAME= mklivecd-0.6
+DISTNAME= mklivecd-0.7
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
@@ -8,7 +8,8 @@
MAINTAINER= xtraeme%NetBSD.org@localhost
COMMENT= Build a NetBSD i386 Live CD via command line
-DEPENDS+= {cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
+BUILD_DEPENDS+= {cdrecord,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrecord
+BUILD_DEPENDS+= grub>=0.95:../../sysutils/grub
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -23,16 +24,20 @@
INSTALLATION_DIRS= man/man8 sbin share/mklivecd
-FILES= KERN-LIVECD mfs_rcd personal_config
+FILES= KERN-LIVECD personal_config
do-install:
+.for f in mfs_rcd mklivecd.sh
@${SED} -e "s,@PREFIX@,${PREFIX},g" \
-e "s,@LOCALBASE@,${LOCALBASE},g" \
+ -e "s,@TAR@,${TAR},g" \
-e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \
- ${FILESDIR}/mklivecd.sh > ${WRKDIR}/mklivecd
+ ${FILESDIR}/${f} > ${WRKDIR}/${f}
+.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd
- ${INSTALL_SCRIPT} ${WRKDIR}/mklivecd ${PREFIX}/sbin
+ ${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd
${INSTALL_MAN} ${FILESDIR}/mklivecd.8 ${PREFIX}/man/man8
+ ${INSTALL_DATA} ${WRKDIR}/mfs_rcd ${PREFIX}/share/mklivecd
.for F in ${FILES}
${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd
.endfor
diff -r ea6058a0b6ac -r ba91d6c0d8ea sysutils/mklivecd/files/mfs_rcd
--- a/sysutils/mklivecd/files/mfs_rcd Fri Oct 29 17:39:41 2004 +0000
+++ b/sysutils/mklivecd/files/mfs_rcd Fri Oct 29 17:47:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mfs_rcd,v 1.3 2004/04/27 21:12:43 xtraeme Exp $
+# $NetBSD: mfs_rcd,v 1.4 2004/10/29 17:47:30 xtraeme Exp $
#
# Mount mfs directories and unpack the required file
# before anything.
@@ -29,7 +29,7 @@
for f in mfs_dev mfs_etc mfs_var mfs_root
do
- tar xfjp /stand/$f.tbz -C /
+ @TAR@ xfzp /stand/$f.tgz -C /
done
echo "=> Finished successfully."
}
diff -r ea6058a0b6ac -r ba91d6c0d8ea sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh Fri Oct 29 17:39:41 2004 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh Fri Oct 29 17:47:30 2004 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mklivecd.sh,v 1.14 2004/05/20 02:11:41 uebayasi Exp $
+# $NetBSD: mklivecd.sh,v 1.15 2004/10/29 17:47:30 xtraeme Exp $
#
# Copyright (c) 2004 Juan RP <xtraeme%NetBSD.org@localhost>
# All rights reserved.
@@ -294,7 +294,7 @@
if [ "$verbose_mode" = "on" ]; then
echo "=> Unpacking $S"
fi
- tar xfzp $BASE_SETS_DIR/$S -C $ISODIR
+ @TAR@ xfzp $BASE_SETS_DIR/$S -C $ISODIR
fi
done
@@ -316,7 +316,7 @@
if [ "$verbose_mode" = "on" ]; then
echo "=> Unpacking $X"
fi
- tar xfzp $X11_SETS_DIR/$X -C $ISODIR
+ @TAR@ xfzp $X11_SETS_DIR/$X -C $ISODIR
fi
done
fi
@@ -349,7 +349,7 @@
cat > $ISODIR/etc/rc.d/root <<_EOF_
#!/bin/sh
#
-# \$NetBSD: mklivecd.sh,v 1.14 2004/05/20 02:11:41 uebayasi Exp $
+# \$NetBSD: mklivecd.sh,v 1.15 2004/10/29 17:47:30 xtraeme Exp $
#
# PROVIDE: root
@@ -370,7 +370,7 @@
run_rc_command "\$1"
_EOF_
# Make sure the devices are created before creating
- # the .tbz files.
+ # the .tgz files.
showmsg "Creating devices"
cd $ISODIR/dev && ./MAKEDEV all
@@ -427,9 +427,9 @@
cp -f $SHAREDIR/mfs_rcd $ISODIR/etc/rc.d
SUBST_H="mount_mfs $MNT_HOME_ARGS swap /home"
- SUBST_HT="tar xfjp /stand/mfs_home.tbz -C /"
+ SUBST_HT="@TAR@ xfzp /stand/mfs_home.tgz -C /"
SUBST_S="mount_mfs $MNT_PKG_SYSCONFDIR_ARGS swap /$PKG_SYSCONFDIR"
- SUBST_ST="tar xfjp /stand/mfs_pkg_sysconfdir.tbz -C /"
+ SUBST_ST="@TAR@ xfjp /stand/mfs_pkg_sysconfdir.tgz -C /"
sed -e "s,@MNT_DEV_ARGS@,$MNT_DEV_ARGS,g" \
-e "s,@MNT_ETC_ARGS@,$MNT_ETC_ARGS,g" \
@@ -442,8 +442,8 @@
for U in root var dev etc home
do
if [ -d $ISODIR/$U ]; then
- tar cfjp $ISODIR/stand/mfs_$U.tbz $U >/dev/null 2>&1
- showmsg "Creating /stand/mfs_$U.tbz"
+ @TAR@ cfzp $ISODIR/stand/mfs_$U.tgz $U >/dev/null 2>&1
+ showmsg "Creating /stand/mfs_$U.tgz"
fi
done
@@ -459,9 +459,9 @@
fi
if [ -d $ISODIR/$PKG_SYSCONFDIR ]; then
- tar cfjp $ISODIR/stand/mfs_pkg_sysconfdir.tbz \
+ @TAR@ cfzp $ISODIR/stand/mfs_pkg_sysconfdir.tgz \
$PKG_SYSCONFDIR >/dev/null 2>&1
- showmsg "Creating /stand/mfs_pkg_sysconfdir.tbz"
+ showmsg "Creating /stand/mfs_pkg_sysconfdir.tgz"
sed -e "s,@USRPKGETC@,$SUBST_S," \
-e "s,@USRPKGETCTAR@,$SUBST_ST," \
$ISODIR/etc/rc.d/mfs_rcd > $ISODIR/etc/rc.d/mfs_rcd.f
@@ -538,9 +538,9 @@
showmsg "Done."
;;
iso)
- if [ ! -f $ISODIR/stand/mfs_etc.tbz ]; then
+ if [ ! -f $ISODIR/stand/mfs_etc.tgz ]; then
showmsg "Target iso failed!"
- showmsg "Can't find mfs_etc.tbz file."
+ showmsg "Can't find mfs_etc.tgz file."
bye 1
fi
Home |
Main Index |
Thread Index |
Old Index