Changeset 13662 in hybrid

Timestamp:

Dec 18, 2016, 11:54:40 AM (8 years ago)

Author:

rick

Message:

Migrate poudriere conf into repository layout, allowing edits of config parameters to be committed.

While here add option to edit config file.

File:

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

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

@@ -9 +9 @@
 
 cfg_dir=`dirname $0`/../cfg
+abs_cfg_dir=`cd $cfg_dir; pwd -P`
 poudriere_pkglist_file=${cfg_dir}/wlpkgbuild11_0-default-node-pkglist
 
@@ -32 +33 @@
         poudriere ports -c -F -f none -p default -M /usr/local/poudriere/ports/default
 
-        # Build options
+        # Configure new build options
         poudriere options -j wlpkgbuild11_0 -p default -z node -f ${poudriere_pkglist_file}
 }
 
+packages_config() {
+        # Configure all build options
+        poudriere options -j wlpkgbuild11_0 -p default -z node -c ${*:- -f ${poudriere_pkglist_file}}
+}
+
+
 packages_refresh() {
-        # Install new package options
+        # Install new package (symlink) options
         POUDRIERE_MAKE_CONF_FILE=wlpkgbuild11_0-node-make.conf
         POUDRIERE_OPTIONS=wlpkgbuild11_0-node-options
+
+        # Clean old stuff
+        if [ -d "/usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE" ]; then
+          rm -Rf /usr/local/etc/poudriere.d/$POUDRIERE_MAKE_CONF_FILE
+        fi
 
         if [ -d "/usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS" ]; then
@@ -45 +57 @@
         fi
 
-        cp ${cfg_dir}/$POUDRIERE_MAKE_CONF_FILE /usr/local/etc/poudriere.d
-        cp -R ${cfg_dir}/$POUDRIERE_OPTIONS /usr/local/etc/poudriere.d
+
+        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
 }
 
@@ -62 +75 @@
         packages_initenv
         packages_refresh
+elif [ "x$1" = "xrefresh" ]; then
+        packages_refresh
+elif [ "x$1" = "xconfig" ]; then
+        shift; packages_config $*
 elif [ "x$1" = "xrebuild" ]; then
         packages_refresh
@@ -68 +85 @@
         packages_build
 else
-        echo "Usage $0 <initenv|rebuild|build>"
+        echo "Usage $0 <initenv|config|rebuild|build>"
         exit 128
 fi