cmd/mkinitfs: drop osksdl-related stuff
This commit is contained in:
@@ -321,116 +321,6 @@ func getFile(file string, required bool) (files []string, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func getOskConfFontPath(oskConfPath string) (string, error) {
|
||||
var path string
|
||||
f, err := os.Open(oskConfPath)
|
||||
if err != nil {
|
||||
return path, err
|
||||
}
|
||||
defer f.Close()
|
||||
s := bufio.NewScanner(f)
|
||||
for s.Scan() {
|
||||
fields := strings.Fields(s.Text())
|
||||
// "key = val" is 3 fields
|
||||
if len(fields) > 2 && fields[0] == "keyboard-font" {
|
||||
path = fields[2]
|
||||
}
|
||||
}
|
||||
if !exists(path) {
|
||||
return path, errors.New("Unable to find font: " + path)
|
||||
}
|
||||
|
||||
return path, nil
|
||||
}
|
||||
|
||||
// Get a list of files and their dependencies related to supporting rootfs full
|
||||
// disk (d)encryption
|
||||
func getFdeFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
|
||||
confFiles := []string{
|
||||
"/etc/osk.conf",
|
||||
"/etc/ts.conf",
|
||||
"/etc/pointercal",
|
||||
"/etc/fb.modes",
|
||||
"/etc/directfbrc",
|
||||
}
|
||||
// TODO: this shouldn't be false? though some files (pointercal) don't always exist...
|
||||
if files, err = getFiles(confFiles, false); err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||
}
|
||||
|
||||
// osk-sdl
|
||||
oskFiles := []string{
|
||||
"/usr/bin/osk-sdl",
|
||||
"/sbin/cryptsetup",
|
||||
"/usr/lib/libGL.so.1",
|
||||
}
|
||||
if filelist, err := getFiles(oskFiles, true); err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||
} else {
|
||||
files = append(files, filelist...)
|
||||
}
|
||||
|
||||
fontFile, err := getOskConfFontPath("/etc/osk.conf")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add file %q: %w", fontFile, err)
|
||||
}
|
||||
files = append(files, fontFile)
|
||||
|
||||
// Directfb
|
||||
dfbFiles := []string{}
|
||||
err = filepath.Walk("/usr/lib/directfb-1.7-7", func(path string, f os.FileInfo, err error) error {
|
||||
if filepath.Ext(path) == ".so" {
|
||||
dfbFiles = append(dfbFiles, path)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add file %w", err)
|
||||
}
|
||||
if filelist, err := getFiles(dfbFiles, true); err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||
} else {
|
||||
files = append(files, filelist...)
|
||||
}
|
||||
|
||||
// tslib
|
||||
tslibFiles := []string{}
|
||||
err = filepath.Walk("/usr/lib/ts", func(path string, f os.FileInfo, err error) error {
|
||||
if filepath.Ext(path) == ".so" {
|
||||
tslibFiles = append(tslibFiles, path)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add file: %w", err)
|
||||
}
|
||||
libts, _ := filepath.Glob("/usr/lib/libts*")
|
||||
tslibFiles = append(tslibFiles, libts...)
|
||||
if filelist, err := getFiles(tslibFiles, true); err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||
} else {
|
||||
files = append(files, filelist...)
|
||||
}
|
||||
|
||||
// mesa hw accel
|
||||
if devinfo.MesaDriver != "" {
|
||||
mesaFiles := []string{
|
||||
"/usr/lib/libEGL.so.1",
|
||||
"/usr/lib/libGLESv2.so.2",
|
||||
"/usr/lib/libgbm.so.1",
|
||||
"/usr/lib/libudev.so.1",
|
||||
"/usr/lib/xorg/modules/dri/" + devinfo.MesaDriver + "_dri.so",
|
||||
}
|
||||
if filelist, err := getFiles(mesaFiles, true); err != nil {
|
||||
return nil, fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||
} else {
|
||||
files = append(files, filelist...)
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func getHookScripts(scriptsdir string) (files []string, err error) {
|
||||
fileInfo, err := os.ReadDir(scriptsdir)
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user