This patch is a rebased and improved version of Tomasz Maciej Nowak patch[0]. Tomasz code left untouched and only changed where needed for the rebase.
Additionally some small improvements from Alexander Couzens where added in patch 4 (use qemu-image command from image-commands.mk) The last two patches are added to keep consistency with current behaviour. [0]: https://patchwork.ozlabs.org/cover/1024165/ Paul Spooren (6): x86/grub2: move grub2 image creation to package x86: switch image generation to new code x86: remove obsolete legacy profiles x86: use qemu-image command from image-commands.mk x86: allow non gzipped images scripts: fixup qemustart for new x86 image names config/Config-images.in | 18 +- include/image-commands.mk | 7 + include/image.mk | 1 - package/boot/grub2/Makefile | 31 +++ .../boot/grub2/files}/grub-early.cfg | 0 scripts/qemustart | 2 +- target/linux/x86/64/profiles/000-Generic.mk | 15 -- target/linux/x86/Makefile | 4 +- .../linux/x86/generic/profiles/000-Generic.mk | 19 -- .../linux/x86/geode/profiles/000-Generic.mk | 20 -- target/linux/x86/geode/profiles/100-Geos.mk | 19 -- target/linux/x86/geode/target.mk | 2 +- target/linux/x86/image/64.mk | 5 + target/linux/x86/image/Makefile | 202 +++++++----------- target/linux/x86/image/generic.mk | 8 + target/linux/x86/image/geode.mk | 16 ++ target/linux/x86/image/grub-iso.cfg | 2 +- .../linux/x86/image/{grub.cfg => grub-pc.cfg} | 4 +- target/linux/x86/image/legacy.mk | 8 + .../linux/x86/legacy/profiles/000-Generic.mk | 18 -- 20 files changed, 167 insertions(+), 234 deletions(-) rename {target/linux/x86/image => package/boot/grub2/files}/grub-early.cfg (100%) delete mode 100644 target/linux/x86/64/profiles/000-Generic.mk delete mode 100644 target/linux/x86/generic/profiles/000-Generic.mk delete mode 100644 target/linux/x86/geode/profiles/000-Generic.mk delete mode 100644 target/linux/x86/geode/profiles/100-Geos.mk create mode 100644 target/linux/x86/image/64.mk create mode 100644 target/linux/x86/image/generic.mk create mode 100644 target/linux/x86/image/geode.mk rename target/linux/x86/image/{grub.cfg => grub-pc.cfg} (57%) create mode 100644 target/linux/x86/image/legacy.mk delete mode 100644 target/linux/x86/legacy/profiles/000-Generic.mk -- 2.25.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
