github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-18 17:01:07 +00:00
Code Issues Projects Releases Wiki Activity

Simplify to static kernel file location

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2019-05-02 17:38:39 +03:00
parent a3ac8f7443
commit 0cb9d79b51
8 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd/linuxkit/moby/output.go
View File

@ -19,14 +19,14 @@ var (
"iso": "linuxkit/mkimage-iso:3d81e29b28ddf739becf10758eb6077b198d26d8",
"iso-bios": "linuxkit/mkimage-iso-bios:131849cfc4f3ede87c2ca19b6e2a4ef86354d1ce",
"iso-efi": "linuxkit/mkimage-iso-efi:667bd641fd37062eaf9d2173c768ebfcedad3876",
"raw-bios": "linuxkit/mkimage-raw-bios:3d6a6d932e124a0430e36d232dd51af1deef53c3",
"raw-efi": "linuxkit/mkimage-raw-efi:2d1a0e6e67c967bd4d5a859eb9044571f6844577",
"raw-bios": "linuxkit/mkimage-raw-bios:6a2365f9c90901d7e0c70507e09a0cde23c5f321",
"raw-efi": "linuxkit/mkimage-raw-efi:27de80a2180621d3d772893381a9a1b7c5fb895a",
"squashfs": "linuxkit/mkimage-squashfs:c771872c292081a36333425c12e57393bd79f4e9",
"gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:a69258f0ef3c484096617c2e5bc1b52113fb6b81",
"vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242",
"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6",
"vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5",
"gcp": "linuxkit/mkimage-gcp:a7416d21d4ef642bb2ba560c8f7651250823546d",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:aeb084ea016689ed97bce3b52e2695591cb02693",
"vhd": "linuxkit/mkimage-vhd:4cc60c4f46b07e11c64ba618e46b81fa0096c91f",
"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:99b9009ed54a793020d3ce8322a42e0cc06da71a",
"vmdk": "linuxkit/mkimage-vmdk:b55ea46297a16d8a4448ce7f5a2df987a9602b27",
"rpi3": "linuxkit/mkimage-rpi3:cb8427df175b61dd6b635e76f0e88bf261e30d8b",
}
)

3
tools/mkimage-dynamic-vhd/make-dynamic-vhd
View File

@ -17,10 +17,9 @@ cd files
[ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel -or -name '*bzImage')"
KERNEL="./kernel"
CMDLINE="$*"
[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories

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

@ -1,6 +1,8 @@
#!/bin/sh
set -e
# for debugging
[ -n "$DEBUG" ] && set -x
mkdir -p /tmp/image
cd /tmp/image
@ -17,10 +19,9 @@ cd files
[ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel -or -name bzImage)"
KERNEL="./kernel"
CMDLINE="$*"
[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" kernel
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories

2
tools/mkimage-qcow2-efi/make-efi
View File

@ -40,7 +40,7 @@ cd /tmp/efi
[ -t 0 ] || bsdtar xzf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel)"
KERNEL="./kernel"
CMDLINE_FILE="$(find . -name cmdline)"
CMDLINE="$(cat $CMDLINE_FILE )"

2
tools/mkimage-raw-bios/make-bios
View File

@ -25,7 +25,7 @@ cd /tmp/bios
[ -t 0 ] || bsdtar xzf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel)"
KERNEL="./kernel"
CMDLINE_FILE="$(find . -name cmdline)"
CMDLINE="$(cat $CMDLINE_FILE )"

2
tools/mkimage-raw-efi/make-efi
View File

@ -40,7 +40,7 @@ cd /tmp/efi
[ -t 0 ] || bsdtar xzf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel)"
KERNEL="./kernel"
CMDLINE_FILE="$(find . -name cmdline)"
CMDLINE="$(cat $CMDLINE_FILE )"

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

@ -17,10 +17,9 @@ cd files
[ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel -or -name '*bzImage')"
KERNEL="./kernel"
CMDLINE="$*"
[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories

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

@ -17,10 +17,9 @@ cd files
[ -t 0 ] || tar xf -
INITRD="$(find . -name '*.img')"
KERNEL="$(find . -name kernel -or -name '*bzImage')"
KERNEL="./kernel"
CMDLINE="$*"
[ "$KERNEL" = "./kernel" ] || mv "$KERNEL" vmlinuz64
[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img
# clean up subdirectories