From owner-svn-src-head@freebsd.org Sat Aug 22 23:09:21 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 470499BFA4F; Sat, 22 Aug 2015 23:09:21 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 350561262; Sat, 22 Aug 2015 23:09:21 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7MN9Lvm063366; Sat, 22 Aug 2015 23:09:21 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7MN9K5q063363; Sat, 22 Aug 2015 23:09:20 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201508222309.t7MN9K5q063363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 22 Aug 2015 23:09:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287028 - in head/tools/tools/nanobsd: . pcengines rescue X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2015 23:09:21 -0000 Author: imp Date: Sat Aug 22 23:09:19 2015 New Revision: 287028 URL: https://svnweb.freebsd.org/changeset/base/287028 Log: Remove cust_pkg() not that pkg_foo(1) has been removed. Modified: head/tools/tools/nanobsd/defaults.sh (contents, props changed) head/tools/tools/nanobsd/pcengines/common.conf head/tools/tools/nanobsd/rescue/common Modified: head/tools/tools/nanobsd/defaults.sh ============================================================================== --- head/tools/tools/nanobsd/defaults.sh Sat Aug 22 21:35:35 2015 (r287027) +++ head/tools/tools/nanobsd/defaults.sh Sat Aug 22 23:09:19 2015 (r287028) @@ -45,7 +45,7 @@ NANO_SRC=/usr/src # Where nanobsd additional files live under the source tree NANO_TOOLS=tools/tools/nanobsd -# Where cust_pkg() finds packages to install +# Where cust_pkgng() finds packages to install NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg NANO_PACKAGE_LIST="*" @@ -762,55 +762,6 @@ cust_install_files () ( ####################################################################### # Install packages from ${NANO_PACKAGE_DIR} -cust_pkg () ( - - # If the package directory doesn't exist, we're done. - if [ ! -d ${NANO_PACKAGE_DIR} ]; then - echo "DONE 0 packages" - return 0 - fi - - # Copy packages into chroot - mkdir -p ${NANO_WORLDDIR}/Pkg ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg - ( - cd ${NANO_PACKAGE_DIR} - find ${NANO_PACKAGE_LIST} -print | - cpio -Ldumpv ${NANO_WORLDDIR}/Pkg - ) - - # Count & report how many we have to install - todo=`ls ${NANO_WORLDDIR}/Pkg | wc -l` - echo "=== TODO: $todo" - ls ${NANO_WORLDDIR}/Pkg - echo "===" - while true - do - # Record how many we have now - have=`ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg | wc -l` - - # Attempt to install more packages - # ...but no more than 200 at a time due to pkg_add's internal - # limitations. - CR0 'ls Pkg/*tbz | xargs -n 200 env PKG_DBDIR='${NANO_PKG_META_BASE}'/pkg pkg_add -v -F' - - # See what that got us - now=`ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg | wc -l` - echo "=== NOW $now" - ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg - echo "===" - - - if [ $now -eq $todo ] ; then - echo "DONE $now packages" - break - elif [ $now -eq $have ] ; then - echo "FAILED: Nothing happened on this pass" - exit 2 - fi - done - nano_rm -rf ${NANO_WORLDDIR}/Pkg -) - cust_pkgng () ( # If the package directory doesn't exist, we're done. Modified: head/tools/tools/nanobsd/pcengines/common.conf ============================================================================== --- head/tools/tools/nanobsd/pcengines/common.conf Sat Aug 22 21:35:35 2015 (r287027) +++ head/tools/tools/nanobsd/pcengines/common.conf Sat Aug 22 23:09:19 2015 (r287028) @@ -66,7 +66,7 @@ cust_boot_cfg () ( echo "hint.acpi.0.disabled=\"1\"" >> boot/loader.conf ) customize_cmd cust_boot_cfg -customize_cmd cust_pkg +customize_cmd cust_pkgng cust_etc_cfg () ( cd ${NANO_WORLDDIR} mkdir -pv z/scratch Modified: head/tools/tools/nanobsd/rescue/common ============================================================================== --- head/tools/tools/nanobsd/rescue/common Sat Aug 22 21:35:35 2015 (r287027) +++ head/tools/tools/nanobsd/rescue/common Sat Aug 22 23:09:19 2015 (r287028) @@ -65,7 +65,7 @@ customize_cmd cust_ld32_cfg #) #customize_cmd cust_boot_cfg -customize_cmd cust_pkg +customize_cmd cust_pkgng cust_etc_cfg () ( cd ${NANO_WORLDDIR}