[PATCHv3 2/3] busybox: update to 1.33

Hannu Nyman hannu.nyman at iki.fi
Fri Jan 8 15:23:58 EST 2021


Rosen Penev kirjoitti 8.1.2021 klo 5.30:
> ...
>
> Refresh config and patches.
>
> Signed-off-by: Rosen Penev <rosenp at gmail.com>
> ---
>   v3: more complete config refresh.
>   v2: refreshed config and slight rewording.


I have applied and tested the v3 patch series in my builds for 
ath79/WNDR3700v2, ipq806x/R7800 and mvebu/WRT3200ACM. Looks ok to me.

(The code is identical to the v2 patches plus the fixes that I communicated 
via the mailing list)

My only suggestion is that it might be good to document in the commit message 
the config refresh commands and the five manual edits that need to be made 
after the scripted config update. I did that with the 1.31.0 version bump, so 
Hauke was now able to quote that as example to Rosen.

The refresh scripts remove three OpenWrt logic additions, do not see one 
hidden option leading to omission of shell arithmetics and do not add quotes 
to sourced Config.in files like currently required.


Config refresh:

Refresh commands, run after busybox is first built once:

   cd package/utils/busybox/config/
   ../convert_menuconfig.pl 
../../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0
   cd ..
   ./convert_defaults.pl < 
../../../build_dir/target-mips_24kc_musl/busybox-default/busybox-1.33.0/.config 
 > Config-defaults.in


Manual edits needed afterward:

* Config-defaults.in:  OpenWrt config symbol IPV6 logic applied to 
BUSYBOX_DEFAULT_FEATURE_IPV6
* Config-defaults.in:  OpenWrt configTARGET_bcm53xx logic applied to 
BUSYBOX_DEFAULT_TRUNCATE (commit 547f1ec)
* editors/Config.in: Add USE_GLIBC dependency to 
BUSYBOX_CONFIG_FEATURE_VI_REGEX_SEARCH (commit f141090)
* shell/Config.in : change at "Options common to all shells"  the symbol 
SHELL_ASH  -->  BUSYBOX_CONFIG_SHELL_ASH
    (discussion in 
http://lists.openwrt.org/pipermail/openwrt-devel/2021-January/033140.html
      Apparently our script does not see the hidden option while prepending 
config options with "BUSYBOX_CONFIG_" which leads to a missed dependency when 
the options are later evaluated.)
* Edit Config.in files by adding quotes to sourced items in config/Config.in, 
networking/Config.in and util-linux/Config.in (commit 1da014f)


In the long run it might be better to

* un-hide (BUSYBOX_CONFIG_)SHELL_ASH so that the script would fiind the 
dependency for it
* edit the refresh script to add the quotes to the sourced lines, if possible

but those two improvements can be investigated after the version bump.




More information about the openwrt-devel mailing list