From owner-svn-soc-all@FreeBSD.ORG Tue Feb 24 22:02:40 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CDCCD222 for ; Tue, 24 Feb 2015 22:02:40 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B73C8F49 for ; Tue, 24 Feb 2015 22:02:40 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1OM2eTa098026 for ; Tue, 24 Feb 2015 22:02:40 GMT (envelope-from kczekirda@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t1OM2dk1098003 for svn-soc-all@FreeBSD.org; Tue, 24 Feb 2015 22:02:39 GMT (envelope-from kczekirda@FreeBSD.org) Date: Tue, 24 Feb 2015 22:02:39 GMT Message-Id: <201502242202.t1OM2dk1098003@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to kczekirda@FreeBSD.org using -f From: kczekirda@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r278252 - in soc2014/kczekirda/pxe-fai-head: head tools/mfsbsd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Feb 2015 22:02:41 -0000 Author: kczekirda Date: Tue Feb 24 22:02:38 2015 New Revision: 278252 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=278252 Log: merge mfsBSD Added: soc2014/kczekirda/pxe-fai-head/head/collect_authors_patches.sh (contents, props changed) Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile Added: soc2014/kczekirda/pxe-fai-head/head/collect_authors_patches.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ soc2014/kczekirda/pxe-fai-head/head/collect_authors_patches.sh Tue Feb 24 22:02:38 2015 (r278252) @@ -0,0 +1,64 @@ +#!/bin/bash + +# Copyright 2014 by Lasse Schuirmann +# License: GPL 3 + +if [ ! $# == 2 ]; then + echo "Usage: $0 author_name output_root_directory" + echo + echo "This is a simple helper script that allows collecting all patches from" + echo "one author in a git repository. It will detect consequent ranges of" + echo "patches and ask for each range for a subdirectory so you can distinguish" + echo "the patch series'." + + exit 1 +fi + +author=$1 +output=$2 +end="" +begin="" +patchcount=1 +rangecount=1 + +for O in $(git log --pretty=format:"%h" --author="$author"); do + if ! git log --pretty=format:"%h" --author="$author" $O^^..$O^ --exit-code 1>/dev/null ; then + if [[ "$end" == "" ]]; then + end=$O + fi + begin=$O + ((rangecount++)) + else + echo + echo + if [[ "$end" == "" ]]; then + tmp=$(($patchcount - 1)) + echo "Adding one patch to $tmp existing:" + git log $O^..$O + echo "Please enter a subdirectory name for this patch (leave this empty to leave this patch out, use ./ for the root directory):" + read subdir + if [[ "$subdir" != "" ]]; then + mkdir -p $output/$subdir + git format-patch $O^..$O -o$output/$subdir #--start-number=$patchcount + ((patchcount++)) + else + echo "Omitting patch..." + fi + else + tmp=$(($patchcount - 1)) + echo "Adding $rangecount patches to $tmp existing." + git log $begin^^..$end --oneline + echo "Please enter a subdirectory name for these patches (leave this empty to leave this patch out, use ./ for the root directory):" + read subdir + if [[ "$subdir" != "" ]]; then + mkdir -p $output/$subdir + git format-patch $begin^^..$end -o$output/$subdir #--start-number=$patchcount + patchcount=$(($patchcount + $rangecount)) + else + echo "Omitting patch series..." + fi + end="" + rangecount=1 + fi + fi + done Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD Sun Feb 22 21:54:55 2015 (r278251) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/BUILD Tue Feb 24 22:02:38 2015 (r278252) @@ -15,7 +15,7 @@ If you want any packages installed, copy the .tbz files that should be automatically installed into the packages/ directory. - Add any additional files into the files/ directory. These will be copied + Add any additional files into the customfiles/ directory. These will be copied recursively into the root of the boot image. WARNING: Your image should not exceed 45MB in total, otherwise kernel panic Modified: soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile ============================================================================== --- soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile Sun Feb 22 21:54:55 2015 (r278251) +++ soc2014/kczekirda/pxe-fai-head/tools/mfsbsd/Makefile Tue Feb 24 22:02:38 2015 (r278252) @@ -27,14 +27,12 @@ # For all of this use # -DCUSTOM -DBUILDWORLD -DBUILDKERNEL or CUSTOM=1 BUILDKERNEL=1 BUILDWORLD=1 # -# To use pkgng, specify -# -DPKGNG or PKGNG=1 # # Paths # SRC_DIR?=/usr/src -CFGDIR=conf +CFGDIR?=conf SCRIPTSDIR=scripts PACKAGESDIR?=packages CUSTOMFILESDIR=customfiles @@ -80,9 +78,16 @@ DOFS=${TOOLSDIR}/doFS.sh SCRIPTS=mdinit mfsbsd interfaces packages BOOTMODULES=acpi ahci -MFSMODULES=geom_mirror geom_nop opensolaris zfs ext2fs snp smbus ipmi ntfs nullfs tmpfs +MFSMODULES=geom_mirror geom_nop opensolaris zfs ext2fs snp smbus ipmi ntfs nullfs tmpfs \ + crypto cryptodev geom_eli # +.if defined(V) +_v= +.else +_v=@ +.endif + .if !defined(ARCH) TARGET!= ${SYSCTL} -n hw.machine_arch .else @@ -138,7 +143,6 @@ _BOOTDIR= ${_ROOTDIR}/boot .if defined(ROOTHACK) _DESTDIR= ${_ROOTDIR}/rw -WITHOUT_RESCUE=1 MFSROOT_FREE_INODES?=1% MFSROOT_FREE_BLOCKS?=1% .else @@ -154,10 +158,6 @@ WITHOUT_GAMES=1 \ WITHOUT_LIB32=1 -. if defined(WITHOUT_RESCUE) -BUILDENV+= WITHOUT_RESCUE=1 -. endif - # Environment for custom install INSTALLENV?= ${BUILDENV} \ WITHOUT_TOOLCHAIN=1 @@ -165,22 +165,22 @@ .if defined(FULLDIST) NO_PRUNE=1 -NO_RESCUE_LINKS=1 +WITH_RESCUE=1 .endif all: image destdir: ${_DESTDIR} ${_BOOTDIR} ${_DESTDIR}: - @${MKDIR} ${_DESTDIR} && ${CHOWN} root:wheel ${_DESTDIR} + ${_v}${MKDIR} ${_DESTDIR} && ${CHOWN} root:wheel ${_DESTDIR} ${_BOOTDIR}: - @${MKDIR} ${_BOOTDIR}/kernel ${_BOOTDIR}/modules && ${CHOWN} -R root:wheel ${_BOOTDIR} + ${_v}${MKDIR} ${_BOOTDIR}/kernel ${_BOOTDIR}/modules && ${CHOWN} -R root:wheel ${_BOOTDIR} extract: destdir ${WRKDIR}/.extract_done ${WRKDIR}/.extract_done: .if !defined(CUSTOM) - @if [ ! -d "${BASE}" ]; then \ + ${_v}if [ ! -d "${BASE}" ]; then \ echo "Please set the environment variable BASE to a path"; \ echo "with FreeBSD distribution files (e.g. /cdrom/9.2-RELEASE)"; \ echo "Examples:"; \ @@ -189,7 +189,7 @@ exit 1; \ fi .if !defined(FREEBSD9) - @for DIR in base kernels; do \ + ${_v}for DIR in base kernels; do \ if [ ! -d "${BASE}/$$DIR" ]; then \ echo "Cannot find directory \"${BASE}/$$DIR\""; \ exit 1; \ @@ -197,38 +197,38 @@ done .endif @echo -n "Extracting base and kernel ..." - @${CAT} ${BASEFILE} | ${TAR} --unlink -xpzf - -C ${_DESTDIR} + ${_v}${CAT} ${BASEFILE} | ${TAR} --unlink -xpzf - -C ${_DESTDIR} .if !defined(FREEBSD9) - @${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_BOOTDIR} - @${MV} ${_BOOTDIR}/${KERNCONF}/* ${_BOOTDIR}/kernel - @${RMDIR} ${_BOOTDIR}/${KERNCONF} + ${_v}${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_BOOTDIR} + ${_v}${MV} ${_BOOTDIR}/${KERNCONF}/* ${_BOOTDIR}/kernel + ${_v}${RMDIR} ${_BOOTDIR}/${KERNCONF} .else - @${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_ROOTDIR} + ${_v}${CAT} ${KERNELFILE} | ${TAR} --unlink -xpzf - -C ${_ROOTDIR} .endif @echo " done" .endif - @${TOUCH} ${WRKDIR}/.extract_done + ${_v}${TOUCH} ${WRKDIR}/.extract_done build: extract ${WRKDIR}/.build_done ${WRKDIR}/.build_done: .if defined(CUSTOM) . if defined(BUILDWORLD) @echo -n "Building world ..." - @cd ${SRC_DIR} && \ + ${_v}cd ${SRC_DIR} && \ ${BUILDENV} make ${_MAKEJOBS} buildworld TARGET=${TARGET} . endif . if defined(BUILDKERNEL) @echo -n "Building kernel KERNCONF=${KERNCONF} ..." - @cd ${SRC_DIR} && make buildkernel KERNCONF=${KERNCONF} TARGET=${TARGET} + ${_v}cd ${SRC_DIR} && make buildkernel KERNCONF=${KERNCONF} TARGET=${TARGET} . endif .endif - @${TOUCH} ${WRKDIR}/.build_done + ${_v}${TOUCH} ${WRKDIR}/.build_done install: destdir build ${WRKDIR}/.install_done ${WRKDIR}/.install_done: .if defined(CUSTOM) @echo -n "Installing world and kernel KERNCONF=${KERNCONF} ..." - @cd ${SRC_DIR} && \ + ${_v}cd ${SRC_DIR} && \ ${INSTALLENV} make installworld distribution DESTDIR="${_DESTDIR}" TARGET=${TARGET} && \ ${INSTALLENV} make installkernel KERNCONF=${KERNCONF} DESTDIR="${_ROOTDIR}" TARGET=${TARGET} .endif @@ -238,25 +238,25 @@ . else @echo -n "Creating base.txz and kernel.txz ..." . endif - @${MKDIR} ${_DISTDIR} + ${_v}${MKDIR} ${_DISTDIR} . if defined(ROOTHACK) - @${CP} -rp ${_BOOTDIR}/kernel ${_DESTDIR}/boot + ${_v}${CP} -rp ${_BOOTDIR}/kernel ${_DESTDIR}/boot . endif . if !defined(CUSTOM) && exists(${BASE}/base.txz) && exists(${BASE}/kernel.txz) - @${CP} ${BASE}/base.txz ${_DISTDIR}/base.txz - @${CP} ${BASE}/kernel.txz ${_DISTDIR}/kernel.txz + ${_v}${CP} ${BASE}/base.txz ${_DISTDIR}/base.txz + ${_v}${CP} ${BASE}/kernel.txz ${_DISTDIR}/kernel.txz . else - @${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} --exclude "boot/kernel/*" -f ${_DISTDIR}/base.txz . - @${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} -f ${_DISTDIR}/kernel.txz boot/kernel + ${_v}${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} --exclude "boot/kernel/*" -f ${_DISTDIR}/base.txz . + ${_v}${TAR} -c -C ${_DESTDIR} -J ${EXCLUDE} -f ${_DISTDIR}/kernel.txz boot/kernel . endif @echo " done" . if defined(ROOTHACK) - @${RM} -rf ${_DESTDIR}/boot/kernel + ${_v}${RM} -rf ${_DESTDIR}/boot/kernel . endif .endif - @${CHFLAGS} -R noschg ${_DESTDIR} > /dev/null 2> /dev/null || exit 0 -.if !defined(WITHOUT_RESCUE) || defined(NO_RESCUE_LINKS) - @cd ${_DESTDIR} && \ + ${_v}${CHFLAGS} -R noschg ${_DESTDIR} > /dev/null 2> /dev/null || exit 0 +.if !defined(WITHOUT_RESCUE) && defined(RESCUE_LINKS) + ${_v}cd ${_DESTDIR} && \ for FILE in `${FIND} rescue -type f`; do \ FILE=$${FILE##rescue/}; \ if [ -f bin/$$FILE ]; then \ @@ -275,64 +275,55 @@ done .endif .if defined(WITHOUT_RESCUE) - @cd ${_DESTDIR} && ${RM} -rf rescue + ${_v}cd ${_DESTDIR} && ${RM} -rf rescue .endif - @${TOUCH} ${WRKDIR}/.install_done + ${_v}${TOUCH} ${WRKDIR}/.install_done prune: install ${WRKDIR}/.prune_done ${WRKDIR}/.prune_done: .if !defined(NO_PRUNE) @echo -n "Removing selected files from distribution ..." - @if [ -f "${PRUNELIST}" ]; then \ + ${_v}if [ -f "${PRUNELIST}" ]; then \ for FILE in `cat ${PRUNELIST}`; do \ if [ -n "$${FILE}" ]; then \ ${RM} -rf ${_DESTDIR}/$${FILE}; \ fi; \ done; \ fi - @${TOUCH} ${WRKDIR}/.prune_done + ${_v}${TOUCH} ${WRKDIR}/.prune_done @echo " done" .endif packages: install prune ${WRKDIR}/.packages_done ${WRKDIR}/.packages_done: -.if defined(PKGNG) @echo -n "Installing pkgng ..." . if !exists(${PKG_STATIC}) @echo "pkg-static not found at: ${PKG_STATIC}" - @exit 1 + ${_v}exit 1 . endif - @mkdir -p ${_DESTDIR}/usr/local/sbin - @${INSTALL} -o root -g wheel -m 0755 ${PKG_STATIC} ${_DESTDIR}/usr/local/sbin/ - @${LN} -sf pkg-static ${_DESTDIR}/usr/local/sbin/pkg + ${_v}mkdir -p ${_DESTDIR}/usr/local/sbin + ${_v}${INSTALL} -o root -g wheel -m 0755 ${PKG_STATIC} ${_DESTDIR}/usr/local/sbin/ + ${_v}${LN} -sf pkg-static ${_DESTDIR}/usr/local/sbin/pkg @echo " done" -.endif - @if [ -d "${PACKAGESDIR}" ]; then \ + ${_v}if [ -d "${PACKAGESDIR}" ]; then \ echo -n "Copying user packages ..."; \ ${CP} -rf ${PACKAGESDIR} ${_DESTDIR}; \ echo " done"; \ fi - @if [ -d "${_DESTDIR}/packages" ]; then \ + ${_v}if [ -d "${_DESTDIR}/packages" ]; then \ echo -n "Installing user packages ..."; \ fi -.if defined(PKGNG) - @if [ -d "${_DESTDIR}/packages" ]; then \ - cd ${_DESTDIR}/packages && for FILE in *; do \ - ${PKG} -c ${_DESTDIR} add /packages/$${FILE}; \ - done; \ + ${_v}if [ -d "${_DESTDIR}/packages" ]; then \ + cd ${_DESTDIR}/packages && for _FILE in *; do \ + _FILES="$${_FILES} /packages/$${_FILE}"; \ + done; \ + ${PKG} -c ${_DESTDIR} add -M $${_FILES}; \ fi -.else - @if [ -d "${_DESTDIR}/packages" ]; then \ - cd ${_DESTDIR}/packages && for FILE in *; do \ - env PKG_PATH=/packages pkg_add -fi -C ${_DESTDIR} /packages/$${FILE} > /dev/null; \ - done; \ - fi -.endif - @if [ -d "${_DESTDIR}/packages" ]; then \ + ${_v}if [ -d "${_DESTDIR}/packages" ]; then \ ${RM} -rf ${_DESTDIR}/packages; \ echo " done"; \ fi - @${TOUCH} ${WRKDIR}/.packages_done + ${_v}${TOUCH} ${WRKDIR}/.packages_done config: install ${WRKDIR}/.config_done ${WRKDIR}/.config_done: @@ -343,29 +334,29 @@ . endif .endfor .if defined(SE) - @${INSTALL} -m 0644 ${TOOLSDIR}/motd.se ${_DESTDIR}/etc/motd - @${INSTALL} -d -m 0755 ${_DESTDIR}/cdrom + ${_v}${INSTALL} -m 0644 ${TOOLSDIR}/motd.se ${_DESTDIR}/etc/motd + ${_v}${INSTALL} -d -m 0755 ${_DESTDIR}/cdrom .else - @${INSTALL} -m 0644 ${TOOLSDIR}/motd ${_DESTDIR}/etc/motd + ${_v}${INSTALL} -m 0644 ${TOOLSDIR}/motd ${_DESTDIR}/etc/motd .endif - @${MKDIR} ${_DESTDIR}/stand ${_DESTDIR}/etc/rc.conf.d - @if [ -f "${CFGDIR}/boot.config" ]; then \ + ${_v}${MKDIR} ${_DESTDIR}/stand ${_DESTDIR}/etc/rc.conf.d + ${_v}if [ -f "${CFGDIR}/boot.config" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/boot.config ${_ROOTDIR}/boot.config; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/boot.config.sample ${_ROOTDIR}/boot.config; \ fi - @if [ -f "${CFGDIR}/loader.conf" ]; then \ + ${_v}if [ -f "${CFGDIR}/loader.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf ${_BOOTDIR}/loader.conf; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf.sample ${_BOOTDIR}/loader.conf; \ fi - @if [ -f "${CFGDIR}/rc.local" ]; then \ + ${_v}if [ -f "${CFGDIR}/rc.local" ]; then \ ${INSTALL} -m 0744 ${CFGDIR}/rc.local ${_DESTDIR}/etc/rc.local; \ else \ ${INSTALL} -m 0744 ${CFGDIR}/rc.local.sample ${_DESTDIR}/etc/rc.local; \ fi .for FILE in rc.conf ttys - @if [ -f "${CFGDIR}/${FILE}" ]; then \ + ${_v}if [ -f "${CFGDIR}/${FILE}" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/${FILE} ${_DESTDIR}/etc/${FILE}; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/${FILE}.sample ${_DESTDIR}/etc/${FILE}; \ @@ -374,58 +365,58 @@ .if defined(ROOTHACK) @echo 'root_rw_mount="NO"' >> ${_DESTDIR}/etc/rc.conf .endif - @if [ -f "${CFGDIR}/resolv.conf" ]; then \ + ${_v}if [ -f "${CFGDIR}/resolv.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/resolv.conf ${_DESTDIR}/etc/resolv.conf; \ fi - @if [ -f "${CFGDIR}/interfaces.conf" ]; then \ + ${_v}if [ -f "${CFGDIR}/interfaces.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/interfaces.conf ${_DESTDIR}/etc/rc.conf.d/interfaces; \ fi - @if [ -f "${CFGDIR}/authorized_keys" ]; then \ + ${_v}if [ -f "${CFGDIR}/authorized_keys" ]; then \ ${INSTALL} -d -m 0700 ${_DESTDIR}/root/.ssh; \ ${INSTALL} ${CFGDIR}/authorized_keys ${_DESTDIR}/root/.ssh/; \ fi - @${MKDIR} ${_DESTDIR}/root/bin - @${INSTALL} ${TOOLSDIR}/zfsinstall ${_DESTDIR}/root/bin - @${INSTALL} ${TOOLSDIR}/destroygeom ${_DESTDIR}/root/bin - @for SCRIPT in ${SCRIPTS}; do \ + ${_v}${MKDIR} ${_DESTDIR}/root/bin + ${_v}${INSTALL} ${TOOLSDIR}/zfsinstall ${_DESTDIR}/root/bin + ${_v}${INSTALL} ${TOOLSDIR}/destroygeom ${_DESTDIR}/root/bin + ${_v}for SCRIPT in ${SCRIPTS}; do \ ${INSTALL} -m 0555 ${SCRIPTSDIR}/$${SCRIPT} ${_DESTDIR}/etc/rc.d/; \ done -# @${SED} -I -E 's/\(ttyv[2-7].*\)on /\1off/g' ${_DESTDIR}/etc/ttys +# ${_v}${SED} -I -E 's/\(ttyv[2-7].*\)on /\1off/g' ${_DESTDIR}/etc/ttys .if !defined(ROOTHACK) - @echo "/dev/md0 / ufs rw 0 0" > ${_DESTDIR}/etc/fstab - @echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" >> ${_DESTDIR}/etc/fstab + ${_v}echo "/dev/md0 / ufs rw 0 0" > ${_DESTDIR}/etc/fstab + ${_v}echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" >> ${_DESTDIR}/etc/fstab .else - @${TOUCH} ${_DESTDIR}/etc/fstab + ${_v}${TOUCH} ${_DESTDIR}/etc/fstab .endif .if defined(ROOTPW) - @echo ${ROOTPW} | ${PW} -V ${_DESTDIR}/etc usermod root -h 0 + ${_v}echo ${ROOTPW} | ${PW} -V ${_DESTDIR}/etc usermod root -h 0 .endif - @echo PermitRootLogin yes >> ${_DESTDIR}/etc/ssh/sshd_config + ${_v}echo PermitRootLogin yes >> ${_DESTDIR}/etc/ssh/sshd_config .if exists(${CFGDIR}/hosts) - @${INSTALL} -m 0644 ${CFGDIR}/hosts ${_DESTDIR}/etc/hosts + ${_v}${INSTALL} -m 0644 ${CFGDIR}/hosts ${_DESTDIR}/etc/hosts .elif exists(${CFGDIR}/hosts.sample) - @${INSTALL} -m 0644 ${CFGDIR}/hosts.sample ${_DESTDIR}/etc/hosts + ${_v}${INSTALL} -m 0644 ${CFGDIR}/hosts.sample ${_DESTDIR}/etc/hosts .else @echo "Missing ${CFGDIR}/hosts.sample" && exit 1 .endif - @${TOUCH} ${WRKDIR}/.config_done + ${_v}${TOUCH} ${WRKDIR}/.config_done @echo " done" genkeys: config ${WRKDIR}/.genkeys_done ${WRKDIR}/.genkeys_done: @echo -n "Generating SSH host keys ..." - @${SSHKEYGEN} -t rsa1 -b 1024 -f ${_DESTDIR}/etc/ssh/ssh_host_key -N '' > /dev/null - @${SSHKEYGEN} -t dsa -f ${_DESTDIR}/etc/ssh/ssh_host_dsa_key -N '' > /dev/null - @${SSHKEYGEN} -t rsa -f ${_DESTDIR}/etc/ssh/ssh_host_rsa_key -N '' > /dev/null - @${TOUCH} ${WRKDIR}/.genkeys_done + ${_v}${SSHKEYGEN} -t rsa1 -b 1024 -f ${_DESTDIR}/etc/ssh/ssh_host_key -N '' > /dev/null + ${_v}${SSHKEYGEN} -t dsa -f ${_DESTDIR}/etc/ssh/ssh_host_dsa_key -N '' > /dev/null + ${_v}${SSHKEYGEN} -t rsa -f ${_DESTDIR}/etc/ssh/ssh_host_rsa_key -N '' > /dev/null + ${_v}${TOUCH} ${WRKDIR}/.genkeys_done @echo " done" customfiles: config ${WRKDIR}/.customfiles_done ${WRKDIR}/.customfiles_done: .if exists(${CUSTOMFILESDIR}) @echo "Copying user files ..." - @${CP} -afv ${CUSTOMFILESDIR}/ ${_DESTDIR}/ - @${TOUCH} ${WRKDIR}/.customfiles_done + ${_v}${CP} -afv ${CUSTOMFILESDIR}/ ${_DESTDIR}/ + ${_v}${TOUCH} ${WRKDIR}/.customfiles_done @echo " done" .endif @@ -433,71 +424,71 @@ ${WRKDIR}/.compress-usr_done: .if !defined(ROOTHACK) @echo -n "Compressing usr ..." - @${TAR} -c -J -C ${_DESTDIR} -f ${_DESTDIR}/.usr.tar.xz usr - @${RM} -rf ${_DESTDIR}/usr && ${MKDIR} ${_DESTDIR}/usr + ${_v}${TAR} -c -J -C ${_DESTDIR} -f ${_DESTDIR}/.usr.tar.xz usr + ${_v}${RM} -rf ${_DESTDIR}/usr && ${MKDIR} ${_DESTDIR}/usr .else @echo -n "Compressing root ..." - @${TAR} -c -C ${_ROOTDIR} -f - rw | \ + ${_v}${TAR} -c -C ${_ROOTDIR} -f - rw | \ ${XZ} -v -c > ${_ROOTDIR}/root.txz - @${RM} -rf ${_DESTDIR} && ${MKDIR} ${_DESTDIR} + ${_v}${RM} -rf ${_DESTDIR} && ${MKDIR} ${_DESTDIR} .endif - @${TOUCH} ${WRKDIR}/.compress-usr_done + ${_v}${TOUCH} ${WRKDIR}/.compress-usr_done @echo " done" roothack: ${WRKDIR}/roothack/roothack ${WRKDIR}/roothack/roothack: .if !defined(ROOTHACK_PREBUILT) - @${MKDIR} -p ${WRKDIR}/roothack - @cd ${TOOLSDIR}/roothack && env MAKEOBJDIR=${WRKDIR}/roothack make + ${_v}${MKDIR} -p ${WRKDIR}/roothack + ${_v}cd ${TOOLSDIR}/roothack && env MAKEOBJDIR=${WRKDIR}/roothack make .endif install-roothack: compress-usr roothack ${WRKDIR}/.install-roothack_done ${WRKDIR}/.install-roothack_done: @echo -n "Installing roothack ..." - @${MKDIR} -p ${_ROOTDIR}/dev ${_ROOTDIR}/sbin - @${INSTALL} -m 555 ${_ROOTHACK_FILE} ${_ROOTDIR}/sbin/init - @${TOUCH} ${WRKDIR}/.install-roothack_done + ${_v}${MKDIR} -p ${_ROOTDIR}/dev ${_ROOTDIR}/sbin + ${_v}${INSTALL} -m 555 ${_ROOTHACK_FILE} ${_ROOTDIR}/sbin/init + ${_v}${TOUCH} ${WRKDIR}/.install-roothack_done @echo " done" boot: install prune ${WRKDIR}/.boot_done ${WRKDIR}/.boot_done: @echo -n "Configuring boot environment ..." - @${MKDIR} ${WRKDIR}/disk/boot && ${CHOWN} root:wheel ${WRKDIR}/disk - @${RM} -f ${_BOOTDIR}/kernel/kernel.debug - @${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot + ${_v}${MKDIR} ${WRKDIR}/disk/boot && ${CHOWN} root:wheel ${WRKDIR}/disk + ${_v}${RM} -f ${_BOOTDIR}/kernel/kernel.debug + ${_v}${CP} -rp ${_BOOTDIR}/kernel ${WRKDIR}/disk/boot .for FILE in boot defaults loader loader.help *.rc *.4th - @${CP} -rp ${_DESTDIR}/boot/${FILE} ${WRKDIR}/disk/boot + ${_v}${CP} -rp ${_DESTDIR}/boot/${FILE} ${WRKDIR}/disk/boot .endfor - @${RM} -rf ${WRKDIR}/disk/boot/kernel/*.ko ${WRKDIR}/disk/boot/kernel/*.symbols + ${_v}${RM} -rf ${WRKDIR}/disk/boot/kernel/*.ko ${WRKDIR}/disk/boot/kernel/*.symbols .if defined(DEBUG) - @test -f ${_BOOTDIR}/kernel/kernel.symbols \ + ${_v}test -f ${_BOOTDIR}/kernel/kernel.symbols \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/kernel.symbols ${WRKDIR}/disk/boot/kernel >/dev/null 2>/dev/null || exit 0 .endif .for FILE in ${BOOTMODULES} - @test -f ${_BOOTDIR}/kernel/${FILE}.ko \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko ${WRKDIR}/disk/boot/kernel >/dev/null 2>/dev/null || exit 0 . if defined(DEBUG) - @test -f ${_BOOTDIR}/kernel/${FILE}.ko \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko.symbols ${WRKDIR}/disk/boot/kernel >/dev/null 2>/dev/null || exit 0 . endif .endfor - @${MKDIR} -p ${_DESTDIR}/boot/modules + ${_v}${MKDIR} -p ${_DESTDIR}/boot/modules .for FILE in ${MFSMODULES} - @test -f ${_BOOTDIR}/kernel/${FILE}.ko \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko ${_DESTDIR}/boot/modules >/dev/null 2>/dev/null || exit 0 . if defined(DEBUG) - @test -f ${_BOOTDIR}/kernel/${FILE}.ko.symbols \ + ${_v}test -f ${_BOOTDIR}/kernel/${FILE}.ko.symbols \ && ${INSTALL} -m 0555 ${_BOOTDIR}/kernel/${FILE}.ko.symbols ${_DESTDIR}/boot/modules >/dev/null 2>/dev/null || exit 0 . endif .endfor .if defined(ROOTHACK) @echo -n "Installing tmpfs module for roothack ..." - @${MKDIR} -p ${_ROOTDIR}/boot/modules - @${INSTALL} -m 0666 ${_BOOTDIR}/kernel/tmpfs.ko ${_ROOTDIR}/boot/modules + ${_v}${MKDIR} -p ${_ROOTDIR}/boot/modules + ${_v}${INSTALL} -m 0666 ${_BOOTDIR}/kernel/tmpfs.ko ${_ROOTDIR}/boot/modules @echo " done" .endif - @${RM} -rf ${_BOOTDIR}/kernel ${_BOOTDIR}/*.symbols - @${TOUCH} ${WRKDIR}/.boot_done + ${_v}${RM} -rf ${_BOOTDIR}/kernel ${_BOOTDIR}/*.symbols + ${_v}${TOUCH} ${WRKDIR}/.boot_done @echo " done" .if defined(ROOTHACK) @@ -507,48 +498,48 @@ .endif ${WRKDIR}/.mfsroot_done: @echo -n "Creating and compressing mfsroot ..." - @${MKDIR} ${WRKDIR}/mnt - @${MAKEFS} -t ffs -m ${MFSROOT_MAXSIZE} -f ${MFSROOT_FREE_INODES} -b ${MFSROOT_FREE_BLOCKS} ${WRKDIR}/disk/mfsroot ${_ROOTDIR} > /dev/null - @${RM} -rf ${WRKDIR}/mnt ${_DESTDIR} - @${GZIP} -9 -f ${WRKDIR}/disk/mfsroot - @${GZIP} -9 -f ${WRKDIR}/disk/boot/kernel/kernel - @if [ -f "${CFGDIR}/loader.conf" ]; then \ + ${_v}${MKDIR} ${WRKDIR}/mnt + ${_v}${MAKEFS} -t ffs -m ${MFSROOT_MAXSIZE} -f ${MFSROOT_FREE_INODES} -b ${MFSROOT_FREE_BLOCKS} ${WRKDIR}/disk/mfsroot ${_ROOTDIR} > /dev/null + ${_v}${RM} -rf ${WRKDIR}/mnt ${_DESTDIR} + ${_v}${GZIP} -9 -f ${WRKDIR}/disk/mfsroot + ${_v}${GZIP} -9 -f ${WRKDIR}/disk/boot/kernel/kernel + ${_v}if [ -f "${CFGDIR}/loader.conf" ]; then \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf ${WRKDIR}/disk/boot/loader.conf; \ else \ ${INSTALL} -m 0644 ${CFGDIR}/loader.conf.sample ${WRKDIR}/disk/boot/loader.conf; \ fi - @${TOUCH} ${WRKDIR}/.mfsroot_done + ${_v}${TOUCH} ${WRKDIR}/.mfsroot_done @echo " done" fbsddist: install prune config genkeys customfiles boot compress-usr packages mfsroot ${WRKDIR}/.fbsddist_done ${WRKDIR}/.fbsddist_done: .if defined(SE) @echo -n "Copying FreeBSD installation image ..." - @${CP} -rf ${_DISTDIR} ${WRKDIR}/disk/ + ${_v}${CP} -rf ${_DISTDIR} ${WRKDIR}/disk/ @echo " done" .endif - @${TOUCH} ${WRKDIR}/.fbsddist_done + ${_v}${TOUCH} ${WRKDIR}/.fbsddist_done image: install prune config genkeys customfiles boot compress-usr mfsroot fbsddist ${IMAGE} ${IMAGE}: @echo -n "Creating image file ..." - @${MKDIR} ${WRKDIR}/mnt ${WRKDIR}/trees/base/boot - @${INSTALL} -m 0444 ${WRKDIR}/disk/boot/boot ${WRKDIR}/trees/base/boot/ - @${DOFS} ${BSDLABEL} "" ${WRKDIR}/disk.img ${WRKDIR} ${WRKDIR}/mnt 0 ${WRKDIR}/disk 80000 auto > /dev/null 2> /dev/null - @${RM} -rf ${WRKDIR}/mnt ${WRKDIR}/trees - @${MV} ${WRKDIR}/disk.img ${IMAGE} + ${_v}${MKDIR} ${WRKDIR}/mnt ${WRKDIR}/trees/base/boot + ${_v}${INSTALL} -m 0444 ${WRKDIR}/disk/boot/boot ${WRKDIR}/trees/base/boot/ + ${_v}${DOFS} ${BSDLABEL} "" ${WRKDIR}/disk.img ${WRKDIR} ${WRKDIR}/mnt 0 ${WRKDIR}/disk 80000 auto > /dev/null 2> /dev/null + ${_v}${RM} -rf ${WRKDIR}/mnt ${WRKDIR}/trees + ${_v}${MV} ${WRKDIR}/disk.img ${IMAGE} @echo " done" - @${LS} -l ${IMAGE} + ${_v}${LS} -l ${IMAGE} gce: install prune config genkeys customfiles boot compress-usr mfsroot fbsddist ${IMAGE} ${GCEFILE} ${GCEFILE}: @echo -n "Creating GCE-compatible tarball..." .if !exists(${GTAR}) - @echo "${GTAR} is missing, please install archivers/gtar first"; exit 1 + ${_v}echo "${GTAR} is missing, please install archivers/gtar first"; exit 1 .else - @${GTAR} -C ${CURDIR} -Szcf ${GCEFILE} --transform='s/${IMAGE}/disk.raw/' ${IMAGE} + ${_v}${GTAR} -C ${CURDIR} -Szcf ${GCEFILE} --transform='s/${IMAGE}/disk.raw/' ${IMAGE} @echo " GCE tarball built" - @${LS} -l ${GCEFILE} + ${_v}${LS} -l ${GCEFILE} .endif iso: install prune config genkeys customfiles boot compress-usr mfsroot fbsddist ${ISOIMAGE} @@ -558,25 +549,25 @@ . if !exists(${MKISOFS}) @echo "${MKISOFS} is missing, please install sysutils/cdrtools first"; exit 1 . else - @${MKISOFS} -b boot/cdboot -no-emul-boot -r -J -V mfsBSD -o ${ISOIMAGE} ${WRKDIR}/disk > /dev/null 2> /dev/null + ${_v}${MKISOFS} -b boot/cdboot -no-emul-boot -r -J -V mfsBSD -o ${ISOIMAGE} ${WRKDIR}/disk > /dev/null 2> /dev/null . endif .else - @${MAKEFS} -t cd9660 -o rockridge,bootimage=i386\;/boot/cdboot,no-emul-boot,label=mfsBSD ${ISOIMAGE} ${WRKDIR}/disk + ${_v}${MAKEFS} -t cd9660 -o rockridge,bootimage=i386\;/boot/cdboot,no-emul-boot,label=mfsBSD ${ISOIMAGE} ${WRKDIR}/disk .endif @echo " done" - @${LS} -l ${ISOIMAGE} + ${_v}${LS} -l ${ISOIMAGE} tar: install prune config customfiles boot compress-usr mfsroot fbsddist ${TARFILE} ${TARFILE}: @echo -n "Creating tar file ..." - @cd ${WRKDIR}/disk && ${FIND} . -depth 1 \ + ${_v}cd ${WRKDIR}/disk && ${FIND} . -depth 1 \ -exec ${TAR} -r -f ${CURDIR}/${TARFILE} {} \; @echo " done" - @${LS} -l ${TARFILE} + ${_v}${LS} -l ${TARFILE} clean-roothack: - @${RM} -rf ${WRKDIR}/roothack + ${_v}${RM} -rf ${WRKDIR}/roothack clean: clean-roothack - @if [ -d ${WRKDIR} ]; then ${CHFLAGS} -R noschg ${WRKDIR}; fi - @cd ${WRKDIR} && ${RM} -rf mfs mnt disk dist trees .*_done + ${_v}if [ -d ${WRKDIR} ]; then ${CHFLAGS} -R noschg ${WRKDIR}; fi + ${_v}cd ${WRKDIR} && ${RM} -rf mfs mnt disk dist trees .*_done