From 8501e9879b9974c156d888c94488b52542924b45 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 16 Oct 2010 23:18:51 -0500 Subject: [PATCH 01/16] script/makepkg: verbosity in chstartup, chshutdown, chdestroy --- script/makepkg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/script/makepkg b/script/makepkg index 53ee923..082dcbb 100755 --- a/script/makepkg +++ b/script/makepkg @@ -52,6 +52,7 @@ chprepare() { trap "" exit hup int term kill meh "Chroot tree set up in ${chroot_dir}" + return 0 } @@ -59,6 +60,8 @@ chprepare() { chstartup() { [ -d "${chroot_dir}" -a -a -f "${chroot_dir}/COPYRIGHT" -a -d "${chroot_dir}/dev" ] || wtf "Chroot not prepared" + meh "Starting up chroot" + # Necessary mountpoints mount -t devfs devfs "${chroot_dir}/dev" || wtf "mount /dev failed" mount -t nullfs -r /usr/src "${chroot_dir}/usr/src" || wtf "mount /usr/src failed" @@ -67,6 +70,9 @@ chstartup() { # Chroot configuration cp -f /etc/resolv.conf "${chroot_dir}/etc/resolv.conf" || wtf "seeding /etc/resolv.conf failed" + + meh "Chroot up and running in ${chroot_dir}" + return 0 } @@ -74,6 +80,7 @@ chstartup() { chshutdown() { # Short-circuit if nothing is mounted mount | grep -q "${chroot_dir}" || return 0 + meh "Shutting down chroot" umount "${chroot_dir}/var/ports/distfiles" umount "${chroot_dir}/usr/ports" umount "${chroot_dir}/dev" @@ -83,6 +90,7 @@ chshutdown() { # Remove all chroot contents chdestroy() { chshutdown + meh "Destroying chroot" chflags -R noschg "${chroot_dir}" || wtf "noschg failed" rm -Rf "${chroot_dir}" || wtf "chroot removal failed" return 0 -- 2.45.0 From ba333c616a902b9b74940f2faf0ded1366a77764 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 16 Oct 2010 23:09:02 -0500 Subject: [PATCH 02/16] script/makepkg: debugging and testing --- script/makepkg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/makepkg b/script/makepkg index 082dcbb..481c200 100755 --- a/script/makepkg +++ b/script/makepkg @@ -39,6 +39,9 @@ chprepare() { mkdir -p "$(dirname "${chroot_dir}")" || wtf "chroot path create failed" cp -pR "${seed_dir}" "${chroot_dir}" || wtf "chroot seeding failed" + # Create distfile cache + mkdir -p "${dist_dir}" || wtf "mkdir ${dist_dir} failed" + # Create mountpoint directories mkdir -p "${chroot_dir}/dev" || wtf "mkdir /dev failed" mkdir -p "${chroot_dir}/usr/src" || wtf "mkdir /usr/src failed" @@ -58,7 +61,7 @@ chprepare() { # Set up chroot mounts and runtime configuration chstartup() { - [ -d "${chroot_dir}" -a -a -f "${chroot_dir}/COPYRIGHT" -a -d "${chroot_dir}/dev" ] || wtf "Chroot not prepared" + [ -d "${chroot_dir}" -a -f "${chroot_dir}/COPYRIGHT" -a -d "${chroot_dir}/dev" ] || wtf "Chroot not prepared" meh "Starting up chroot" @@ -83,6 +86,7 @@ chshutdown() { meh "Shutting down chroot" umount "${chroot_dir}/var/ports/distfiles" umount "${chroot_dir}/usr/ports" + umount "${chroot_dir}/usr/src" umount "${chroot_dir}/dev" return 0 } @@ -269,6 +273,7 @@ port_fetch_recursive() { do meh "fetch-recursive ${1}" chmake "${1}" fetch-recursive + shift done } -- 2.45.0 From 6b5ca3429adcbf64b9af53425cbd52fccfe2e842 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 00:39:28 -0500 Subject: [PATCH 03/16] script/makepkg: rollback if a problem occurs during chstartup --- script/makepkg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/makepkg b/script/makepkg index 481c200..a4bad4c 100755 --- a/script/makepkg +++ b/script/makepkg @@ -63,6 +63,9 @@ chprepare() { chstartup() { [ -d "${chroot_dir}" -a -f "${chroot_dir}/COPYRIGHT" -a -d "${chroot_dir}/dev" ] || wtf "Chroot not prepared" + # Rollback if a problem occurs during startup + trap "chshutdown" exit hup int term kill + meh "Starting up chroot" # Necessary mountpoints @@ -74,6 +77,7 @@ chstartup() { # Chroot configuration cp -f /etc/resolv.conf "${chroot_dir}/etc/resolv.conf" || wtf "seeding /etc/resolv.conf failed" + trap "" exit hup int term kill meh "Chroot up and running in ${chroot_dir}" return 0 -- 2.45.0 From 5a53540f74fe299803280b10f99cb698aa53aa5f Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 16 Oct 2010 23:42:31 -0500 Subject: [PATCH 04/16] script/makepkg: load saved configuration when preparing chroot; saving must be done manually --- script/makepkg | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/script/makepkg b/script/makepkg index a4bad4c..e34163e 100755 --- a/script/makepkg +++ b/script/makepkg @@ -53,6 +53,10 @@ chprepare() { mkdir -p "${pkg_dir}" || wtf "mkdir ${chroot_pkg_dir} failed" mkdir -p "${bdeps_dir}" || wtf "mkdir ${chroot_bdeps_dir} failed" + # Copy in cached configuration, if necessary + [ -f "${conf_dir}/make.conf" ] && cp -p "${conf_dir}/make.conf" "${chroot_dir}/etc/make.conf" + [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -iv ) < "${conf_dir}/port_options.cpio" + trap "" exit hup int term kill meh "Chroot tree set up in ${chroot_dir}" @@ -255,14 +259,16 @@ port_rmconfig_all() { # Restore port build options from cpio port_load_config() { + [ -f "${conf_dir}/port_options.cpio" ] || return 0 meh "port load-config" - cheval "cd /var/db/ports; cpio -iv" + cheval "cd /var/db/ports; cpio -iv" < "${conf_dir}/port_options.cpio" } # Dump port build options to cpio port_save_config() { meh "port save-config" - cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -ovHnewc" + cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -ovHnewc" > "${conf_dir}/port_options.cpio.tmp" || wtf "port save-config failed" + mv -f "${conf_dir}/port_options.cpio.tmp" "${conf_dir}/port_options.cpio" || wtf "port save-config atomic commit failed" } ######## @@ -384,6 +390,9 @@ ROOT="$(realpath "$(dirname "${0}")/../worlds")" # Base directory for everything base_dir="${ROOT}/${TARGET}/${CONFIG}" +# Directory holding configuration +conf_dir="${base_dir}/config" + # Root tree for chroot seeding seed_dir="${base_dir}/root" -- 2.45.0 From c088d72392266934b6836ce6cd7e07071e024840 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 00:06:12 -0500 Subject: [PATCH 05/16] script/makepkg: add chup? check to flag when chroot is ready for use --- script/makepkg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/script/makepkg b/script/makepkg index e34163e..9e97e13 100755 --- a/script/makepkg +++ b/script/makepkg @@ -66,6 +66,7 @@ chprepare() { # Set up chroot mounts and runtime configuration chstartup() { [ -d "${chroot_dir}" -a -f "${chroot_dir}/COPYRIGHT" -a -d "${chroot_dir}/dev" ] || wtf "Chroot not prepared" + chup? && return 0 # Rollback if a problem occurs during startup trap "chshutdown" exit hup int term kill @@ -87,6 +88,12 @@ chstartup() { return 0 } +# Check if the chroot is probably ready for use +chup?() { + [ -d "${chroot_dir}" -a -f "${chroot_dir}/COPYRIGHT" -a -c "${chroot_dir}/dev/null" ] + return $? +} + # Unmount all chroot directories chshutdown() { # Short-circuit if nothing is mounted @@ -110,6 +117,7 @@ chdestroy() { # Evaluate a command line within the chroot cheval() { + chup? || wtf "Chroot not ready" chroot "${chroot_dir}" env -i ${chroot_env} /bin/sh -c "cd ${chroot_pkg_dir}; ${*}" return $? } -- 2.45.0 From ed3df000c972e798af4fca62f069f9484d928d99 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 00:20:07 -0500 Subject: [PATCH 06/16] script/makepkg: stub makeinfo and install-info to quell port build/install failures if world was built WITHOUT_INFO --- script/makepkg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/script/makepkg b/script/makepkg index 9e97e13..af65988 100755 --- a/script/makepkg +++ b/script/makepkg @@ -57,6 +57,11 @@ chprepare() { [ -f "${conf_dir}/make.conf" ] && cp -p "${conf_dir}/make.conf" "${chroot_dir}/etc/make.conf" [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -iv ) < "${conf_dir}/port_options.cpio" + # If you have WITHOUT_INFO set in src.conf during buildworld/installworld, ports that need + # makeinfo and install-info will fail horribly; stub them + [ -f "${chroot_dir}/usr/bin/makeinfo" ] || ln -sf true "${chroot_dir}/usr/bin/makeinfo" + [ -f "${chroot_dir}/usr/bin/install-info" ] || ln -sf true "${chroot_dir}/usr/bin/install-info" + trap "" exit hup int term kill meh "Chroot tree set up in ${chroot_dir}" -- 2.45.0 From 44aaf9aa0a4d743564f23527f983f085a98b2f8d Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 00:37:18 -0500 Subject: [PATCH 07/16] script/makepkg: add caching for port_all_bdeps and port_all_rdeps to avoid already-visited branches; fix port_all_bdeps to not ignore second-level bdeps As an optional test protocol, we are pleased to present an amusing fact: Computing the depgraph of an options-unchanged lang/php5-extensions, with and without caching: rdeps: With: 3.5 seconds Without: 22.7 seconds bdeps: With: 17.6 seconds Without: Gave up after 7 minutes --- script/makepkg | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/script/makepkg b/script/makepkg index af65988..77dea20 100755 --- a/script/makepkg +++ b/script/makepkg @@ -159,12 +159,33 @@ port_bdeps() { done } port_all_bdeps() { - # rdeps for rdeps are rdeps, rdeps for bdeps are bdeps; thus: - ( port_bdeps "${@}"; port_all_rdeps "${@}" ) | while read port - do - port_all_bdeps "${port}" - port_all_rdeps "${port}" - done | sort | uniq + # Clear cache if first value isn't '-r' + [ "${1}" = '-r' ] && shift || { : > "${_port_all_bdeps_cache}"; : > "${_port_all_rdeps_cache}"; } + # rdeps for rdeps are rdeps, bdeps for rdeps are bdeps, rdeps for bdeps are bdeps; thus: + ( + port_bdeps "${@}" | while read port + do + [ "${VERBOSE_CACHE}" ] && logf "**** bdep cache %s: '%s'\n" "$(grep -q "${port}" \ + "${_port_all_bdeps_cache}" && echo "hit" || echo "miss")" "${port}" >&2 + if ! grep -q "${port}" "${_port_all_bdeps_cache}" + then + echo "${port}" >> "${_port_all_bdeps_cache}" + echo "${port}" + port_all_bdeps -r "${port}" + port_all_rdeps -r "${port}" + fi + done + port_all_rdeps -r "${@}" | while read port + do + [ "${VERBOSE_CACHE}" ] && logf "**** bdep cache %s: '%s'\n" "$(grep -q "${port}" \ + "${_port_all_bdeps_cache}" && echo "hit" || echo "miss")" "${port}" >&2 + if ! grep -q "${port}" "${_port_all_bdeps_cache}" + then + echo "${port}" >> "${_port_all_bdeps_cache}" + port_all_bdeps -r "${port}" + fi + done + ) | sort | uniq } pkg_bdeps() { port2pkg $(port_all_bdeps "${@}") @@ -179,10 +200,18 @@ port_rdeps() { done } port_all_rdeps() { + # Clear cache if first value isn't '-r' + [ "${1}" = '-r' ] && shift || { : > "${_port_all_rdeps_cache}"; } port_rdeps "${@}" | while read port do - echo "${port}" - port_all_rdeps "${port}" + [ "${VERBOSE_CACHE}" ] && logf "**** rdep cache %s: '%s'\n" "$(grep -q "${port}" \ + "${_port_all_rdeps_cache}" && echo "hit" || echo "miss")" "${port}" >&2 + if ! grep -q "${port}" "${_port_all_rdeps_cache}" + then + echo "${port}" >> "${_port_all_rdeps_cache}" + echo "${port}" + port_all_rdeps -r "${port}" + fi done | sort | uniq } pkg_rdeps() { @@ -427,6 +456,10 @@ bdeps_dir="${pkg_dir}/bdeps" chroot_pkg_dir="${pkg_dir##${chroot_dir}}" chroot_bdeps_dir="${bdeps_dir##${chroot_dir}}" +# Cache files to speed up recursive bdep/rdep scanning +_port_all_bdeps_cache="${chroot_dir}/tmp/_port_all_bdeps_cache" +_port_all_rdeps_cache="${chroot_dir}/tmp/_port_all_rdeps_cache" + # Chroot environment chroot_env=" USER=root -- 2.45.0 From 93ea039200b0d0b12fbd173d083a8c76bb965fe3 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 02:48:05 -0500 Subject: [PATCH 08/16] script/makepkg: enhance chport --- script/makepkg | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/script/makepkg b/script/makepkg index 77dea20..a5f8eb9 100755 --- a/script/makepkg +++ b/script/makepkg @@ -409,11 +409,21 @@ pkg_delete_all() { # Be sure to chsetup and populate your config before running! chport() { local port="${1}" + meh "config-recursive" + port_config_recursive "${port}" + meh "fetch-recursive" + port_fetch_recursive "${port}" + meh "load-deps" port_load_deps "${port}" + meh "build" port_build "${port}" + meh "package" port_package "${port}" + meh "stash-deps" port_stash_bdeps + meh "final" pkg_final + meh "delete-all" pkg_delete_all } -- 2.45.0 From be6b8dd32021c2ccbef8a2a7c822ff3c03a6ad18 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 03:01:50 -0500 Subject: [PATCH 09/16] worlds/i386/SABA: avoid including perl5/python rdeps --- worlds/i386/SABA/config/make.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/worlds/i386/SABA/config/make.conf b/worlds/i386/SABA/config/make.conf index 8f6849c..72338d3 100644 --- a/worlds/i386/SABA/config/make.conf +++ b/worlds/i386/SABA/config/make.conf @@ -35,3 +35,8 @@ WRKDIRPREFIX=/usr/obj #SUPFILE=/root/sups/release.sup #PORTSSUPFILE=/root/sups/ports.sup +.if ${.CURDIR:M*/devel/glib20} + USE_LOCAL_MK= + STRIP_PERL5_RUN= + STRIP_PYTHON_RUN= +.endif -- 2.45.0 From 8763000a53ea61b47a2996dcf574acd0f7db7646 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 03:35:44 -0500 Subject: [PATCH 10/16] script/makepkg: port options cpio need not be verbose --- script/makepkg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/makepkg b/script/makepkg index a5f8eb9..0332723 100755 --- a/script/makepkg +++ b/script/makepkg @@ -55,7 +55,7 @@ chprepare() { # Copy in cached configuration, if necessary [ -f "${conf_dir}/make.conf" ] && cp -p "${conf_dir}/make.conf" "${chroot_dir}/etc/make.conf" - [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -iv ) < "${conf_dir}/port_options.cpio" + [ -f "${conf_dir}/port_options.cpio" ] && ( cd ${chroot_dir}/var/db/ports; cpio -i ) < "${conf_dir}/port_options.cpio" # If you have WITHOUT_INFO set in src.conf during buildworld/installworld, ports that need # makeinfo and install-info will fail horribly; stub them @@ -303,13 +303,13 @@ port_rmconfig_all() { port_load_config() { [ -f "${conf_dir}/port_options.cpio" ] || return 0 meh "port load-config" - cheval "cd /var/db/ports; cpio -iv" < "${conf_dir}/port_options.cpio" + cheval "cd /var/db/ports; cpio -i" < "${conf_dir}/port_options.cpio" } # Dump port build options to cpio port_save_config() { meh "port save-config" - cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -ovHnewc" > "${conf_dir}/port_options.cpio.tmp" || wtf "port save-config failed" + cheval "cd /var/db/ports; find . -type d -o -type f -name options | cpio -oHnewc" > "${conf_dir}/port_options.cpio.tmp" || wtf "port save-config failed" mv -f "${conf_dir}/port_options.cpio.tmp" "${conf_dir}/port_options.cpio" || wtf "port save-config atomic commit failed" } -- 2.45.0 From b36e6eba494fa187270fb7d25e85347cc7a652c9 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 04:10:16 -0500 Subject: [PATCH 11/16] script/makepkg, todo: todo maintenance --- script/makepkg | 60 +++++++++++++++++++++++++++++++++++++++++--------- todo | 45 ------------------------------------- 2 files changed, 49 insertions(+), 56 deletions(-) diff --git a/script/makepkg b/script/makepkg index 0332723..915e087 100755 --- a/script/makepkg +++ b/script/makepkg @@ -4,17 +4,6 @@ _root="$(dirname "${0}")"; . "${_root}/lib/env.sh" want log root -# Dump a list of leaf ports from a working system -# Leaf ports are ports that have nothing depending upon them -# These are generally the top-level ports; everything else should -# be pulled in by them -leaf_ports() { - ( cd /var/db/pkg; ls -1 ) | while read pkg - do - pkg_info -Rq "${pkg}" | grep -q '' || pkg_info -oq "${pkg}" - done | sort -} - ######## # # Chroot handling @@ -237,6 +226,51 @@ pkg_deps() { port2pkg $(port_all_deps "${@}") } +# Dump a list of leaf ports from a working system +# Leaf ports are ports that have nothing depending upon them +# These are generally the top-level ports; everything else should +# be pulled in by them; on a system that has had updates applied +# this may pick up orphaned packages as well, so try cutleaves? +leaf_ports() { + ( cd /var/db/pkg; ls -1 ) | while read pkg + do + pkg_info -Rq "${pkg}" | grep -q '' || pkg_info -oq "${pkg}" + done | sort +} + +# Display a tree of all build dependencies (and +# any runtime dependencies those build dependencies +# depend upon). Individual ports may appear more than +# once, as it is a tree and not a list. +port_bdep_tree() { + port="${1##/usr/ports/}" + printf "%${2}s%s\n" "" "${port}" + + ( cd /usr/ports/${port} + ( make build-depends-list + [ "${2:-0}" -gt 0 ] && make run-depends-list + ) | sort -u | while read port + do + bdep_tree "${port}" $(( ${2:-0} + 1 )) + done + ) +} + +# Display a tree of all runtime dependencies. Individual +# ports may appear more than once, as it is a tree and +# not a list. +port_rdep_tree() { + port="${1##/usr/ports/}" + printf "%${2}s%s\n" "" "${port}" + + ( cd /usr/ports/${port} + make run-depends-list | sort -u | while read port + do + rdep_tree "${port}" $(( ${2:-0} + 1 )) + done + ) +} + ######## # # Port Configuration Handling @@ -482,3 +516,7 @@ TERM=${TERM} # Blind passthru for testing [ "${#}" ] && "${@}" + +# Todo: Clean up entrypoint to support proper options +# Todo: Add methods to autoprocess a ports.lst file to produce packages +# Todo: Unify chroot handling with makeworld diff --git a/todo b/todo index 8dcb7a0..9d6b2e6 100644 --- a/todo +++ b/todo @@ -17,48 +17,3 @@ Nabihi (remember (understand, perceive, notice)) Alter conf stuff to support tmpfs_size as well as md_size, to use tmpfs mounts instead of mdmfs mounts for diskless-remount storage Try makefs? - While makefs does allow non-root manipulation, it does not provide nearly enough control over the resultant filesystem size to make it useful for packing. - -# Try to work these into the library somewhere - -# Leaf ports are ports that have nothing depending upon them -# These are generally the top-level ports; everything else should -# be pulled in by them -leaf_ports() { - ( cd /var/db/pkg; ls -1 ) | while read pkg - do - pkg_info -Rq "${pkg}" | grep -q '' || pkg_info -oq "${pkg}" - done | sort -} - -# Display a tree of all build dependencies (and -# any runtime dependencies those build dependencies -# depend upon). Individual ports may appear more than -# once, as it is a tree and not a list. -bdep_tree() { - port="${1##/usr/ports/}" - printf "%${2}s%s\n" "" "${port}" - - ( cd /usr/ports/${port} - ( make build-depends-list - [ "${2:-0}" -gt 0 ] && make run-depends-list - ) | sort -u | while read port - do - bdep_tree "${port}" $(( ${2:-0} + 1 )) - done - ) -} - -# Display a tree of all runtime dependencies. Individual -# ports may appear more than once, as it is a tree and -# not a list. -rdep_tree() { - port="${1##/usr/ports/}" - printf "%${2}s%s\n" "" "${port}" - - ( cd /usr/ports/${port} - make run-depends-list | sort -u | while read port - do - rdep_tree "${port}" $(( ${2:-0} + 1 )) - done - ) -} -- 2.45.0 From 7a15a6b71909e71bc7aa9697472a034bf77a6318 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 04:10:57 -0500 Subject: [PATCH 12/16] worlds/i386/SABA: add ports.lst file to describe leaf ports to build --- worlds/i386/SABA/config/ports.lst | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 worlds/i386/SABA/config/ports.lst diff --git a/worlds/i386/SABA/config/ports.lst b/worlds/i386/SABA/config/ports.lst new file mode 100644 index 0000000..75c6d3c --- /dev/null +++ b/worlds/i386/SABA/config/ports.lst @@ -0,0 +1,11 @@ +mail/ssmtp +misc-cdn/flag +misc-cdn/freebsd-rc +misc/clpbar +net/istgt +net/rsync +security/sudo +shells/bash-completion +sysutils/gkrellm2 +sysutils/screen +sysutils/smartmontools -- 2.45.0 From e61db7619e94c98e6d5296b7546871aaa0f3789c Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 04:18:00 -0500 Subject: [PATCH 13/16] script/makepkg: make port_bdep_tree and port_rdep_tree use chroot --- script/makepkg | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/script/makepkg b/script/makepkg index 915e087..70cc1de 100755 --- a/script/makepkg +++ b/script/makepkg @@ -246,14 +246,12 @@ port_bdep_tree() { port="${1##/usr/ports/}" printf "%${2}s%s\n" "" "${port}" - ( cd /usr/ports/${port} - ( make build-depends-list - [ "${2:-0}" -gt 0 ] && make run-depends-list - ) | sort -u | while read port - do - bdep_tree "${port}" $(( ${2:-0} + 1 )) - done - ) + ( chmake "${port}" build-depends-list + [ "${2:-0}" -gt 0 ] && chmake "${port}" run-depends-list + ) | sort -u | while read port + do + port_bdep_tree "${port}" $(( ${2:-0} + 1 )) + done } # Display a tree of all runtime dependencies. Individual @@ -263,12 +261,10 @@ port_rdep_tree() { port="${1##/usr/ports/}" printf "%${2}s%s\n" "" "${port}" - ( cd /usr/ports/${port} - make run-depends-list | sort -u | while read port - do - rdep_tree "${port}" $(( ${2:-0} + 1 )) - done - ) + chmake "${port}" run-depends-list | sort -u | while read port + do + port_rdep_tree "${port}" $(( ${2:-0} + 1 )) + done } ######## -- 2.45.0 From 8b1a43ae32df62148799290fcd503e0248f29943 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 04:45:24 -0500 Subject: [PATCH 14/16] worlds/i386/VITANI: import config --- worlds/i386/VITANI/config/VITANI | 193 ++++++++++++++++++++++++++++ worlds/i386/VITANI/config/make.conf | 36 ++++++ worlds/i386/VITANI/config/src.conf | 31 +++++ 3 files changed, 260 insertions(+) create mode 100644 worlds/i386/VITANI/config/VITANI create mode 100644 worlds/i386/VITANI/config/make.conf create mode 100644 worlds/i386/VITANI/config/src.conf diff --git a/worlds/i386/VITANI/config/VITANI b/worlds/i386/VITANI/config/VITANI new file mode 100644 index 0000000..4cac7ea --- /dev/null +++ b/worlds/i386/VITANI/config/VITANI @@ -0,0 +1,193 @@ +# +# GENERIC -- Generic kernel configuration file for FreeBSD/i386 +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.519.2.4.2.2 2009/11/09 23:48:01 kensmith Exp $ + +cpu I586_CPU +cpu I686_CPU +ident VITANI + +# To statically compile in device wiring instead of /boot/device.hints +#hints "GENERIC.hints" # Default places to look for devices. + +# Use the following to compile in values accessible to the kernel +# through getenv() (or kenv(1) in userland). The format of the file +# is 'variable=value', see kenv(1) +# +# env "GENERIC.env" + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty) +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework +options FLOWTABLE # per-cpu routing cache +#options KDTRACE_HOOKS # Kernel DTrace hooks + +# CPU frequency control +device cpufreq + +# Bus support. +device acpi +device eisa +device pci + +# ATA and ATAPI devices +device ata +device atadisk # ATA disk drives +options ATA_STATIC_ID # Static device numbering + +# SCSI peripherals +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) + +# atkbdc0 controls both the keyboard and the PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse + +device kbdmux # keyboard multiplexer + +device vga # VGA video card driver + +device splash # Splash screen and screen saver support + +# syscons is the default console driver, resembling an SCO console +device sc + +device agp # support several AGP chipsets + +# Power management support (see NOTES for more options) +#device apm +# Add suspend/resume support for the i8254. +device pmtimer + +# PCCARD (PCMCIA) support +# PCMCIA and cardbus bridge support +device cbb # cardbus (yenta) bridge +device pccard # PC Card (16-bit) bus +device cardbus # CardBus (32-bit) bus + +# Serial (COM) ports +device uart # Generic UART driver + +# PCI Ethernet NICs. +device em # Intel PRO/1000 Gigabit Ethernet Family + +# PCI Ethernet NICs that use the common MII bus controller code. +# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! +device miibus # MII bus support +device dc # DEC/Intel 21143 and various workalikes +device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device rl # RealTek 8129/8139 +device vr # VIA Rhine, Rhine II +device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') + +# ISA Ethernet NICs. pccard NICs included. +device ed # NE[12]000, SMC Ultra, 3c503, DS8390 cards +device xe # Xircom pccard Ethernet + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +device tun # Packet tunnel. +device pty # BSD-style compatibility pseudo ttys +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + +# USB support +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices +device uhid # "Human Interface Devices" +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +# USB Serial devices +device u3g # USB-based 3G modems (Option, Huawei, Sierra) + +# ===== Vitani's additions ==== + +maxusers 0 + +options VESA +options SC_PIXEL_MODE +options HZ=100 +options DEVICE_POLLING + +# PacketFilter support +device pf +device pflog +device pfsync + +# AltQ +options ALTQ +options ALTQ_CBQ +options ALTQ_RED +options ALTQ_RIO +options ALTQ_HFSC +options ALTQ_PRIQ diff --git a/worlds/i386/VITANI/config/make.conf b/worlds/i386/VITANI/config/make.conf new file mode 100644 index 0000000..6c1e3bc --- /dev/null +++ b/worlds/i386/VITANI/config/make.conf @@ -0,0 +1,36 @@ +# Compilation tunes +CFLAGS+=-O2 -pipe +COPTFLAGS+=-O2 -pipe +CPUTYPE?=c3-2 + +# Global knobs +NO_PROFILE=yes +WITHOUT_X11=yes + +# Kernel build configuration +KERNCONF=VITANI + +# Caching proxy for fetches +http_proxy=http://gateway.cyberleo.net:46565 +ftp_proxy=http://gateway.cyberleo.net:46565 + +# Inline limit warnings? +# Userland: +#NO_WERROR=yes +# Kernel: Just turn off inline warnings +#WERROR=-Wno-inline -Werror +# Kernel: Don't error on any warning +#WERROR=-Wno-error +# Kernel: -Werror and -Wno-error both fail when -Os -march=c3-2; use empty +#WERROR= + +# Read-only ports tree +DISTDIR=/var/ports/distfiles +PACKAGES=/var/ports/packages +WRKDIRPREFIX=/usr/obj + +.if ${.CURDIR:M*/devel/glib20} + USE_LOCAL_MK= + STRIP_PERL5_RUN= + STRIP_PYTHON_RUN= +.endif diff --git a/worlds/i386/VITANI/config/src.conf b/worlds/i386/VITANI/config/src.conf new file mode 100644 index 0000000..6cd8755 --- /dev/null +++ b/worlds/i386/VITANI/config/src.conf @@ -0,0 +1,31 @@ +#MODULES_OVERRIDE=accf_data accf_dns accf_http acpi/acpi acpi/acpi_video acpi/acpi_wmi agp aio aout ata/atacard ata/atacore ata/atadisk ata/ataisa ata/atapci ata/atapci/chipsets/atavia ata/atapicam ata/atapicd ata/atausb cd9660_iconv ciss crypto dtrace/dtmalloc dtrace/dtnfsclient dtrace/dtrace dtrace/dtrace_test dtrace/dtraceall dtrace/lockstat dtrace/profile dtrace/prototype fdescfs geom/geom_bde geom/geom_bsd geom/geom_cache geom/geom_ccd geom/geom_concat geom/geom_eli geom/geom_fox geom/geom_gate geom/geom_journal geom/geom_label geom/geom_linux_lvm geom/geom_mbr geom/geom_mirror geom/geom_multipath geom/geom_nop geom/geom_part/geom_part_apm geom/geom_part/geom_part_bsd geom/geom_part/geom_part_ebr geom/geom_part/geom_part_gpt geom/geom_part/geom_part_mbr geom/geom_part/geom_part_pc98 geom/geom_part/geom_part_vtoc8 geom/geom_pc98 geom/geom_raid3 geom/geom_shsec geom/geom_stripe geom/geom_sunlabel geom/geom_uzip geom/geom_vinum geom/geom_virstor geom/geom_vol_ffs geom/geom_zero hpfs hwpmc i2c/controllers/viapm ip_mroute_mod ipdivert ipfilter ipfw ipfw_nat iscsi/initiator libalias/libalias libalias/modules/cuseeme libalias/modules/dummy libalias/modules/ftp libalias/modules/irc libalias/modules/nbt libalias/modules/pptp libalias/modules/skinny libalias/modules/smedia libiconv libmbpool libmchain linprocfs linsysfs linux mac_biba mac_bsdextended mac_ifoff mac_lomac mac_mls mac_none mac_partition mac_portacl mac_seeotheruids mac_stub mac_test md mqueue msdosfs_iconv netgraph/UI netgraph/async netgraph/atm/atm netgraph/atm/atmbase netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/atmllc netgraph/bpf netgraph/bridge netgraph/car netgraph/cisco netgraph/deflate netgraph/device netgraph/echo netgraph/eiface netgraph/etf netgraph/ether netgraph/ether_echo netgraph/fec netgraph/frame_relay netgraph/gif netgraph/gif_demux netgraph/hole netgraph/hub netgraph/iface netgraph/ip_input netgraph/ipfw netgraph/ksocket netgraph/l2tp netgraph/lmi netgraph/mppc netgraph/nat netgraph/netflow netgraph/netgraph netgraph/one2many netgraph/pipe netgraph/ppp netgraph/pppoe netgraph/pptpgre netgraph/pred1 netgraph/rfc1490 netgraph/socket netgraph/source netgraph/split netgraph/sppp netgraph/tag netgraph/tcpmss netgraph/tee netgraph/tty netgraph/vjc netgraph/vlan ntfs ntfs_iconv nullfs opensolaris padlock portalfs rc4 reiserfs smbfs sound/driver/via8233 sound/sound speaker splash/bmp splash/pcx tmpfs udf udf_iconv unionfs usb/ohci usb/quirk usb/template usb/u3g usb/udbp usb/uhid usb/ukbd usb/ulpt usb/umass usb/umodem usb/ums usb/usfs vkbd xfs zfs zlib + +WITHOUT_AMD = yes +WITHOUT_ATM = yes +WITHOUT_AUTHPF = yes +WITHOUT_BLUETOOTH = yes +WITHOUT_CALENDAR = yes +WITHOUT_CTM = yes +WITHOUT_CVS = yes +WITHOUT_DICT = yes +WITHOUT_EXAMPLES = yes +WITHOUT_FLOPPY = yes +WITHOUT_FREEBSD_UPDATE = yes +WITHOUT_GAMES = yes +WITHOUT_HTML = yes +WITHOUT_I4B = yes +WITHOUT_INFO = yes +WITHOUT_LPR = yes +WITHOUT_NCP = yes +WITHOUT_NDIS = yes +WITHOUT_NIS = yes +WITHOUT_PROFILE = yes +WITHOUT_RCMDS = yes +WITHOUT_RCS = yes +#WITHOUT_SENDMAIL = yes +WITHOUT_SHAREDOCS = yes +WITHOUT_SLIP = yes +WITHOUT_SYSINSTALL = yes +WITHOUT_TELNET = yes +WITHOUT_WIRELESS = yes + -- 2.45.0 From 5d5f369353b015a29fc7bd14e50af04763551033 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sun, 17 Oct 2010 04:46:41 -0500 Subject: [PATCH 15/16] worlds/amd64/SS4200: import config --- worlds/amd64/SS4200/config/SS4200 | 127 +++++++++++++++++++++++++++ worlds/amd64/SS4200/config/make.conf | 36 ++++++++ worlds/amd64/SS4200/config/src.conf | 41 +++++++++ 3 files changed, 204 insertions(+) create mode 100644 worlds/amd64/SS4200/config/SS4200 create mode 100644 worlds/amd64/SS4200/config/make.conf create mode 100644 worlds/amd64/SS4200/config/src.conf diff --git a/worlds/amd64/SS4200/config/SS4200 b/worlds/amd64/SS4200/config/SS4200 new file mode 100644 index 0000000..5be54b0 --- /dev/null +++ b/worlds/amd64/SS4200/config/SS4200 @@ -0,0 +1,127 @@ +# Kernel config for Intel SS4200 + +cpu HAMMER +ident SS4200 + +# I still get interleaved kernel printfs sometimes +options PRINTF_BUFR_SIZE=256 # Prevent printf output being interspersed. + +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols + +options SCHED_ULE # ULE scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty) +options COMPAT_FREEBSD32 # Compatible with i386 binaries +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options P1003_1B_SEMAPHORES # POSIX-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. +options KBD_INSTALL_CDEV # install a CDEV entry in /dev +options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) +options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework +options FLOWTABLE # per-cpu routing cache +#options KDTRACE_FRAME # Ensure frames are compiled in +#options KDTRACE_HOOKS # Kernel DTrace hooks +options INCLUDE_CONFIG_FILE # Include this file in kernel + +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel + +# CPU frequency control +device cpufreq + +# Bus support. +device acpi +device pci + +# ATA and ATAPI devices +device ata +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +options ATA_STATIC_ID # Static device numbering + +# SCSI peripherals +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device pass # Passthrough device (direct SCSI access) +device ses # SCSI Environmental Services (and SAF-TE) + +# atkbdc0 controls both the keyboard and the PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse + +device kbdmux # keyboard multiplexer + +device vga # VGA video card driver + +device splash # Splash screen and screen saver support + +# syscons is the default console driver, resembling an SCO console +device sc + +device agp # support several AGP chipsets + +# Serial (COM) ports +device uart # Generic UART driver + +# PCI Ethernet NICs. +device em # Intel PRO/1000 Gigabit Ethernet Family + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +device vlan # 802.1Q VLAN support +device tun # Packet tunnel. +device pty # BSD-style compatibility pseudo ttys +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying (translation) +device firmware # firmware assist module + +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + +# USB support +options USB_DEBUG # enable debug msgs +device uhci # UHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device usb # USB Bus (required) +#device udbp # USB Double Bulk Pipe devices +device uhid # "Human Interface Devices" +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse diff --git a/worlds/amd64/SS4200/config/make.conf b/worlds/amd64/SS4200/config/make.conf new file mode 100644 index 0000000..02d8d81 --- /dev/null +++ b/worlds/amd64/SS4200/config/make.conf @@ -0,0 +1,36 @@ +# Compilation tunes +CFLAGS+=-O2 -pipe +COPTFLAGS+=-O2 -pipe +CPUTYPE?=nocona + +# Global knobs +NO_PROFILE=yes +WITHOUT_X11=yes + +# Kernel build configuration +KERNCONF=SS4200 + +# Caching proxy for fetches +http_proxy=http://gateway.cyberleo.net:46565 +ftp_proxy=http://gateway.cyberleo.net:46565 + +# Inline limit warnings? +# Userland: +#NO_WERROR=yes +# Kernel: Just turn off inline warnings +#WERROR=-Wno-inline -Werror +# Kernel: Don't error on any warning +#WERROR=-Wno-error +# Kernel: -Werror and -Wno-error both fail when -Os -march=c3-2; use empty +#WERROR= + +# Read-only ports tree +DISTDIR=/var/ports/distfiles +PACKAGES=/var/ports/packages +WRKDIRPREFIX=/usr/obj + +.if ${.CURDIR:M*/devel/glib20} + USE_LOCAL_MK= + STRIP_PERL5_RUN= + STRIP_PYTHON_RUN= +.endif diff --git a/worlds/amd64/SS4200/config/src.conf b/worlds/amd64/SS4200/config/src.conf new file mode 100644 index 0000000..9fb5b6c --- /dev/null +++ b/worlds/amd64/SS4200/config/src.conf @@ -0,0 +1,41 @@ +# Kernel knobs + +MODULES_OVERRIDE=accf_data accf_dns accf_http ahci aio cd9660_iconv coretemp dtrace/dtrace dtrace/dtrace_test dtrace/dtraceall ext2fs fdescfs geom/geom_bde geom/geom_bsd geom/geom_cache geom/geom_ccd geom/geom_concat geom/geom_eli geom/geom_fox geom/geom_gate geom/geom_journal geom/geom_linux_lvm geom/geom_mbr geom/geom_mirror geom/geom_multipath geom/geom_nop geom/geom_part/geom_part_apm geom/geom_part/geom_part_pc98 geom/geom_part/geom_part_vtoc8 geom/geom_pc98 geom/geom_raid3 geom/geom_shsec geom/geom_stripe geom/geom_sunlabel geom/geom_uzip geom/geom_vinum geom/geom_virstor geom/geom_vol_ffs geom/geom_zero iscsi/initiator linprocfs linsysfs linux mqueue msdosfs_iconv netgraph/netgraph netgraph/UI netgraph/async netgraph/bpf netgraph/bridge netgraph/car netgraph/cisco netgraph/deflate netgraph/device netgraph/echo netgraph/eiface netgraph/etf netgraph/ether netgraph/ether_echo netgraph/fec netgraph/frame_relay netgraph/gif netgraph/gif_demux netgraph/hole netgraph/hub netgraph/iface netgraph/ip_input netgraph/ipfw netgraph/ksocket netgraph/l2tp netgraph/lmi netgraph/mppc netgraph/nat netgraph/netflow netgraph/one2many netgraph/pipe netgraph/ppp netgraph/pppoe netgraph/pptpgre netgraph/pred1 netgraph/rfc1490 netgraph/socket netgraph/source netgraph/split netgraph/sppp netgraph/tag netgraph/tcpmss netgraph/tee netgraph/tty netgraph/vjc netgraph/vlan nullfs opensolaris pf pflog portalfs reiserfs siis smbfs speaker dtrace/systrace sysvipc/sysvmsg sysvipc/sysvsem sysvipc/sysvshm tmpfs udf udf_iconv unionfs usb/usfs xfs zfs zlib + +# Userland knobs + +WITHOUT_AMD = yes +WITHOUT_ATM = yes +WITHOUT_AUTHPF = yes +WITHOUT_BIND = yes +WITH_BIND_LIBS = yes +WITH_BIND_LIBS_LWRES = yes +WITH_BIND_UTILS = yes +WITHOUT_BLUETOOTH = yes +WITHOUT_CALENDAR = yes +WITHOUT_CTM = yes +WITHOUT_CVS = yes +WITHOUT_DICT = yes +WITHOUT_EXAMPLES = yes +WITHOUT_FLOPPY = yes +WITHOUT_FREEBSD_UPDATE = yes +WITHOUT_GAMES = yes +WITHOUT_HTML = yes +WITHOUT_I4B = yes +WITHOUT_INFO = yes +WITHOUT_LPR = yes +WITHOUT_NCP = yes +WITHOUT_NDIS = yes +WITHOUT_NIS = yes +WITHOUT_PPP = yes +WITHOUT_PROFILE = yes +WITHOUT_RCMDS = yes +WITHOUT_RCS = yes +WITHOUT_RESCUE = yes +WITHOUT_ROUTED = yes +WITHOUT_SENDMAIL = yes +WITHOUT_SHAREDOCS = yes +WITHOUT_SLIP = yes +WITHOUT_SYSINSTALL = yes +WITHOUT_TELNET = yes +WITHOUT_WIRELESS = yes -- 2.45.0 From 32d2fcb13a711ad846964c80d4ffca67b2bd58f2 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Tue, 7 Dec 2010 13:31:54 -0600 Subject: [PATCH 16/16] script/makepkg: stray colon in PATH caused forkbomb during devel/glib20 build --- script/makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/makepkg b/script/makepkg index 70cc1de..367afaa 100755 --- a/script/makepkg +++ b/script/makepkg @@ -505,7 +505,7 @@ chroot_env=" USER=root HOME=/root LOGNAME=root -PATH=:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin SHELL=/bin/sh TERM=${TERM} " -- 2.45.0