Changeset 13686 in hybrid for branches/releng-11

Timestamp:

Jan 5, 2017, 11:10:36 PM (8 years ago)

Author:

rick

Message:

Make buildenv (temponary) compatible with 10.3-RELEASE.

Need to debug some CF card read/write access slowness.

Location:

branches/releng-11/nanobsd

Files:

• cfg/nanobsd.wleiden (modified) (1 diff)
• cfg/wlpkgbuild10_3-default-node-pkglist (added)
• cfg/wlpkgbuild10_3-node-make.conf (copied) (copied from branches/releng-11/nanobsd/cfg/wlpkgbuild11_0-node-make.conf )
• cfg/wlpkgbuild10_3-node-options (copied) (copied from branches/releng-11/nanobsd/cfg/wlpkgbuild11_0-node-options )
• cfg/wlpkgbuild10_3-node-options/lang_perl5.24/options (modified) (1 diff)
• tools/package-build.sh (modified) (5 diffs)

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

@@ -36 +36 @@
 NANO_PACKAGE_LIST="*"
 
-NANO_PACKAGE_REPOS="/usr/local/poudriere/data/packages/wlpkgbuild11_0-default-node/"
+VERSION=$(uname -r | sed -e 's/-.*//g' -e 's/\./_/')
+NANO_PACKAGE_REPOS="/usr/local/poudriere/data/packages/wlpkgbuild${VERSION}-default-node/"
 
 

branches/releng-11/nanobsd/cfg/wlpkgbuild10_3-node-options/lang_perl5.24/options

@@ -1 +1 @@
 # This file is auto-generated by 'make config'.
-# Options for perl5-5.24.1.r4
-_OPTIONS_READ=perl5-5.24.1.r4
-_FILE_COMPLETE_OPTIONS_LIST=DEBUG GDBM MULTIPLICITY PERL_64BITINT PTHREAD SITECUSTOMIZE THREADS PERL_MALLOC
+# Options for perl5-5.24.1.r5
+_OPTIONS_READ=perl5-5.24.1.r5
+_FILE_COMPLETE_OPTIONS_LIST=DEBUG DTRACE GDBM MULTIPLICITY PERL_64BITINT PTHREAD SITECUSTOMIZE THREADS PERL_MALLOC
 OPTIONS_FILE_UNSET+=DEBUG
+OPTIONS_FILE_SET+=DTRACE
 OPTIONS_FILE_UNSET+=GDBM
 OPTIONS_FILE_SET+=MULTIPLICITY

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

@@ -10 +10 @@
 cfg_dir=`dirname $0`/../cfg
 abs_cfg_dir=`cd $cfg_dir; pwd -P`
-poudriere_pkglist_file=${cfg_dir}/wlpkgbuild11_0-default-node-pkglist
+
+version=$(uname -r | sed -e 's/-.*//g' -e 's/\./_/')
+
+poudriere_pkglist_file=${cfg_dir}/wlpkgbuild${version}-default-node-pkglist
 
 
@@ -20 +23 @@
 
         # Setup poudriere build environment
-        poudriere jail -c -j wlpkgbuild11_0 -v 11.0-RELEASE -a i386
+        poudriere jail -c -j wlpkgbuild${version} -v $(uname -r) -a i386
 
         # Setup portshaker
@@ -42 +45 @@
 packages_config() {
         # Configure build options
-        poudriere options -j wlpkgbuild11_0 -p default -z node ${1:+-c} ${*:- -f ${poudriere_pkglist_file}}
+        poudriere options -j wlpkgbuild${version} -p default -z node ${1:+-c} ${*:- -f ${poudriere_pkglist_file}}
 }
 
@@ -48 +51 @@
 packages_refresh() {
         # Install new package (symlink) options
-        POUDRIERE_MAKE_CONF_FILE=wlpkgbuild11_0-node-make.conf
-        POUDRIERE_OPTIONS=wlpkgbuild11_0-node-options
+        POUDRIERE_MAKE_CONF_FILE=wlpkgbuild${version}-node-make.conf
+        POUDRIERE_OPTIONS=wlpkgbuild${version}-node-options
 
         # Clean old stuff
@@ -67 +70 @@
 
 packages_build() {
-        poudriere bulk -j wlpkgbuild11_0 -p default -z node -f ${poudriere_pkglist_file}
+        poudriere bulk -j wlpkgbuild${version} -p default -z node -f ${poudriere_pkglist_file}
 }