Add updating built packages to sysroot initialization

bap-builder/PackageMode.go

@@ -366,6 +366,15 @@ func buildSinglePackage(
 			packageJsonPaths = append(packageJsonPaths, paths...)
 		}
 		if *cmdLine.BuildDepsOn {
+			if !*cmdLine.BuildDeps {
+				value, err := isPackageWithDepsInSysroot(packageName, &contextManager, platformString)
+				if err != nil {
+					return err
+				}
+				if !value {
+					return fmt.Errorf("--build-deps-on set but base package or its dependencies are not in sysroot")
+				}
+			}
 			paths, err := contextManager.GetDepsOnJsonDefPaths(packageName)
 			if err != nil {
 				return err
@@ -505,3 +514,31 @@ func checkSysrootDirs(platformString *bringauto_package.PlatformString) (error)
 	}
 	return nil
 }
+
+// arePackagesInSysroot
+// Returns true if packageName an its dependencies are in sysroot, else returns false.
+func isPackageWithDepsInSysroot(packageName string, contextManager *bringauto_context.ContextManager, platformString *bringauto_package.PlatformString) (bool, error) {
+	packageJsonPaths, err := contextManager.GetPackageWithDepsJsonDefPaths(packageName)
+	if err != nil {
+		return false, err
+	}
+	configList, err := prepareConfigs(packageJsonPaths)
+	if err != nil {
+		return false, err
+	}
+
+	sysroot := bringauto_sysroot.Sysroot{
+		IsDebug:        false,
+		PlatformString: platformString,
+	}
+	err = bringauto_prerequisites.Initialize(&sysroot)
+
+	for _, config := range configList {
+		packName := config.Package.GetShortPackageName()
+		if !sysroot.IsPackageInSysroot(packName) {
+			return false, nil
+		}
+	}
+
+	return true, nil
+}

modules/bringauto_sysroot/BuiltPackages.go

@@ -17,11 +17,6 @@ type BuiltPackages struct {
 }
 
 func (builtPackages *BuiltPackages) AddToBuiltPackages(packageName string) error {
-	err := builtPackages.updateBuiltPackages()
-	if err != nil {
-		return err
-	}
-
 	builtPackages.Packages = append(builtPackages.Packages, packageName)
 	bytes, err := json.Marshal(builtPackages.Packages)
 	if err != nil {
@@ -31,7 +26,7 @@ func (builtPackages *BuiltPackages) AddToBuiltPackages(packageName string) error
 	return err
 }
 
-func (builtPackages *BuiltPackages) updateBuiltPackages() error {
+func (builtPackages *BuiltPackages) UpdateBuiltPackages() error {
 	bytes, err := os.ReadFile(path.Join(sysrootDirectoryName, jsonFileName))
 	if err != nil {
 		return nil

modules/bringauto_sysroot/Sysroot.go

@@ -11,6 +11,7 @@ import (
 	"io/fs"
 	"path/filepath"
 	"strings"
+	"slices"
 )
 
 const (
@@ -42,6 +43,10 @@ func (sysroot *Sysroot) CheckPrerequisites(args *bringauto_prerequisites.Args) e
 	if sysroot.PlatformString == nil {
 		return fmt.Errorf("sysroot PlatformString cannot be nil")
 	}
+	err := sysroot.builtPackages.UpdateBuiltPackages()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -67,6 +72,15 @@ func (sysroot *Sysroot) CopyToSysroot(source string, packageName string) error {
 	return nil
 }
 
+// ArePackagesInSysroot
+// Returns true if all expectedPackages are built in sysroot, else false.
+func (sysroot *Sysroot) IsPackageInSysroot(packageName string) bool {
+	if slices.Contains(sysroot.builtPackages.Packages, packageName) {
+		return true
+	}
+	return false
+}
+
 // checkForOverwritingFiles
 // Checks if in dirPath directory are not files which are also in sysroot directory. If there are
 // some, then prints Error with listing problematic files and returns non nil error. Else returns