Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: cleanups preparing release #12531

Merged
merged 10 commits into from May 12, 2023

Conversation

PolynomialDivision
Copy link
Member

@PolynomialDivision PolynomialDivision commented May 4, 2023

No description provided.

@PolynomialDivision PolynomialDivision force-pushed the cleanups-before-release branch 4 times, most recently from 6bed8b7 to 763011e Compare May 4, 2023 20:30
@john-tho
Copy link
Contributor

john-tho commented May 4, 2023

A few extras still around:

find target/linux -iname '*-5.10'
target/linux/ipq806x/files-5.10
target/linux/bcm4908/files-5.10
target/linux/realtek/dts-5.10
target/linux/realtek/files-5.10
target/linux/generic/pending-5.10
target/linux/generic/hack-5.10
target/linux/generic/backport-5.10

The make DEPENDSed and config vars LINUX_5_10 & LINUX_5_15
git grep -E 'LINUX_5_1(0|5)'

b54c661

Remove the old 5.10 patches and configs except ath25, lantiq and omap

The commit message is not correct? Those paths got removed as well.

@github-actions github-actions bot added build/scripts/tools pull request/issues for build, scripts and tools related changes core packages pull request/issue for core (in-tree) packages kernel pull request/issue with Linux kernel related changes target/apm821xx pull request/issue for apm821xx target target/archs38 pull request/issue for archs38 target target/armvirt pull request/issue for armvirt target target/at91 pull request/issue for at91 target target/ath25 pull request/issue for ath25 target target/ath79 pull request/issue for ath79 target target/bcm27xx pull request/issue for bcm27xx target target/bcm47xx pull request/issue for bcm47xx target target/bcm4908 pull request/issue for bcm4908 target target/bcm53xx pull request/issue for bcm53xx target target/gemini pull request/issue for gemini target target/ipq806x pull request/issue for ipq806x target target/kirkwood pull request/issue for kirkwood target target/lantiq pull request/issue for lantiq target target/layerscape pull request/issue for layerscape target target/malta pull request/issue for malta target target/mpc85xx pull request/issue for mpc85xx target target/mvebu pull request/issue for mvebu target target/octeon pull request/issue for octeon target target/omap pull request/issue for omap target target/pistachio pull request/issue for pistachio target target/ramips pull request/issue for ramips target labels May 4, 2023
@PolynomialDivision
Copy link
Member Author

If you're checking the upstream Kconfigs and Makefiles yourself to ensure things will build properly on both 5.15 and 6.1 then that's all fine.

I just checked everything, if the symbols and names are still the same. However, I am not sure how to find the kmod dependencies of the different kmods. Is there a good way to check that?

@PolynomialDivision PolynomialDivision force-pushed the cleanups-before-release branch 2 times, most recently from 55f9267 to 5f066d1 Compare May 5, 2023 13:46
@PolynomialDivision PolynomialDivision marked this pull request as ready for review May 5, 2023 13:48
@PolynomialDivision
Copy link
Member Author

I would say this is ready.

@Ansuel
Copy link
Member

Ansuel commented May 5, 2023

@PolynomialDivision nice cleanup... I wonder if we should make a list of thing to check when these kind of thing has to happen. What do you think? And maybe put it in the wiki?

@PolynomialDivision
Copy link
Member Author

What do you think? And maybe put it in the wiki?

Yes of course. Documentation is always important. :)

@abajk
Copy link
Contributor

abajk commented May 6, 2023

It is still possible to remove some unused code:

$ grep -rni "LINUX_VERSION_CODE" target/ | grep -v ">= KERNEL_VERSION(5,15,0)"
...
target/linux/generic/files/drivers/net/phy/ar8216.c:894:#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
target/linux/generic/files/drivers/net/phy/ar8216.c:906:#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
target/linux/generic/files/drivers/net/phy/b53/b53_common.c:509:#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
target/linux/generic/files/drivers/net/phy/b53/b53_common.c:515:#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)
target/linux/generic/files/block/partitions/fit.c:76:#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)
target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c:389:#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 5, 0)
target/linux/ramips/files/drivers/pinctrl/pinctrl-aw9523.c:440:#if LINUX_VERSION_CODE <= KERNEL_VERSION(5, 5, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c:67:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c:80:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c:147:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c:181:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c:159:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/mdio_rt2880.c:179:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
target/linux/ramips/files/drivers/net/ethernet/ralink/mtk_eth_soc.c:1099:#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)

@neheb
Copy link
Contributor

neheb commented May 7, 2023

should probably add the ksmbd change here.

@PolynomialDivision
Copy link
Member Author

should probably add the ksmbd change here.

Which change?

@PolynomialDivision
Copy link
Member Author

It is still possible to remove some unused code:

@john-tho already suggsted that. :)

@neheb
Copy link
Contributor

neheb commented May 7, 2023

should probably add the ksmbd change here.

Which change?

#10296

Just keep the 5.15 changes.

@PolynomialDivision PolynomialDivision force-pushed the cleanups-before-release branch 2 times, most recently from df7f87f to 1821d31 Compare May 12, 2023 08:56
@Ansuel
Copy link
Member

Ansuel commented May 12, 2023

@PolynomialDivision ok to merge this? any problem that may arise or it's safe?

