Changeset 14123 in hybrid for branches/releng-11

Timestamp:

Apr 10, 2018, 9:39:27 PM (7 years ago)

Author:

rick

Message:

Fix duplicated entry locations

Make options and port selected are confusingly specified or generated at
multiple locations. Merging all back into cfg/nanobsd.wleiden configuration.

Location:

branches/releng-11/nanobsd

Files:

• cfg/wlpkgbuild-node-make.conf (deleted)
• tools/package-build.sh (modified) (4 diffs)

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

@@ -8 +8 @@
 . `dirname $0`/common.inc.sh
 
+
 cfg_dir=`dirname $0`/../cfg
 abs_cfg_dir=`cd $cfg_dir; pwd -P`
 
-poudriere_pkglist_file=${cfg_dir}/wlpkgbuild-default-node-pkglist
+# Wireless Leiden configuration file
+. $cfg_dir/nanobsd.wleiden
 
 
@@ -52 +54 @@
         POUDRIERE_OPTIONS=wlpkgbuild-node-options
 
-        # Clean old stuff (legacy directories)
+
+        # Clean old stuff (legacy directories & symlinks)
         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
+        # Generate new content
+        echo "$PKG_MAKE_CONF" > /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
         ln -s ${abs_cfg_dir}/$POUDRIERE_OPTIONS /usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS
 }
@@ -63 +66 @@
 
 packages_build() {
-        poudriere bulk -j wlpkgbuild -p default -z node -f ${poudriere_pkglist_file}
+        poudriere bulk -j wlpkgbuild -p default -z node $*
 }
 
-# Make package list
-. $cfg_dir/nanobsd.wleiden
-echo $PACKAGE_LIST | tr " " "\n" > ${poudriere_pkglist_file}
 
 
@@ -77 +77 @@
         packages_refresh
 elif [ "x$1" = "xconfig" ]; then
+        packages_refresh
         packages_config $*
 elif [ "x$1" = "xrebuild" ]; then
         packages_refresh
-        packages_build
+        packages_build $PACKAGE_LIST
 elif [ "x$1" = "xbuild" ]; then
-        packages_build
+        packages_refresh
+        packages_build $PACKAGE_LIST
 else
         echo "Usage $0 <initenv|config|rebuild|build>"