Changeset 14116 in hybrid for branches/releng-11

Timestamp:

Apr 10, 2018, 8:42:19 PM (7 years ago)

Author:

rick

Message:

Remove unused version specific package configuration building

Package building is solely done based on current buildbot release and ports heads tree.
Removing the version identifier makes it more easy to migrate to new minor releases.

Location:

branches/releng-11/nanobsd

Files:

• cfg/wlpkgbuild-default-node-pkglist (moved) (moved from branches/releng-11/nanobsd/cfg/wlpkgbuild11_1-default-node-pkglist )
• cfg/wlpkgbuild-node-make.conf (moved) (moved from branches/releng-11/nanobsd/cfg/wlpkgbuild11_1-node-make.conf )
• cfg/wlpkgbuild-node-options (moved) (moved from branches/releng-11/nanobsd/cfg/wlpkgbuild11_1-node-options )
• cfg/wlpkgbuild11_0-default-node-pkglist (deleted)
• cfg/wlpkgbuild11_0-node-make.conf (deleted)
• cfg/wlpkgbuild11_0-node-options (deleted)
• tools/package-build.sh (modified) (5 diffs)

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

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