alexeys85 and others added 10 commits May 12, 2023 13:02
Switch to kernel 5.15 although it is marked as source only. It is marked
as source only because the eth0 interface can't be added to the br-lan
default interface resulting in a broken ethernet [0]. There is a
workaround to set a higher pvd (e.g. to 4000) in the dts [1].

Other functionality was already tested on a Beaglebone Black for
+6month now without issues.

Merging this is important to finally branch a new release. We want to
get rid completely of 5.10 kernel. Without this commit we get following
error: "Missing kernel version/hash file for 5.10." Hopfully someone
will fix the board in the rc phase.

- [0] openwrt#11953
- [1] openwrt#11953 (comment)

Signed-off-by: Alexey Smirnov <s.alexey@gmail.com>
[rewrite commit message]
Signed-off-by: Nick Hainke <vincent@systemli.org>
Copy config and patch from kernel 5.10 to kernel 5.15.

Signed-off-by: Nick Hainke <vincent@systemli.org>
Manually refreshed:
- 140-redboot_boardconfig.patch
- 141-redboot_partition_scan.patch
- 142-redboot_various_erase_size_fix.patch

Automatically refreshed:
- 107-ar5312_gpio.patch
- 108-ar2315_gpio.patch
- 110-ar2313_ethernet.patch
- 120-spiflash.patch
- 130-watchdog.patch
- 330-board_leds.patch

Use "make kernel_oldconfig" to refresh the new kernel config.

The Ubiquiti Nanostation 2 (XS2) and Ubiquiti Nanostation 5 (XS5) should
be marked as broken when switching to 5.15 by default. The new kernel
does not fit anymore into the partition.

Signed-off-by: Nick Hainke <vincent@systemli.org>
Switch to kernel 5.15 although it is marked as source only. It is marked
as source only because nobody was able to test this device.

Merging this is important to finally branch a new release. We want to
get rid completely of 5.10 kernel. Without this commit we get following
error: "Missing kernel version/hash file for 5.10." Hopfully someone
will fix the board in the rc phase or it will be removed completly.

Signed-off-by: Nick Hainke <vincent@systemli.org>
All targets are bumped to 5.15. Remove the old 5.10 patches, configs
and files using:

  find target/linux -iname '*-5.10' -exec rm -r {} \;

Further, remove the 5.10 include.

Signed-off-by: Nick Hainke <vincent@systemli.org>
The purpose of this is to remove all of the compatibility code that is
normally compiled into glibc for kernels < 5.15 from our build. Only
Linux kernels >= 5.15 will be supported.

Signed-off-by: Nick Hainke <vincent@systemli.org>
We removed 5.10 kernel, so remove also the patch that only affects 5.10
kernels.

Manually refresh:
- 0005-SSDK-config-add-kernel-5.15.patch
- 0010-QSDK-config-Avoid-Werror-heroics.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>
We only use 5.15 kernel. So remove all those unnecessary appearances.

Signed-off-by: Nick Hainke <vincent@systemli.org>
We only use 5.15 kernel. So remove all those unnecessary symbols
referencing 5.10 or 5.15 kernel.

Can be found with:
  git grep -E 'LINUX_5_1(0|5)'

Note that we remove the dependency from "sound-soc-chipdip-dac" instead
of removing the complete kernel package. The 5.15 version bump forgot to
delete the "@LINUX_5_10" dependency. The kernel package is still needed
in 5.15 kernel.

Signed-off-by: Nick Hainke <vincent@systemli.org>
We switched to 5.15 kernel, so we don't need to maintain 5.10
compatibility anymore.

Signed-off-by: Nick Hainke <vincent@systemli.org>
@PolynomialDivision
Copy link
Member Author

ok to merge this?

I would say yes :)

any problem that may arise or it's safe?

At least I don't see any issues.

@openwrt-bot openwrt-bot merged commit 1fda304 into openwrt:master May 12, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/scripts/tools pull request/issues for build, scripts and tools related changes core packages pull request/issue for core (in-tree) packages kernel pull request/issue with Linux kernel related changes target/apm821xx pull request/issue for apm821xx target target/archs38 pull request/issue for archs38 target target/armvirt pull request/issue for armvirt target target/at91 pull request/issue for at91 target target/ath25 pull request/issue for ath25 target target/ath79 pull request/issue for ath79 target target/bcm27xx pull request/issue for bcm27xx target target/bcm47xx pull request/issue for bcm47xx target target/bcm53xx pull request/issue for bcm53xx target target/bcm4908 pull request/issue for bcm4908 target target/gemini pull request/issue for gemini target target/ipq806x pull request/issue for ipq806x target target/kirkwood pull request/issue for kirkwood target target/lantiq pull request/issue for lantiq target target/layerscape pull request/issue for layerscape target target/malta pull request/issue for malta target target/mpc85xx pull request/issue for mpc85xx target target/mvebu pull request/issue for mvebu target target/octeon pull request/issue for octeon target target/omap pull request/issue for omap target target/pistachio pull request/issue for pistachio target target/ramips pull request/issue for ramips target target/realtek pull request/issue for realtek target target/rockchip pull request/issue for rockchip target target/sunxi pull request/issue for sunxi target target/tegra pull request/issue for tegra target target/uml pull request/issue for uml target target/x86 pull request/issue for x86 target toolchain pull request/issue with toolchain related changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants