[OpenWrt-Devel,RFC,0/6] x86: switch to generic image generation code and
mbox series

Message ID 20190113214915.14059-1-tomek_n@o2.pl
Headers show
Series
  • x86: switch to generic image generation code and
Related show

Message

Tomasz Maciej Nowak Jan. 13, 2019, 9:49 p.m. UTC
This is aftermath of partially failed series [1].
When I was searching for ways to upgrade of bootloader on existing
OpenWrt installations, I noticed that it'll be difficult to add this
feature within existing code creating x86 target images. I decided to
switch this code to generic one, wich is used in most of the OpenWrt
targets. Both of the chages are rather intrusive hence te RFC tag.
Please voice Your concerns and opinions.

https://patchwork.ozlabs.org/cover/1000625

Tomasz Maciej Nowak (6):
  x86/grub2: move grub2 image creation to grub2 package
  x86: switch image generation to new code
  x86: remove obsolete profiles
  x86: geode: shrink amount of default packages
  x86/grub2: add bootloader upgrade on sysupgrade
  grub2: add preinit hook for bootloader upgrade

 config/Config-images.in                       |  22 +-
 include/image.mk                              |   1 -
 package/boot/grub2/Makefile                   |  79 ++++++-
 .../boot/grub2/files/81_upgrade_bootloader    |  20 ++
 .../boot/grub2/files}/grub-early.cfg          |   0
 target/linux/x86/64/profiles/000-Generic.mk   |  15 --
 target/linux/x86/64/target.mk                 |   2 +-
 target/linux/x86/Makefile                     |   4 +-
 .../x86/base-files/lib/upgrade/platform.sh    |  27 ++-
 .../linux/x86/generic/profiles/000-Generic.mk |  18 --
 target/linux/x86/generic/target.mk            |   2 +-
 .../linux/x86/geode/profiles/000-Generic.mk   |  20 --
 target/linux/x86/geode/profiles/100-Geos.mk   |  19 --
 target/linux/x86/geode/target.mk              |  14 +-
 target/linux/x86/image/64.mk                  |   5 +
 target/linux/x86/image/Makefile               | 199 +++++++-----------
 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 --
 target/linux/x86/legacy/target.mk             |   1 +
 23 files changed, 255 insertions(+), 249 deletions(-)
 create mode 100644 package/boot/grub2/files/81_upgrade_bootloader
 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

Comments

Tomasz Maciej Nowak Jan. 14, 2019, 1:17 p.m. UTC | #1
Title of this series got halved, should be:
x86: switch to generic image generation code and add update bootloader on sysupgrade

Also forgot to mention, for anyone who wants to test it needs to be applied after https://patchwork.ozlabs.org/patch/1024153
Lucian Cristian Feb. 4, 2019, 8:29 a.m. UTC | #2
On 13.01.2019 23:49, Tomasz Maciej Nowak wrote:
> This is aftermath of partially failed series [1].
> When I was searching for ways to upgrade of bootloader on existing
> OpenWrt installations, I noticed that it'll be difficult to add this
> feature within existing code creating x86 target images. I decided to
> switch this code to generic one, wich is used in most of the OpenWrt
> targets. Both of the chages are rather intrusive hence te RFC tag.
> Please voice Your concerns and opinions.
>
> https://patchwork.ozlabs.org/cover/1000625
>
> Tomasz Maciej Nowak (6):
>    x86/grub2: move grub2 image creation to grub2 package
>    x86: switch image generation to new code
>    x86: remove obsolete profiles
>    x86: geode: shrink amount of default packages
>    x86/grub2: add bootloader upgrade on sysupgrade
>    grub2: add preinit hook for bootloader upgrade
>
>   config/Config-images.in                       |  22 +-
>   include/image.mk                              |   1 -
>   package/boot/grub2/Makefile                   |  79 ++++++-
>   .../boot/grub2/files/81_upgrade_bootloader    |  20 ++
>   .../boot/grub2/files}/grub-early.cfg          |   0
>   target/linux/x86/64/profiles/000-Generic.mk   |  15 --
>   target/linux/x86/64/target.mk                 |   2 +-
>   target/linux/x86/Makefile                     |   4 +-
>   .../x86/base-files/lib/upgrade/platform.sh    |  27 ++-
>   .../linux/x86/generic/profiles/000-Generic.mk |  18 --
>   target/linux/x86/generic/target.mk            |   2 +-
>   .../linux/x86/geode/profiles/000-Generic.mk   |  20 --
>   target/linux/x86/geode/profiles/100-Geos.mk   |  19 --
>   target/linux/x86/geode/target.mk              |  14 +-
>   target/linux/x86/image/64.mk                  |   5 +
>   target/linux/x86/image/Makefile               | 199 +++++++-----------
>   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 --
>   target/linux/x86/legacy/target.mk             |   1 +
>   23 files changed, 255 insertions(+), 249 deletions(-)
>   create mode 100644 package/boot/grub2/files/81_upgrade_bootloader
>   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
>
tested on systems with multiple drives and multiple partitions, the only 
thing is that the target images will always be gziped, this is annoying 
on other targets too, also needs a rebase

