diff options
author | imp <imp@FreeBSD.org> | 2015-08-22 23:09:19 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2015-08-22 23:09:19 +0000 |
commit | 6129bf3e3a3f2de61c8d5f0f59b95cf9d3096dd4 (patch) | |
tree | 25cd7a1d7875631fa283a0fc615c9576a9e2422b /tools | |
parent | 921c76ac36bbb280e438d08f0d60371bc9a217c2 (diff) | |
download | FreeBSD-src-6129bf3e3a3f2de61c8d5f0f59b95cf9d3096dd4.zip FreeBSD-src-6129bf3e3a3f2de61c8d5f0f59b95cf9d3096dd4.tar.gz |
Remove cust_pkg() not that pkg_foo(1) has been removed.
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/tools/nanobsd/defaults.sh | 51 | ||||
-rw-r--r-- | tools/tools/nanobsd/pcengines/common.conf | 2 | ||||
-rw-r--r-- | tools/tools/nanobsd/rescue/common | 2 |
3 files changed, 3 insertions, 52 deletions
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index a556e1b..57e9cfc 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -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. diff --git a/tools/tools/nanobsd/pcengines/common.conf b/tools/tools/nanobsd/pcengines/common.conf index e1179bd..40275dd 100644 --- a/tools/tools/nanobsd/pcengines/common.conf +++ b/tools/tools/nanobsd/pcengines/common.conf @@ -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 diff --git a/tools/tools/nanobsd/rescue/common b/tools/tools/nanobsd/rescue/common index 908455e..d2a8a6d 100644 --- a/tools/tools/nanobsd/rescue/common +++ b/tools/tools/nanobsd/rescue/common @@ -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} |