build: use BRVER for buildroot version

Explicitly define which version of buildroot should be used. It solves problem when there is more than one directory matching build/buildroot-2* Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

build: use BRVER for buildroot version
Explicitly define which version of buildroot should be used. It solves problem when there is more than one directory matching build/buildroot-2* Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
ecde84a6 · Adam Wujek · 304dcae8 · ecde84a6 · ecde84a6 · ecde84a6
Commit ecde84a6 authored Nov 01, 2016 by Adam Wujek 💬
5 changed files
--- a/build/scripts/wrs_build_wraprootfs
+++ b/build/scripts/wrs_build_wraprootfs
@@ -22,7 +22,7 @@ DEVTAR="$WRS_BASE_DIR/../userspace/devices.tar.gz"
 TMPFS=$(mktemp -d /tmp/rootfs.XXXXXX)
 chmod a+rx $TMPFS

-rootfs_vanilla="$WRS_OUTPUT_DIR/build/buildroot-2016.02/output/target"
+rootfs_vanilla="$WRS_OUTPUT_DIR/build/buildroot-$BRVER/output/target"
 rootfs_override="$WRS_BASE_DIR/../userspace/rootfs_override"

 TMPSCRIPT=$(mktemp /tmp/rootfs-script.XXXXXX)

--- a/build/scripts/wrs_functions
+++ b/build/scripts/wrs_functions
@@ -101,7 +101,7 @@ wrs_unset_config () {

 # We'll need to set CROSS_COMPILE to the buildroot one, if unset
 wrs_default_compiler () {
-    hostdir=$WRS_OUTPUT_DIR/build/buildroot-2016.02/output/host
+    hostdir=$WRS_OUTPUT_DIR/build/buildroot-$BRVER/output/host
 	if [ -e $hostdir/usr/bin/arm-linux-gcc ]; then
 	    wrs_setenv_default CROSS_COMPILE $hostdir/usr/bin/arm-linux-
 	fi
@@ -182,8 +182,8 @@ else
 fi

 # buildroot definitions
-buildroot_zipname="buildroot-2016.02.tar.bz2"
-buildroot_dirname="buildroot-2016.02"
+buildroot_zipname="buildroot-$BRVER.tar.bz2"
+buildroot_dirname="buildroot-$BRVER"

 # and import the configuration variables
 . $WRS_CONFIG_DIR/.config
--- a/build/wrs_build-all
+++ b/build/wrs_build-all
@@ -48,6 +48,10 @@ fi

 export WRS_SCRIPTS_DIR=${WRS_BASE_DIR}/scripts

+# Export Buildroot version in use
+export BRVER="2016.02"
+
+
 ## Function that show a little help
 showhelp() {
 	echo ""

--- a/userspace/dot-config/Makefile
+++ b/userspace/dot-config/Makefile
@@ -45,7 +45,9 @@ conf:
 	$(CC) $(CFLAGS) -o $@ $(CONF_LOC)/conf.c \
 		$(CONF_LOC)/zconf.tab.c

-CURSES_BUILD := $(wildcard $(WRS_OUTPUT_DIR)/build/buildroot-2*)
+# if BRVER not defined use a wildcard
+BRVER?=2*
+CURSES_BUILD := $(wildcard $(WRS_OUTPUT_DIR)/build/buildroot-$(BRVER))
 CURSES_BUILD := $(wildcard $(CURSES_BUILD)/output/build/ncurses-*)

 lxdialog := $(CONF_LOC)/lxdialog/checklist.c

--- a/userspace/snmpd/Makefile
+++ b/userspace/snmpd/Makefile
-
-SNMP_BUILD := $(wildcard $(WRS_OUTPUT_DIR)/build/buildroot-2*)
+# if BRVER not defined use a wildcard
+BRVER?=2*
+SNMP_BUILD := $(wildcard $(WRS_OUTPUT_DIR)/build/buildroot-$(BRVER))
 SNMP_BUILD := $(wildcard $(SNMP_BUILD)/output/build/netsnmp-*)

 NET_SNMP_CONFIG ?= $(SNMP_BUILD)/net-snmp-config