Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: image format output #3

Merged
merged 1 commit into from
Mar 15, 2024
Merged

fix: image format output #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions installers/rockpi4/src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (i *rockPi4) Install(options overlay.InstallOptions[rockPi4ExtraOptions]) e

defer f.Close() //nolint:errcheck

uboot, err := os.ReadFile(filepath.Join(options.ArtifactsPath, "artifacts/arm64/u-boot/rockpi4/u-boot-rockchip.bin"))
uboot, err := os.ReadFile(filepath.Join(options.ArtifactsPath, "arm64/u-boot/rockpi4/u-boot-rockchip.bin"))
if err != nil {
return err
}
Expand All @@ -73,7 +73,7 @@ func (i *rockPi4) Install(options overlay.InstallOptions[rockPi4ExtraOptions]) e
return err
}

src := filepath.Join(options.ArtifactsPath, "artifacts/arm64/dtb", dtb)
src := filepath.Join(options.ArtifactsPath, "arm64/dtb", dtb)
dst := filepath.Join(options.MountPrefix, "/boot/EFI/dtb", dtb)

err = os.MkdirAll(filepath.Dir(dst), 0o600)
Expand Down
4 changes: 2 additions & 2 deletions installers/rockpi4c/src/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (i *rockPi4) Install(options overlay.InstallOptions[rockPi4ExtraOptions]) e

defer f.Close() //nolint:errcheck

uboot, err := os.ReadFile(filepath.Join(options.ArtifactsPath, "artifacts/arm64/u-boot/rockpi4/u-boot-rockchip.bin"))
uboot, err := os.ReadFile(filepath.Join(options.ArtifactsPath, "arm64/u-boot/rockpi4/u-boot-rockchip.bin"))
if err != nil {
return err
}
Expand All @@ -72,7 +72,7 @@ func (i *rockPi4) Install(options overlay.InstallOptions[rockPi4ExtraOptions]) e
return err
}

src := filepath.Join(options.ArtifactsPath, "artifacts/arm64/dtb", dtb)
src := filepath.Join(options.ArtifactsPath, "arm64/dtb", dtb)
dst := filepath.Join(options.MountPrefix, "/boot/EFI/dtb", dtb)

err = os.MkdirAll(filepath.Dir(dst), 0o600)
Expand Down
2 changes: 1 addition & 1 deletion profiles/rockpi4/rockpi4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platform: metal
secureboot: false
output:
kind: image
outFormat: xz
outFormat: .xz
imageOptions:
diskSize: 1306525696
diskFormat: raw
2 changes: 1 addition & 1 deletion profiles/rockpi4c/rockpi4c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ platform: metal
secureboot: false
output:
kind: image
outFormat: xz
outFormat: .xz
imageOptions:
diskSize: 1306525696
diskFormat: raw