Regards
Tomasz Maciej Nowak Feb. 6, 2019, 2:08 p.m. UTC | #3
W dniu 04.02.2019 o 09:29, Lucian Cristian pisze:
> On 13.01.2019 23:49, Tomasz Maciej Nowak wrote:
>> This is aftermath of partially failed series [1].
>> When I was searching for ways to upgrade of bootloader on existing
>> OpenWrt installations, I noticed that it'll be difficult to add this
>> feature within existing code creating x86 target images. I decided to
>> switch this code to generic one, wich is used in most of the OpenWrt
>> targets. Both of the chages are rather intrusive hence te RFC tag.
>> Please voice Your concerns and opinions.
>>
>> https://patchwork.ozlabs.org/cover/1000625
>>
>> Tomasz Maciej Nowak (6):
>>    x86/grub2: move grub2 image creation to grub2 package
>>    x86: switch image generation to new code
>>    x86: remove obsolete profiles
>>    x86: geode: shrink amount of default packages
>>    x86/grub2: add bootloader upgrade on sysupgrade
>>    grub2: add preinit hook for bootloader upgrade
>>
>>   config/Config-images.in                       |  22 +-
>>   include/image.mk                              |   1 -
>>   package/boot/grub2/Makefile                   |  79 ++++++-
>>   .../boot/grub2/files/81_upgrade_bootloader    |  20 ++
>>   .../boot/grub2/files}/grub-early.cfg          |   0
>>   target/linux/x86/64/profiles/000-Generic.mk   |  15 --
>>   target/linux/x86/64/target.mk                 |   2 +-
>>   target/linux/x86/Makefile                     |   4 +-
>>   .../x86/base-files/lib/upgrade/platform.sh    |  27 ++-
>>   .../linux/x86/generic/profiles/000-Generic.mk |  18 --
>>   target/linux/x86/generic/target.mk            |   2 +-
>>   .../linux/x86/geode/profiles/000-Generic.mk   |  20 --
>>   target/linux/x86/geode/profiles/100-Geos.mk   |  19 --
>>   target/linux/x86/geode/target.mk              |  14 +-
>>   target/linux/x86/image/64.mk                  |   5 +
>>   target/linux/x86/image/Makefile               | 199 +++++++-----------
>>   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 --
>>   target/linux/x86/legacy/target.mk             |   1 +
>>   23 files changed, 255 insertions(+), 249 deletions(-)
>>   create mode 100644 package/boot/grub2/files/81_upgrade_bootloader
>>   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
>>
> tested on systems with multiple drives and multiple partitions, the only thing is that the target images will always be gziped, this is annoying on other targets too, also needs a rebase

Thank You for testing.
The generated images are gziped because they are built by default and this will save space and bandwidth, maybe this can be turned off by default and enabling it would be responsibility of buildbots, this would need some input of someone responsible for infrastructure.
I'll rebase and add minor improvements to this series after sorting out some of my pending patches.

> 
> Regards
> 

Regards, Tomasz.
Lucian Cristian Feb. 6, 2019, 2:13 p.m. UTC | #4
On 06.02.2019 16:08, Tomasz Maciej Nowak wrote:
> W dniu 04.02.2019 o 09:29, Lucian Cristian pisze:
>> On 13.01.2019 23:49, Tomasz Maciej Nowak wrote:
>>> This is aftermath of partially failed series [1].
>>> When I was searching for ways to upgrade of bootloader on existing
>>> OpenWrt installations, I noticed that it'll be difficult to add this
>>> feature within existing code creating x86 target images. I decided to
>>> switch this code to generic one, wich is used in most of the OpenWrt
>>> targets. Both of the chages are rather intrusive hence te RFC tag.
[...]
>>>    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
>>>
>> tested on systems with multiple drives and multiple partitions, the only thing is that the target images will always be gziped, this is annoying on other targets too, also needs a rebase
> Thank You for testing.
> The generated images are gziped because they are built by default and this will save space and bandwidth, maybe this can be turned off by default and enabling it would be responsibility of buildbots, this would need some input of someone responsible for infrastructure.
> I'll rebase and add minor improvements to this series after sorting out some of my pending patches.
>
>> Regards
>>
> Regards, Tomasz.
>
selecting ext4, gzip option will appear and deselecting gzip images has 
no effect, before the option was available for squashfs also, anyway 
this is another issue that is seen on other targets and if I remember 
there was recently a PR related to this option on some target


Regards