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

main: remove support for generating initfs with kernel 'flavor' in name

Browse Source 
pmOS will only support 1 kernel:
https://gitlab.com/postmarketOS/pmaports/-/issues/660
This commit is contained in:
Clayton Craft
2021-08-12 14:50:04 -07:00
parent 58a7575848
commit d77de3b91a
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main.go
View File

@@ -44,20 +44,18 @@ func main() {
log.Fatal(err)
}
kernFlavor, err := getKernelFlavor()
if err != nil {
log.Fatal(err)
}
log.Print("Generating for kernel version: ", kernVer)
log.Print("Generating for kernel flavor: ", kernFlavor)
log.Print("Output directory: ", outDir)
if err := generateInitfs("initramfs-"+kernFlavor, outDir, kernVer, devinfo); err != nil {
if err := generateInitfs("initramfs", outDir, kernVer, devinfo); err != nil {
log.Fatal(err)
}
if err := generateInitfsExtra("initramfs-"+kernFlavor+"-extra", outDir, devinfo); err != nil {
if err := generateInitfsExtra("initramfs-extra", outDir, devinfo); err != nil {
log.Fatal(err)
}
@@ -526,19 +524,6 @@ func getKernelVersion() (string, error) {
return strings.TrimSpace(string(contents)), nil
}
func getKernelFlavor() (string, error) {
var flavor string
releaseFile, err := getKernelReleaseFile()
if err != nil {
return flavor, err
}
// path of release file is in the form: /usr/share/kernel/<flavor>/kernel.release
flavor = filepath.Base(filepath.Dir(releaseFile))
return flavor, nil
}
func generateInitfs(name string, path string, kernVer string, devinfo deviceinfo.DeviceInfo) error {
initfsArchive, err := archive.New()
if err != nil {