Changeset 14121 in hybrid

Timestamp:

Apr 10, 2018, 9:23:18 PM (7 years ago)

Author:

rick

Message:

Fix package configuration prompt at initenv

Packages should not be configured, causing all packages to be
re-valuated if package tree is not up2date.

Try to stick with boring defaults.

File:

• branches/releng-11/nanobsd/tools/package-build.sh (modified) (3 diffs)

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

@@ -43 +43 @@
 packages_config() {
         # Configure build options
-        poudriere options -j wlpkgbuild -z node ${1:+-c} ${*:- -f ${poudriere_pkglist_file}}
+        poudriere options -j wlpkgbuild -z node -c $*
 }
 
@@ -52 +52 @@
         POUDRIERE_OPTIONS=wlpkgbuild-node-options
 
-        # Clean old stuff
+        # Clean old stuff (legacy directories)
         rm -Rf /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
         rm -Rf /usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS
 
-
+        # Generate new symlinks
         ln -s ${abs_cfg_dir}/$POUDRIERE_MAKE_CONF_FILE /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
         ln -s ${abs_cfg_dir}/$POUDRIERE_OPTIONS /usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS
@@ -74 +74 @@
         packages_initenv
         packages_refresh
-        shift; packages_config
 elif [ "x$1" = "xrefresh" ]; then
         packages_refresh
 elif [ "x$1" = "xconfig" ]; then
-        shift; packages_config $*
+        packages_config $*
 elif [ "x$1" = "xrebuild" ]; then
         packages_refresh