Changeset 13668 in hybrid for branches/releng-11/nanobsd


Ignore:
Timestamp:
Dec 19, 2016, 10:59:03 AM (8 years ago)
Author:
rick
Message:

First make the symlinks and _then_ check the config. Else defaults will be used (and user options ignored, since ouptut is discarded)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/releng-11/nanobsd/tools/package-build.sh

    r13662 r13668  
    3232        # Setup poudriere ports environment
    3333        poudriere ports -c -F -f none -p default -M /usr/local/poudriere/ports/default
    34 
    35         # Configure new build options
    36         poudriere options -j wlpkgbuild11_0 -p default -z node -f ${poudriere_pkglist_file}
    3734}
    3835
    3936packages_config() {
    40         # Configure all build options
    41         poudriere options -j wlpkgbuild11_0 -p default -z node -c ${*:- -f ${poudriere_pkglist_file}}
     37        # Configure build options
     38        poudriere options -j wlpkgbuild11_0 -p default -z node ${1:+-c} ${*:- -f ${poudriere_pkglist_file}}
    4239}
    4340
     
    7572        packages_initenv
    7673        packages_refresh
     74        shift; packages_config
    7775elif [ "x$1" = "xrefresh" ]; then
    7876        packages_refresh
Note: See TracChangeset for help on using the changeset viewer.