github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-27 20:48:11 +00:00
Code Issues Projects Releases Wiki Activity

Change to use kernel not bzImage everywhere

Browse Source 
Previously we hardcoded `bzImage` which is not used for all
use cases or architectures.

fix #1630

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-04-27 16:00:28 +01:00
parent 95613b9d93
commit 6155e8c8bc
12 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,5 +11,5 @@ Dockerfile.media
*.vhdx *.vhdx
*.efi *.efi
*.qcow2 *.qcow2
*-bzImage *-kernel
*-cmdline *-cmdline

2
Makefile
View File

@ -17,7 +17,7 @@ endif
PREFIX?=/usr/local/ PREFIX?=/usr/local/
MOBY_COMMIT=3375f32d51dcf1a043b79a4d6f4a9cc696a8b19e MOBY_COMMIT=d504afe4795528920ef06af611efd27b74098d5e
bin/moby: | bin bin/moby: | bin
docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar docker run --rm --log-driver=none $(CROSS) $(GO_COMPILE) --clone-path github.com/moby/tool --clone https://github.com/moby/tool.git --commit $(MOBY_COMMIT) --package github.com/moby/tool/cmd/moby --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o $@ > tmp_moby_bin.tar
tar xf tmp_moby_bin.tar > $@ tar xf tmp_moby_bin.tar > $@

2
kernel/Dockerfile
View File

@ -58,7 +58,7 @@ FROM linuxkit/toybox-media:eee3dd4d72cd784801e95b1781e6c4f9d8a5e5eb@sha256:7f940
ENTRYPOINT [] ENTRYPOINT []
CMD [] CMD []
WORKDIR / WORKDIR /
COPY --from=kernel-build bzImage / COPY --from=kernel-build bzImage /kernel
COPY --from=kernel-build kernel-headers.tar / COPY --from=kernel-build kernel-headers.tar /
COPY --from=kernel-build kernel-modules.tar /kernel.tar COPY --from=kernel-build kernel-modules.tar /kernel.tar
COPY --from=kernel-build kernel-dev.tar / COPY --from=kernel-build kernel-dev.tar /

2
src/cmd/linuxkit/run_hyperkit.go
View File

@ -101,7 +101,7 @@ func runHyperKit(args []string) {
log.Fatalln("Error creating hyperkit: ", err) log.Fatalln("Error creating hyperkit: ", err)
} }
h.Kernel = prefix + "-bzImage" h.Kernel = prefix + "-kernel"
h.Initrd = prefix + "-initrd.img" h.Initrd = prefix + "-initrd.img"
h.VPNKitKey = vpnKitKey h.VPNKitKey = vpnKitKey
h.UUID = vmUUID h.UUID = vmUUID

6
src/cmd/linuxkit/run_packet.go
View File

