Changeset 13657 in hybrid for branches

Timestamp:

Dec 16, 2016, 9:34:57 PM (8 years ago)

Author:

rick

Message:

Starting to migrate tree to 11_0 branch

Location:

branches/releng-11/nanobsd

Files:

• cfg/nanobsd.wleiden (modified) (1 diff)
• cfg/wlpkgbuild11_0-default-node-pkglist (moved) (moved from branches/releng-11/nanobsd/cfg/wlpkgbuild10_2-default-node-pkglist )
• cfg/wlpkgbuild11_0-node-make.conf (moved) (moved from branches/releng-11/nanobsd/cfg/wlpkgbuild10_2-node-make.conf )
• cfg/wlpkgbuild11_0-node-options (moved) (moved from branches/releng-11/nanobsd/cfg/wlpkgbuild10_2-node-options )
• tools/package-build.sh (modified) (4 diffs)

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

@@ -36 +36 @@
 NANO_PACKAGE_LIST="*"
 
-NANO_PACKAGE_REPOS="/usr/local/poudriere/data/packages/wlpkgbuild10_2-default-node/"
+NANO_PACKAGE_REPOS="/usr/local/poudriere/data/packages/wlpkgbuild11_0-default-node/"
 
 

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

@@ -9 +9 @@
 
 cfg_dir=`dirname $0`/../cfg
-poudriere_pkglist_file=${cfg_dir}/wlpkgbuild10_2-default-node-pkglist
+poudriere_pkglist_file=${cfg_dir}/wlpkgbuild11_0-default-node-pkglist
 
 
@@ -19 +19 @@
 
         # Setup poudriere build environment
-        poudriere jail -c -j wlpkgbuild10_2 -v 10.2-RELEASE -a i386
+        poudriere jail -c -j wlpkgbuild11_0 -v 11.0-RELEASE -a i386
 
         # Setup portshaker
@@ -33 +33 @@
 
         # Build options
-        poudriere options -j wlpkgbuild10_2 -p default -z node -f ${poudriere_pkglist_file}
+        poudriere options -j wlpkgbuild11_0 -p default -z node -f ${poudriere_pkglist_file}
 }
 
 packages_refresh() {
         # Install new package options
-        POUDRIERE_MAKE_CONF_FILE=wlpkgbuild10_2-node-make.conf
-        POUDRIERE_OPTIONS=wlpkgbuild10_2-node-options
+        POUDRIERE_MAKE_CONF_FILE=wlpkgbuild11_0-node-make.conf
+        POUDRIERE_OPTIONS=wlpkgbuild11_0-node-options
 
         if [ -d "/usr/local/etc/poudriere.d/$POUDRIERE_OPTIONS" ]; then
@@ -51 +51 @@
 
 packages_build() {
-        poudriere bulk -j wlpkgbuild10_2 -p default -z node -f ${poudriere_pkglist_file}
+        poudriere bulk -j wlpkgbuild11_0 -p default -z node -f ${poudriere_pkglist_file}
 }