Changeset 12218 in hybrid for branches

Timestamp:

Apr 4, 2013, 8:17:58 AM (12 years ago)

Author:

rick

Message:

Ports now uses different way of setting arguments.

Also see: ​https://wiki.freebsd.org/Ports/Options/OptionsNG#What_users_need_to_know

Location:

branches/releng-9/nanobsd

Files:

• cfg/nanobsd.wleiden (modified) (1 diff)
• tools/package-build.sh (modified) (3 diffs)

branches/releng-9/nanobsd/cfg/nanobsd.wleiden

@@ -62 +62 @@
 `
 # Package target
-# Dirty quirk to allow comments in part below
-PKG_MAKE_ARGS=`cat <<EOF | sed 's/#.*$//g' | xargs
-PACKAGES=$(dirname $NANO_PACKAGE_DIR)
-BATCH=yes PACKAGE_BUILDING=yes
-# www/py-cherrypy
-WITH_APACHE=yes
-# net-mgmt/net-snmp
-WITHOUT_PERL=yes
-WITHOUT_PERL_EMBEDDED=yes
-# net-mgmt/nagios-plugins
-WITH_FPING=yes
-# threads is broken in the version (atleast up to 9.0 - 20120213)
-# Should be fix in current version in linux, but for some reason
-# Not yet in BSD. We don't need threads
-WITHOUT_THREADS=yes
-# shells/bash-static
-WITH_SYSLOG=yes
-# net/mtr
-WITHOUT_X11=yes
-`
+PKG_MAKE_ARGS="PACKAGES=$(dirname $NANO_PACKAGE_DIR) BATCH=yes PACKAGE_BUILDING=yes"
+
+PKG_MAKE_CONF="
+# www/py-cherrypy         - include apache templating
+# net-mgmt/net-snmp       - no perl please (size)
+# net-mgmt/nagios-plugins - no threading (single CPU)
+# shells/bash-static      - logging via syslog
+# net/mtr                 - no X11 (no screen)
+OPTIONS_SET=    APACHE FPING SYSLOG
+OPTIONS_UNSET=  PERL PERL_EMBEDDED THREADS X11
+"
 
 ##NANO_PACKAGE_LIST=

branches/releng-9/nanobsd/tools/package-build.sh

@@ -18 +18 @@
 
 p_info Log directory ${LOGDIR}
-p_info Make options are:
+p_info Make arguments are:
 p_info `p_list ${PKG_MAKE_ARGS}`
+p_info Make configuration is:
+echo "${PKG_MAKE_CONF}" | sed 's/^/## /'
 
 # HACK: install our own ports _inside_ the normal ports dir
@@ -63 +65 @@
 
 # Build required packages
-MAKE="make ${PKG_MAKE_ARGS}"
+MAKE_CONF=`mktemp -t $(basename $0)`
+echo "${PKG_MAKE_CONF}" > $MAKE_CONF
+MAKE="make __MAKE_CONF=$MAKE_CONF ${PKG_MAKE_ARGS}"
 BUILD_LIST=''
 set `echo ${PACKAGE_LIST} | xargs -n1 -I% echo $PORTSDIR/%`
@@ -151 +155 @@
 fi
 
+# House keeping
+rm $MAKE_CONF
+