@ -66,7 +66,7 @@ func runPacket(args []string) {
url := getStringValue(packetBaseURL, *baseURLFlag, "") url := getStringValue(packetBaseURL, *baseURLFlag, "")
if url == "" { if url == "" {
log.Fatal("Need to specify a value for --base-url where the images are hosted. This URL should contain <url>/%s-bzImage and <url>/%s-initrd.img") log.Fatal("Need to specify a value for --base-url where the images are hosted. This URL should contain <url>/%s-kernel and <url>/%s-initrd.img")
} }
facility := getStringValue(packetZoneVar, *zoneFlag, "") facility := getStringValue(packetZoneVar, *zoneFlag, "")
plan := getStringValue(packetMachineVar, *machineFlag, defaultMachine) plan := getStringValue(packetMachineVar, *machineFlag, defaultMachine)
@ -82,10 +82,10 @@ func runPacket(args []string) {
name := getStringValue(packetNameVar, *nameFlag, prefix) name := getStringValue(packetNameVar, *nameFlag, prefix)
osType := "custom_ipxe" osType := "custom_ipxe"
billing := "hourly" billing := "hourly"
userData := fmt.Sprintf("#!ipxe\n\ndhcp\nset base-url %s\nset kernel-params ip=dhcp nomodeset ro serial console=ttyS1,115200\nkernel ${base-url}/%s-bzImage ${kernel-params}\ninitrd ${base-url}/%s-initrd.img\nboot", url, name, name) userData := fmt.Sprintf("#!ipxe\n\ndhcp\nset base-url %s\nset kernel-params ip=dhcp nomodeset ro serial console=ttyS1,115200\nkernel ${base-url}/%s-kernel ${kernel-params}\ninitrd ${base-url}/%s-initrd.img\nboot", url, name, name)
log.Debugf("Using userData of:\n%s\n", userData) log.Debugf("Using userData of:\n%s\n", userData)
initrdURL := fmt.Sprintf("%s/%s-initrd.img", url, name) initrdURL := fmt.Sprintf("%s/%s-initrd.img", url, name)
kernelURL := fmt.Sprintf("%s/%s-bzImage", url, name) kernelURL := fmt.Sprintf("%s/%s-kernel", url, name)
ValidateHTTPURL(kernelURL) ValidateHTTPURL(kernelURL)
ValidateHTTPURL(initrdURL) ValidateHTTPURL(initrdURL)
client := packngo.NewClient("", apiKey, nil) client := packngo.NewClient("", apiKey, nil)

6
src/cmd/linuxkit/run_qemu.go
View File

@ -48,7 +48,7 @@ func runQemu(args []string) {
qemuGUI := qemuFlags.Bool("gui", false, "Set qemu to use video output instead of stdio") qemuGUI := qemuFlags.Bool("gui", false, "Set qemu to use video output instead of stdio")
qemuUEFI := qemuFlags.Bool("uefi", false, "Set UEFI boot from 'prefix'-efi.iso") qemuUEFI := qemuFlags.Bool("uefi", false, "Set UEFI boot from 'prefix'-efi.iso")
qemuIso := qemuFlags.Bool("iso", false, "Set Legacy BIOS boot from 'prefix'.iso") qemuIso := qemuFlags.Bool("iso", false, "Set Legacy BIOS boot from 'prefix'.iso")
qemuKernel := qemuFlags.Bool("kernel", true, "Set boot using 'prefix'-bzImage/-initrd/-cmdline") qemuKernel := qemuFlags.Bool("kernel", true, "Set boot using 'prefix'-kernel/-initrd/-cmdline")
// Paths and settings for Disks and UEFI firware // Paths and settings for Disks and UEFI firware
qemuDiskPath := qemuFlags.String("diskpath", "", "Path to disk image to use") qemuDiskPath := qemuFlags.String("diskpath", "", "Path to disk image to use")
@ -256,9 +256,9 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
qemuArgs = append(qemuArgs, "-boot", "d") qemuArgs = append(qemuArgs, "-boot", "d")
} }
// build kernel boot config from bzImage/initrd/cmdline // build kernel boot config from kernel/initrd/cmdline
if config.Kernel { if config.Kernel {
qemuKernelPath := buildPath(config.Prefix, "-bzImage") qemuKernelPath := buildPath(config.Prefix, "-kernel")
qemuInitrdPath := buildPath(config.Prefix, "-initrd.img") qemuInitrdPath := buildPath(config.Prefix, "-initrd.img")
qemuArgs = append(qemuArgs, "-kernel", qemuKernelPath) qemuArgs = append(qemuArgs, "-kernel", qemuKernelPath)
qemuArgs = append(qemuArgs, "-initrd", qemuInitrdPath) qemuArgs = append(qemuArgs, "-initrd", qemuInitrdPath)

8
tools/mkimage-gcp/make-gcp
View File

@ -5,7 +5,7 @@ set -e
mkdir -p /tmp/image mkdir -p /tmp/image
cd /tmp/image cd /tmp/image
# input is a tarball of vmlinuz64 and initrd.img on stdin # input is a tarball of kernel and initrd.img on stdin
# output is a compressed tarball of a raw disk image on stdout # output is a compressed tarball of a raw disk image on stdout
mkdir -p files mkdir -p files
@ -17,10 +17,10 @@ cd files
[ -t 0 ] || tar xf - [ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')" INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name vmlinuz64 -or -name bzImage)" KERNEL="$(find . -name kernel -or -name bzImage)"
CMDLINE="$*" CMDLINE="$*"
[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories # clean up subdirectories
@ -31,7 +31,7 @@ GCP_CONFIG="earlyprintk=ttyS0,115200 console=ttyS0,115200 vsyscall=emulate page_
CFG="DEFAULT linux CFG="DEFAULT linux
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /kernel
INITRD /initrd.img INITRD /initrd.img
APPEND ${CMDLINE} APPEND ${CMDLINE}
" "

8
tools/mkimage-iso-bios/make-iso
View File

@ -5,7 +5,7 @@ set -e
mkdir -p /tmp/iso mkdir -p /tmp/iso
cd /tmp/iso cd /tmp/iso
# input is a tarball of vmlinuz64 and initrd.img on stdin # input is a tarball of kernel and initrd.img on stdin
# output is an iso on stdout # output is an iso on stdout
# extract. BSD tar auto recognises compression, unlike GNU tar # extract. BSD tar auto recognises compression, unlike GNU tar
@ -13,10 +13,10 @@ cd /tmp/iso
[ -t 0 ] || bsdtar xzf - [ -t 0 ] || bsdtar xzf -
INITRD="$(find . -name '*.img')" INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name vmlinuz64 -or -name bzImage)" KERNEL="$(find . -name kernel -or -name '*bzImage')"
CMDLINE="$*" CMDLINE="$*"
[ "$KERNEL" = "vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$KERNEL" = "kernel" ] || mv "$KERNEL" kernel
[ "$INITRD" = "initrd.img" ] || mv "$INITRD" initrd.img [ "$INITRD" = "initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories # clean up subdirectories
@ -28,7 +28,7 @@ cp /usr/share/syslinux/ldlinux.c32 ./isolinux/
CFG="DEFAULT linux CFG="DEFAULT linux
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /kernel
INITRD /initrd.img INITRD /initrd.img
APPEND ${CMDLINE} APPEND ${CMDLINE}
" "

12
tools/mkimage-iso-efi/make-efi
View File

@ -5,7 +5,7 @@ set -e
mkdir -p /tmp/efi mkdir -p /tmp/efi
cd /tmp/efi cd /tmp/efi
# input is a tarball of vmlinuz64 and initrd.img on stdin # input is a tarball of kernel and initrd.img on stdin
# output is an iso on stdout # output is an iso on stdout
# extract. BSD tar auto recognises compression, unlike GNU tar # extract. BSD tar auto recognises compression, unlike GNU tar
@ -13,11 +13,11 @@ cd /tmp/efi
[ -t 0 ] || bsdtar xzf - [ -t 0 ] || bsdtar xzf -
INITRD="$(find . -name '*.img')" INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name vmlinuz64 -or -name bzImage)" KERNEL="$(find . -name kernel -or -name bzImage)"
CMDLINE="$*" CMDLINE="$*"
[ "$KERNEL" = "vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
[ "$INITRD" = "initrd.img" ] || mv "$INITRD" initrd.img [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories # clean up subdirectories
find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
@ -30,8 +30,8 @@ echo "${CMDLINE} rootdelay=300 noautodetect" > cmdline.txt
objcopy \ objcopy \
--add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \ --add-section .osrel=/etc/os-release --change-section-vma .osrel=0x20000 \
--add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \ --add-section .cmdline=./cmdline.txt --change-section-vma .cmdline=0x30000 \
--add-section .linux=./vmlinuz64 --change-section-vma .linux=0x40000 \ --add-section .linux=./kernel --change-section-vma .linux=0x40000 \
--add-section .initrd=initrd.img --change-section-vma .initrd=0x3000000 \ --add-section .initrd=./initrd.img --change-section-vma .initrd=0x3000000 \
./linuxx64.efi.stub \ ./linuxx64.efi.stub \
linuxkit.efi linuxkit.efi

8
tools/mkimage-qcow/make-qcow
View File

@ -5,7 +5,7 @@ set -e
mkdir -p /tmp/image mkdir -p /tmp/image
cd /tmp/image cd /tmp/image
# input is a tarball of vmlinuz64 and initrd.img on stdin # input is a tarball of kernel and initrd.img on stdin
# output is a qcow2 on stdout # output is a qcow2 on stdout
mkdir -p files mkdir -p files
@ -17,10 +17,10 @@ cd files
[ -t 0 ] || tar xf - [ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')" INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')" KERNEL="$(find . -name kernel -or -name '*bzImage')"
CMDLINE="$*" CMDLINE="$*"
[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories # clean up subdirectories
@ -28,7 +28,7 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
CFG="DEFAULT linux CFG="DEFAULT linux
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /kernel
INITRD /initrd.img INITRD /initrd.img
APPEND ${CMDLINE} APPEND ${CMDLINE}
" "

8
tools/mkimage-vhd/make-vhd
View File

@ -5,7 +5,7 @@ set -e
mkdir -p /tmp/image mkdir -p /tmp/image
cd /tmp/image cd /tmp/image
# input is a tarball of vmlinuz64 and initrd.img on stdin # input is a tarball of kernel and initrd.img on stdin
# output is a vhd on stdout # output is a vhd on stdout
mkdir -p files mkdir -p files
@ -17,10 +17,10 @@ cd files
[ -t 0 ] || tar xf - [ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')" INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')" KERNEL="$(find . -name kernel -or -name '*bzImage')"
CMDLINE="$*" CMDLINE="$*"
[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories # clean up subdirectories
@ -28,7 +28,7 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
CFG="DEFAULT linux CFG="DEFAULT linux
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /kernel
INITRD /initrd.img INITRD /initrd.img
APPEND ${CMDLINE} APPEND ${CMDLINE}
" "

8
tools/mkimage-vmdk/make-vmdk
View File

@ -5,7 +5,7 @@ set -e
mkdir -p /tmp/image mkdir -p /tmp/image
cd /tmp/image cd /tmp/image
# input is a tarball of vmlinuz64 and initrd.img on stdin # input is a tarball of kernel and initrd.img on stdin
# output is a vmdk on stdout # output is a vmdk on stdout
mkdir -p files mkdir -p files
@ -17,10 +17,10 @@ cd files
[ -t 0 ] || tar xf - [ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')" INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')" KERNEL="$(find . -name kernel -or -name '*bzImage')"
CMDLINE="$*" CMDLINE="$*"
[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories # clean up subdirectories
@ -28,7 +28,7 @@ find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf
CFG="DEFAULT linux CFG="DEFAULT linux
LABEL linux LABEL linux
KERNEL /vmlinuz64 KERNEL /kernel
INITRD /initrd.img INITRD /initrd.img
APPEND ${CMDLINE} APPEND ${CMDLINE}
" "