cmd: make the GPLv2 pixiecore own the unadorned "pixiecore" binary name.

In practice, most people will want the standalone binary that Just
Works, the variant that doesn't embed ipxe is going to be for niche
applications only.
This commit is contained in:
David Anderson 2016-08-10 21:57:19 -07:00
parent 6a88cefc9b
commit 4d9f88efd8
4 changed files with 18 additions and 18 deletions

View File

@ -14,19 +14,8 @@
package main package main
import ( import "go.universe.tf/netboot/pixiecore"
"go.universe.tf/netboot/pixiecore"
"go.universe.tf/netboot/third_party/ipxe"
)
func main() { func main() {
pxe := ipxe.MustAsset("undionly.kpxe") pixiecore.CLI(nil)
efi32 := ipxe.MustAsset("ipxe-i386.efi")
efi64 := ipxe.MustAsset("ipxe-x86_64.efi")
pixiecore.CLI(map[pixiecore.Firmware][]byte{
pixiecore.FirmwareX86PC: pxe,
pixiecore.FirmwareEFI32: efi32,
pixiecore.FirmwareEFI64: efi64,
})
} }

View File

@ -8,6 +8,6 @@ Due to iPXE's license, the result of embedding iPXE builds in the
Pixiecore binary makes the overall binary fall under the terms of the Pixiecore binary makes the overall binary fall under the terms of the
GPLv2. See the LICENSE file in this directory for that license. GPLv2. See the LICENSE file in this directory for that license.
If you want an Apache-licensed build, check the "pixiecore" directory If you want an Apache-licensed build, check the "pixiecore-apache2"
one level up for a build that doesn't embed iPXE (you have to supply directory one level up for a build that doesn't embed iPXE (you have
iPXE binaries at runtime). to supply iPXE binaries at runtime).

View File

@ -14,8 +14,19 @@
package main package main
import "go.universe.tf/netboot/pixiecore" import (
"go.universe.tf/netboot/pixiecore"
"go.universe.tf/netboot/third_party/ipxe"
)
func main() { func main() {
pixiecore.CLI(nil) pxe := ipxe.MustAsset("undionly.kpxe")
efi32 := ipxe.MustAsset("ipxe-i386.efi")
efi64 := ipxe.MustAsset("ipxe-x86_64.efi")
pixiecore.CLI(map[pixiecore.Firmware][]byte{
pixiecore.FirmwareX86PC: pxe,
pixiecore.FirmwareEFI32: efi32,
pixiecore.FirmwareEFI64: efi64,
})
} }