diff --git a/.gitignore b/.gitignore index f44bae33e..15849e958 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ test.log +Dockerfile.media /bin *.swp *.img diff --git a/Dockerfile.media b/Dockerfile.media deleted file mode 100644 index 0ae088190..000000000 --- a/Dockerfile.media +++ /dev/null @@ -1,3 +0,0 @@ -FROM mobylinux/toybox-media:0a26fe5f574e444849983f9c4148ef74b3804d55@sha256:5ac38f77b66deb194c9016591b9b096e81fcdc9f7c3e6d01566294a6b4b4ebd2 - -ADD . / diff --git a/Makefile b/Makefile index 9fbba80ce..ed8cc59a1 100644 --- a/Makefile +++ b/Makefile @@ -89,6 +89,11 @@ MEDIA_IMAGE=mobylinux/media:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) INITRD_IMAGE=mobylinux/mobylinux:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) KERNEL_IMAGE=mobylinux/kernel:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG) +MEDIA_TOYBOX=mobylinux/toybox-media:0a26fe5f574e444849983f9c4148ef74b3804d55@sha256:5ac38f77b66deb194c9016591b9b096e81fcdc9f7c3e6d01566294a6b4b4ebd2 + +Dockerfile.media: + printf "FROM $(MEDIA_TOYBOX)\nADD . /\n" > $@ + MEDIA_TARBALL=Dockerfile.media -C alpine initrd.img initrd-test.img mobylinux-efi.iso mobylinux.efi -C ../kernel/x86_64 vmlinuz64 vmlinux kernel-headers.tar kernel-dev.tar media: Dockerfile.media alpine/initrd.img alpine/initrd-test.img kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso @@ -159,4 +164,4 @@ ci-pr: clean: $(MAKE) -C alpine clean $(MAKE) -C kernel clean - rm -rf bin disk.img test.log + rm -rf bin disk.img test.log Dockerfile.media