update defaultPackagesList

HelperResources/CommonResources

@@ -1463,18 +1463,36 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 		firstCompatibleVersion=$(cat "$scriptDir/firstCompatibleVersion")
 	# no first compatible version specified - use the default
 	else
-		firstCompatibleVersion='v2.71'
+		firstCompatibleVersion='v3.10'
 	fi
+	if [ -f "$scriptDir/obsoleteVersion" ]; then
+		obsoleteVersion=$(cat "$scriptDir/obsoleteVersion")
+		versionStringToNumber $obsoleteVersion
+		obsoleteVersionNumber=$versionNumber
+	else
+		obsoleteVersionNumber=9999999999999999
+	fi
+
 	versionStringToNumber $firstCompatibleVersion
 	firstCompatibleVersionNumber=$versionNumber
 	if (( $venusVersionNumber < $firstCompatibleVersionNumber )); then
 		setInstallFailed $EXIT_INCOMPATIBLE_VERSION "$venusVersion before first compatible $firstCompatibleVersion"
-	elif [ -f "$scriptDir/obsoleteVersion" ]; then
-		obsoleteVersion=$(cat "$scriptDir/obsoleteVersion")
-		versionStringToNumber $obsoleteVersion
-		obsoleteVersionNumber=$versionNumber
-		if (( $venusVersionNumber >= $obsoleteVersionNumber )); then
+	elif (( $venusVersionNumber >= $obsoleteVersionNumber )); then
 			setInstallFailed $EXIT_INCOMPATIBLE_VERSION "$venusVersion after last compatible $obsoleteVersion"
+	# validate firmware version if valid firmware version file exists
+	elif [ -e "$scriptDir/validFirmwareVersions" ]; then
+		incompatibleVersion=false
+		if ! grep -xq "$venusVersion" "$scriptDir/validFirmwareVersions" ; then
+			incompatibleVersion=true
+		fi
+		# user can override this from command line (for testing new versions mainly)
+		if $incompatibleVersion && $userInteraction ; then
+			if yesNoPrompt "$venusVersion not in the valid firmware list proceed any way (y/n)? " ; then 
+				incompatibleVersion=false
+			fi
+		fi
+		if $incompatibleVersion ; then
+			setInstallFailed $EXIT_INCOMPATIBLE_VERSION "$venusVersion not in valid firmware list"
 		fi
 	fi
 

PackageDevelopmentGuidelines.md

@@ -775,11 +775,16 @@ If present **firstCompatibleVersion** identifies the first version that
 IS compatible with this package. E.g., if firstCompatibleVersion
 contains v8.0 and the current Venus OS version is v7.2, the package
 can't be installed.
+If **firstCompatibleVersion** is not present, SetupHelper uses v3.10 as the first compatible version.
 
 Note that if both **firstCompatibleVersion** and **obsoleteVersion** are
 included in the package directory, the obsoleteVersion must be greater
 than firstCompatibleVersion.
 
+If present **validFirmwareVersions** identifies all versions which have been
+tested as compatible with the package. It is a list of Venus OS versions, one per line.
+If this file is present, **firstCompatibleVersion** and **obsoleteVersion** are redundant.
+
 If the file **raspberryPiOnly** exists in the package directory, the
 platform (aka 'machine') MUST be raspberrypi2 or raspberrypi4. If not,
 installation will be blocked.

PackageManager.py

