smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cmd/mkinitfs: use filelist/osksdl

Browse Source
This commit is contained in:
Clayton Craft
2023-02-17 13:39:55 -08:00
parent e00e5faf6e
commit 2dd83da480
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/mkinitfs/main.go
View File

@@ -19,6 +19,7 @@ import (
"time" "time"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive" "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/osksdl"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/misc" "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/misc"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/deviceinfo" "gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/deviceinfo"
) )
@@ -484,15 +485,12 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
} }
} }
if misc.Exists("/usr/bin/osk-sdl") { osksdlFiles := osksdl.New(devinfo.MesaDriver)
log.Println("- Including FDE support") if filelist, err := osksdlFiles.List(); err != nil {
if fdeFiles, err := getFdeFiles(devinfo); err != nil {
return nil, err return nil, err
} else { } else if len(filelist) > 0 {
files = append(files, fdeFiles...) log.Println("- Including osk-sdl support")
} files = append(files, filelist...)
} else {
log.Println("- *NOT* including FDE support")
} }
return return