forked from rosa/hakurei
internal/rosa: pass stage alongside state
This cleans up many function signatures. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -11,8 +11,8 @@ var kernelSource = newTar(
|
||||
pkg.TarGzip,
|
||||
)
|
||||
|
||||
func (t Toolchain) newKernelSource(s *S) (pkg.Artifact, string) {
|
||||
return s.New(t, "kernel-"+kernelVersion+"-src", 0, nil, nil, nil, `
|
||||
func (t Toolchain) newKernelSource() (pkg.Artifact, string) {
|
||||
return t.New("kernel-"+kernelVersion+"-src", 0, nil, nil, nil, `
|
||||
mkdir -p /work/usr/src/
|
||||
cp -r /usr/src/linux /work/usr/src/
|
||||
chmod -R +w /work/usr/src/linux/
|
||||
@@ -28,9 +28,9 @@ func init() {
|
||||
})
|
||||
}
|
||||
|
||||
func (t Toolchain) newKernelHeaders(s *S) (pkg.Artifact, string) {
|
||||
func (t Toolchain) newKernelHeaders() (pkg.Artifact, string) {
|
||||
const checksum = "lCmBNcMeUmXifg0vecKOPy3GAaFcJSmOPnf3wit9xYTDSTsFADPt1xxUFfmTn1fD"
|
||||
return s.NewPackage(t, "kernel-headers", kernelVersion, kernelSource, &PackageAttr{
|
||||
return t.NewPackage("kernel-headers", kernelVersion, kernelSource, &PackageAttr{
|
||||
Flag: TEarly,
|
||||
KnownChecksum: new(mustDecode(checksum)),
|
||||
|
||||
@@ -76,8 +76,8 @@ func init() {
|
||||
})
|
||||
}
|
||||
|
||||
func (t Toolchain) newKernel(s *S) (pkg.Artifact, string) {
|
||||
return s.NewPackage(t, "kernel", kernelVersion, kernelSource, &PackageAttr{
|
||||
func (t Toolchain) newKernel() (pkg.Artifact, string) {
|
||||
return t.NewPackage("kernel", kernelVersion, kernelSource, &PackageAttr{
|
||||
Env: []string{
|
||||
"PATH=/system/sbin",
|
||||
},
|
||||
@@ -1283,8 +1283,8 @@ func init() {
|
||||
})
|
||||
}
|
||||
|
||||
func (t Toolchain) newGenInitCPIO(s *S) (pkg.Artifact, string) {
|
||||
return s.New(t, "gen_init_cpio-"+kernelVersion, 0, nil, nil, nil, `
|
||||
func (t Toolchain) newGenInitCPIO() (pkg.Artifact, string) {
|
||||
return t.New("gen_init_cpio-"+kernelVersion, 0, nil, nil, nil, `
|
||||
mkdir -p /work/system/bin/
|
||||
cc -o /work/system/bin/gen_init_cpio /usr/src/linux/usr/gen_init_cpio.c
|
||||
`, pkg.Path(AbsUsrSrc.Append("linux"), false, kernelSource)), kernelVersion
|
||||
@@ -1298,12 +1298,12 @@ func init() {
|
||||
})
|
||||
}
|
||||
|
||||
func (t Toolchain) newFirmware(s *S) (pkg.Artifact, string) {
|
||||
func (t Toolchain) newFirmware() (pkg.Artifact, string) {
|
||||
const (
|
||||
version = "20260410"
|
||||
checksum = "J8PdQlGqwrivpskPzbL6xacqR6mlKtXpe5RpzFfVzKPAgG81ZRXsc3qrxwdGJbil"
|
||||
)
|
||||
return s.NewPackage(t, "firmware", version, newFromGitLab(
|
||||
return t.NewPackage("firmware", version, newFromGitLab(
|
||||
"gitlab.com",
|
||||
"kernel-firmware/linux-firmware",
|
||||
version,
|
||||
|
||||
Reference in New Issue
Block a user