@@ -1954,6 +1954,18 @@ def UpdateVersionsAndFlags (self, doConflictChecks=False, doScriptPreChecks=Fals
 				self.SetIncompatible ("incompatible with " + VenusVersion)
 				compatible = False
 				doConflictChecks = False
+			elif os.path.exists (packageDir + "/validFirmwareVersions"):
+				with open(packageDir + "/validFirmwareVersions") as f:
+					lines = f.readlines ()
+					versionPresent = False
+					for line in lines:
+						if line.strip() == VenusVersion:
+							versionPresent = True
+							break
+					if not versionPresent:
+						self.SetIncompatible ("incompatible with " + VenusVersion)
+						compatible = False
+						doConflictChecks = False
 
 		# check to see if command line is needed for install
 		# the optionsRequired flag in the package directory indicates options must be set before a blind install

blindInstall/SetupHelperVersion

@@ -1 +1 @@
-v8.27~1
+v8.28

changes

@@ -1,3 +1,7 @@
+v8.28: (pending)
+	remove venus-os_ngrok from default package list
+	first compatible version is now v3.10
+
 v8.27:
 	support the change to QtQuick 2 first used in v3.60~18
 

defaultPackageList

@@ -24,5 +24,4 @@ DCSystemAggregator    pulquero      latest
 gatt-exec-server      pulquero      latest
 dbus-pi               pulquero      latest
 FroniusSmartmeter     SirUli        main
-venus-os_ngrok        mr-manuel     latest
 RemoteGPIO            Lucifer06     main

updatePackage

@@ -438,6 +438,10 @@ if [ "$globalEndAction" == "restore" ]; then
 		if [ -e "$backupVeLib" ]; then
 			mv -f "$backupVeLib" "$sourceVeLib"
 		fi
+		#### TODO: delayed implementaiton 
+		####if [ -e "$backupDirectory/validFirmwareVersions" ]; then
+		####	mv -f "$backupDirectory/validFirmwareVersions" "$sourceDirectory/validFirmwareVersions"
+		####fi
 		deleteNestedDirectories $backupDirectory
 	done
 	exit
@@ -494,6 +498,7 @@ for package in $packageList; do
 	versionIndependentFileSet="$workingFiles/VersionIndependent"
 	sourceVeLib="$sourceDirectory/velib_python"
 	workingVeLib="$workingDirectory/velib_python"
+	backupVeLib="$backupDirectory/velib_python"
 
     if [ ! -d "$sourceDirectory" ] || [ ! -f "$sourceDirectory/version" ]; then
         logMessage "WARNING: $sourceDirectory - not a package directory - skipping"
@@ -533,9 +538,9 @@ for package in $packageList; do
 	fi
 	if [ -f "$sourceDirectory/firstCompatibleVersion" ]; then
 		firstCompatibleVersion=$(cat "$sourceDirectory/firstCompatibleVersion")
-	# limit packages to v2.71 and newer
+	# limit packages to v3.10 and newer
 	else
-		firstCompatibleVersion='v2.71'
+		firstCompatibleVersion='v3.10'
 	fi
 	if versionStringToNumber $firstCompatibleVersion ; then
 		firstVersionNumber=$versionNumber
@@ -587,6 +592,15 @@ for package in $packageList; do
 	rm -f "$workingFiles"/*CHECK_ALT_ORIG
 	rm -f "$workingFiles"/*/*CHECK_ALT_ORIG
 
+	#### TODO: delayed implementaiton # create valid firmware version list
+	####rm -f "$workingDirectory/validFirmwareVersions"
+	####for (( i1 = 0; i1 < $stockVersionListLength; i1++ )); do
+	####	IFS=':' read version versionNumber <<< "${stockVersionList[$i1]}"
+	####	if (( versionNumber >= firstCompatibleVersionNumber )) && (( versionNumber < obsoleteVersionNumber )) ; then
+	####		echo $version >> "$workingDirectory/validFirmwareVersions"
+	####	fi
+	####done
+
 	# update velib_python
 	if [ -e "$workingVeLib" ]; then
 		beginProgress "updating velib_python"
@@ -1332,10 +1346,14 @@ for package in $packageList; do
 					mv "$sourceFiles" "$backupFiles"
 				fi
 				sourceVeLib="$sourceDirectory/velib_python"
-				workingVeLib="$workingDirectory/velib_python"
-				if [ -d "$workingVeLib" ]; then
-					mv -f "$workingVeLib" "$sourceVeLib"
+				backupVeLib="$backupDirectory/velib_python"
+				if [ -d "$sourceVeLib" ]; then
+					mv -f "$sourceVeLib" "$backupVeLib"
 				fi
+				#### TODO: delayed implementaiton 
+				####if [ -e "$sourceDirectory/validFirmwareVersions" ]; then
+				####	mv -f "$sourceDirectory/validFirmwareVersions" "$backupDirectory/validFirmwareVersions"
+				####fi
 			else
 				logMessage "$package: $backupName unchanged"
 			fi
@@ -1349,6 +1367,15 @@ for package in $packageList; do
 				logMessage "$package: removing HelperResources"
 				deleteNestedDirectories "$sourceDirectory/HelperResources"
 			fi
+			sourceVeLib="$sourceDirectory/velib_python"
+			workingVeLib="$backupDirectory/velib_python"
+			if [ -d "$workingVeLib" ]; then
+				mv -f "$workingVeLib" "$sourceVeLib"
+			fi
+			#### TODO: delayed implementaiton 
+			####if [ -e "$workingDirectory/validFirmwareVersions" ]; then
+			####	mv -f "$workingDirectory/validFirmwareVersions" "$sourceDirectory/validFirmwareVersions"
+			####fi
 			deleteNestedDirectories "$workingDirectory"
 			;;
 		*)

version

@@ -1 +1 @@
-v8.27
+v8.28