diff options
| author | Paul Spooren <mail@aparcar.org> | 2020-03-20 00:10:55 -1000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-03-21 10:36:00 +0000 |
| commit | cb007a7bf6199ebca89f79c8ee5f9b1807a0c5b0 (patch) | |
| tree | 725b5ae9cbfeb72e14e6efa3f136c58fb559c027 /target/linux/x86/Makefile | |
| parent | 5a5df62d95f52892c9a24fe1216796a2a903e544 (diff) | |
| download | upstream-cb007a7bf6199ebca89f79c8ee5f9b1807a0c5b0.tar.gz upstream-cb007a7bf6199ebca89f79c8ee5f9b1807a0c5b0.tar.bz2 upstream-cb007a7bf6199ebca89f79c8ee5f9b1807a0c5b0.zip | |
x86: switch image generation to new code
This commit introduces few related changes which need to be done in
single commit to keep images buildable between git revisions. In result
it retains all previous image creation possibilities with slight name
change of generated images. Brief summary of the commit:
* Split up image generation recipe to smaller chunks to make it more
generic and reusable.
* Make iso images x86 specific and drop their definition as root
filesystem.
* Convert image creation process to generic code specified in image.mk.
* Make geode subtarget inherit features from the main target instead of
redefining them.
* For subtargets create device definitions with basic packages set.
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
[rebased]
Signed-off-by: Paul Spooren <mail@aparcar.org>
Diffstat (limited to 'target/linux/x86/Makefile')
| -rw-r--r-- | target/linux/x86/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index a646e6e8a7..045d043e4d 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 -FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu +FEATURES:=squashfs ext4 vdi vmdk pcmcia targz fpu boot-part rootfs-part SUBTARGETS:=generic legacy geode 64 KERNEL_PATCHVER:=5.4 @@ -23,6 +23,6 @@ DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs $(eval $(call BuildTarget)) -$(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \ +$(eval $(call $(if $(CONFIG_ISO_IMAGES),RequireCommand,Ignore),mkisofs, \ Please install mkisofs. \ )) |