From c5a1f21d77072be01e25b5f769f3ce0a97dbbce8 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Mon, 23 Nov 2015 19:17:38 -0800 Subject: [PATCH 1/7] bugfix: dnsmasq not updating hostnames ( dnsmasq pid file has moved ) --- files/usr/local/bin/olsrd-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/usr/local/bin/olsrd-config b/files/usr/local/bin/olsrd-config index 35e2a5ae..b3f7f241 100755 --- a/files/usr/local/bin/olsrd-config +++ b/files/usr/local/bin/olsrd-config @@ -125,7 +125,7 @@ foreach (@tunnelnames) # add the nameservice plugin push @file, qq(\nLoadPlugin "olsrd_nameservice.so.0.3"\n); push @file, qq({\n); -push @file, qq( PlParam "sighup-pid-file" "/var/run/dnsmasq.pid"\n); +push @file, qq( PlParam "sighup-pid-file" "/var/run/dnsmasq/dnsmasq.pid"\n); push @file, qq( PlParam "interval" "30"\n); push @file, qq( PlParam "timeout" "300"\n); push @file, qq( PlParam "name-change-script" "touch /tmp/namechange"\n); From 46b49369d41dbbc4908b20db6f3aa3e78029a87e Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Mon, 23 Nov 2015 20:08:07 -0800 Subject: [PATCH 2/7] bugfix: firstboot now requires user interaction or -y flag to approve an overwrite. --- files/etc/config.ap/system | 2 +- files/etc/config.client/system | 2 +- files/etc/config.mesh/system | 2 +- files/etc/config.mesh_ap/system | 2 +- files/etc/config.router/system | 2 +- files/etc/config/system | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/files/etc/config.ap/system b/files/etc/config.ap/system index 0127dd7f..c60e3f27 100644 --- a/files/etc/config.ap/system +++ b/files/etc/config.ap/system @@ -11,7 +11,7 @@ config button config button option button 'reset' option action 'released' - option handler 'firstboot && reboot' + option handler 'firstboot -y && reboot' option min '12' option max '20' diff --git a/files/etc/config.client/system b/files/etc/config.client/system index 0127dd7f..c60e3f27 100644 --- a/files/etc/config.client/system +++ b/files/etc/config.client/system @@ -11,7 +11,7 @@ config button config button option button 'reset' option action 'released' - option handler 'firstboot && reboot' + option handler 'firstboot -y && reboot' option min '12' option max '20' diff --git a/files/etc/config.mesh/system b/files/etc/config.mesh/system index 0127dd7f..c60e3f27 100644 --- a/files/etc/config.mesh/system +++ b/files/etc/config.mesh/system @@ -11,7 +11,7 @@ config button config button option button 'reset' option action 'released' - option handler 'firstboot && reboot' + option handler 'firstboot -y && reboot' option min '12' option max '20' diff --git a/files/etc/config.mesh_ap/system b/files/etc/config.mesh_ap/system index 0127dd7f..c60e3f27 100644 --- a/files/etc/config.mesh_ap/system +++ b/files/etc/config.mesh_ap/system @@ -11,7 +11,7 @@ config button config button option button 'reset' option action 'released' - option handler 'firstboot && reboot' + option handler 'firstboot -y && reboot' option min '12' option max '20' diff --git a/files/etc/config.router/system b/files/etc/config.router/system index 0127dd7f..c60e3f27 100644 --- a/files/etc/config.router/system +++ b/files/etc/config.router/system @@ -11,7 +11,7 @@ config button config button option button 'reset' option action 'released' - option handler 'firstboot && reboot' + option handler 'firstboot -y && reboot' option min '12' option max '20' diff --git a/files/etc/config/system b/files/etc/config/system index 4e827de6..34acbea9 100644 --- a/files/etc/config/system +++ b/files/etc/config/system @@ -11,6 +11,6 @@ config button config button option button 'reset' option action 'released' - option handler 'firstboot && reboot' + option handler 'firstboot -y && reboot' option min '12' option max '20' From dc5df00d468b7d301a2b13ed3b349060a42e23dc Mon Sep 17 00:00:00 2001 From: AE6XE Date: Wed, 25 Nov 2015 20:43:27 -0800 Subject: [PATCH 3/7] feature: Add boardid for NS Loco M5 XW --- files/www/cgi-bin/perlfunc.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm index 6bc4c56b..209a0c10 100644 --- a/files/www/cgi-bin/perlfunc.pm +++ b/files/www/cgi-bin/perlfunc.pm @@ -1263,6 +1263,15 @@ sub hardware_info 'usechains' => 1, 'rfband' => '5800ubntus', }, + 'Ubiquiti Loco M XW' => { + 'name' => 'NanoStation Loco M5 XW', + 'comment' => 'NanoStation Loco M5 XW 0xe845 (in testing)', + 'supported' => '-2', + 'maxpower' => '23', + 'pwroffset' => '1', + 'usechains' => 1, + 'rfband' => '5800ubntus', + }, ); $boardid = hardware_boardid(); From 0c776ab9329d5401d8ddf28954d64a2a11ad20f3 Mon Sep 17 00:00:00 2001 From: AE6XE Date: Wed, 25 Nov 2015 21:23:52 -0800 Subject: [PATCH 4/7] fix: correct max power setting NS loco XW --- files/www/cgi-bin/perlfunc.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm index 209a0c10..ece85534 100644 --- a/files/www/cgi-bin/perlfunc.pm +++ b/files/www/cgi-bin/perlfunc.pm @@ -1263,15 +1263,15 @@ sub hardware_info 'usechains' => 1, 'rfband' => '5800ubntus', }, - 'Ubiquiti Loco M XW' => { + 'Ubiquiti Loco M XW' => { 'name' => 'NanoStation Loco M5 XW', 'comment' => 'NanoStation Loco M5 XW 0xe845 (in testing)', - 'supported' => '-2', - 'maxpower' => '23', - 'pwroffset' => '1', - 'usechains' => 1, - 'rfband' => '5800ubntus', - }, + 'supported' => '-2', + 'maxpower' => '22', + 'pwroffset' => '1', + 'usechains' => 1, + 'rfband' => '5800ubntus', + }, ); $boardid = hardware_boardid(); From 4d12a6f5359f1669a4b6487a123fdd3d6d58b6fa Mon Sep 17 00:00:00 2001 From: AE6XE Date: Wed, 25 Nov 2015 21:54:36 -0800 Subject: [PATCH 5/7] feature: include boardid for Rocket M5 XW --- files/www/cgi-bin/perlfunc.pm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/www/cgi-bin/perlfunc.pm b/files/www/cgi-bin/perlfunc.pm index ece85534..83fc8883 100644 --- a/files/www/cgi-bin/perlfunc.pm +++ b/files/www/cgi-bin/perlfunc.pm @@ -1272,6 +1272,15 @@ sub hardware_info 'usechains' => 1, 'rfband' => '5800ubntus', }, + 'Ubiquiti Rocket M XW' => { + 'name' => 'Rocket M5 XW', + 'comment' => 'Rocket M5 XW 0xe6b5 (in testing)', + 'supported' => '-2', + 'maxpower' => '22', + 'pwroffset' => '5', + 'usechains' => 1, + 'rfband' => '5800ubntus', + }, ); $boardid = hardware_boardid(); From 86bc3a6b55e8dbe3d5444504f5d41e5d05142195 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Mon, 30 May 2016 11:16:02 -0700 Subject: [PATCH 6/7] bugfix: Build script missing packages snmp,socat,xinet.d are required package as part of the build Conflicts: build/buildsteps/kconfig/003-packages Change-Id: Ibb68dec4a5e92f8ee8511d971f1189f1d6e8a9a2 --- build/buildsteps/001-prepbuild | 2 ++ build/buildsteps/kconfig/003-packages | 3 +++ 2 files changed, 5 insertions(+) diff --git a/build/buildsteps/001-prepbuild b/build/buildsteps/001-prepbuild index f313bf83..7a14d9dd 100755 --- a/build/buildsteps/001-prepbuild +++ b/build/buildsteps/001-prepbuild @@ -12,6 +12,8 @@ cat feeds.conf.default >> feeds.conf ./scripts/feeds install -a -p arednpackages ./scripts/feeds install snmpd ./scripts/feeds install ntpclient +./scripts/feeds install socat +./scripts/feeds install xinetd SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') diff --git a/build/buildsteps/kconfig/003-packages b/build/buildsteps/kconfig/003-packages index 9b1e9ce7..1772d5ef 100755 --- a/build/buildsteps/kconfig/003-packages +++ b/build/buildsteps/kconfig/003-packages @@ -80,4 +80,7 @@ CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_libiwinfo=y CONFIG_PACKAGE_socat=y CONFIG_PACKAGE_ntpclient=y +CONFIG_PACKAGE_curl=y +CONFIG_PACKAGE_libnetsnmp=y +CONFIG_PACKAGE_snmpd=y EOF From b8a9c1885098b818abacbcc7455e7eeddc16a9e3 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Sun, 29 May 2016 22:04:59 -0700 Subject: [PATCH 7/7] bugfix: buildsteps scripts if checks rework Checks for BUILD_SET_VERSION use wrong bracket type OSTYPE check wasn't portable to Ubuntu Change-Id: I0183f3beae068b8524dc4dff411203fdb3878e94 --- build/buildsteps/001-prepbuild | 2 +- build/buildsteps/003-buildimage.sh | 2 +- build/tests-prebuild.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/buildsteps/001-prepbuild b/build/buildsteps/001-prepbuild index 7a14d9dd..5fd43059 100755 --- a/build/buildsteps/001-prepbuild +++ b/build/buildsteps/001-prepbuild @@ -18,7 +18,7 @@ cat feeds.conf.default >> feeds.conf SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') -if ( -z "$BUILD_SET_VERSION" ); then +if [ ! -z "$BUILD_SET_VERSION" ]; then echo "$BUILD_SET_VERSION" > "$BUILDROOTBASE/files/etc/mesh-release" else echo "${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" > "$BUILDROOTBASE/files/etc/mesh-release" diff --git a/build/buildsteps/003-buildimage.sh b/build/buildsteps/003-buildimage.sh index e994be14..6e9122ac 100755 --- a/build/buildsteps/003-buildimage.sh +++ b/build/buildsteps/003-buildimage.sh @@ -26,7 +26,7 @@ rm -Rf staging_dir/* SHORT_COMMIT=$(echo "$GIT_COMMIT" | awk '{ string=substr($0, 1, 8); print string; }' ) SHORT_BRANCH=$(echo "$GIT_BRANCH" | awk 'match($0,"/"){print substr($0,RSTART+1)}') -if ( -z "$BUILD_SET_VERSION" ); then +if [ ! -z "$BUILD_SET_VERSION" ]; then MYBUILDNAME="$BUILD_SET_VERSION" else MYBUILDNAME="${SHORT_BRANCH}-${BUILD_NUMBER}-${SHORT_COMMIT}" diff --git a/build/tests-prebuild.sh b/build/tests-prebuild.sh index f50ec9ba..a45e897c 100755 --- a/build/tests-prebuild.sh +++ b/build/tests-prebuild.sh @@ -33,7 +33,7 @@ LICENSE -if [[ $OSTYPE == darwin* ]] +if [ "${OSTYPE#*darwin}" != "$OSTYPE" ] then export SCRIPTBASE=$(dirname $0) else