Skip to content

Commit

Permalink
ath79: use kernel 6.1 as default
Browse files Browse the repository at this point in the history 
Signed-off-by: David Bauer <mail@david-bauer.net>
  • Loading branch information
@blocktrron
blocktrron committed Sep 8, 2023
1 parent aee2af0 commit c94383d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion target/linux/ath79/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SUBTARGETS:=generic mikrotik nand tiny

FEATURES:=ramdisk squashfs usbgadget

KERNEL_PATCHVER:=5.15
KERNEL_PATCHVER:=6.1
KERNEL_TESTING_PATCHVER:=6.1

include $(INCLUDE_DIR)/target.mk
Expand Down

3 comments on commit c94383d

@ptpt52
Copy link
Contributor

@ptpt52 ptpt52 commented on c94383d Sep 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DragonBluep @blocktrron
package/kernel/mac80211 build failed

make[2]: Leaving directory '/mnt/Data/Sources/openwrt/x-wrt/package/network/utils/iw'
time: package/network/utils/iw/tiny/compile#0.09#0.08#0.17
make[2]: Entering directory '/mnt/Data/Sources/openwrt/x-wrt/package/kernel/mac80211'
rm -f /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/.built
touch /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/.built_check
. /mnt/Data/Sources/openwrt/x-wrt/include/shell.sh; var2file "V_mac80211_config" /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/.config
make -C "/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24" KCFLAGS="-fmacro-prefix-map=/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl=target-mips_24kc_musl -fno-caller-saves " HOSTCFLAGS="-O2 -I/mnt/Data/Sources/openwrt/x-wrt/staging_dir/host/include -I/mnt/Data/Sources/openwrt/x-wrt/staging_dir/hostpkg/include -I/mnt/Data/Sources/openwrt/x-wrt/staging_dir/target-mips_24kc_musl/host/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-musl-" ARCH="mips" KBUILD_HAVE_NLS=no KBUILD_BUILD_USER="" KBUILD_BUILD_HOST="" KBUILD_BUILD_TIMESTAMP="Sat Sep  9 00:47:33 2023" KBUILD_BUILD_VERSION="0" KBUILD_HOSTLDFLAGS="-L/mnt/Data/Sources/openwrt/x-wrt/staging_dir/host/lib" CONFIG_SHELL="bash" V=''  cmd_syscalls= KBUILD_EXTRA_SYMBOLS="/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/natflow.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/r8152.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/gpio-button-hotplug.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/mtd-rw.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/natcap.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/rproxy.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/ubootenv-nvram.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/nat46.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/ovpn-dco.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/r8101.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/jool.symvers" KERNELRELEASE=6.1.52 EXTRA_CFLAGS="-I/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/include -fmacro-prefix-map=/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24=backports-6.1.24 " KLIB_BUILD="/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/linux-6.1.52" MODPROBE=true KLIB=/lib/modules/6.1.52 KERNEL_SUBLEVEL=1 KBUILD_LDFLAGS_MODULE_PREREQ= allnoconfig
make[3]: Entering directory '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24'
make[4]: 'Kconfig.versions' is up to date.
make[5]: 'conf' is up to date.
boolean symbol CRYPTO_LIB_ARC4 tested for 'm'? test forced to 'n'
#
# configuration written to .config
#
make[3]: Leaving directory '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24'
rm -rf /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/modules
make  -C "/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24" KCFLAGS="-fmacro-prefix-map=/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl=target-mips_24kc_musl -fno-caller-saves " HOSTCFLAGS="-O2 -I/mnt/Data/Sources/openwrt/x-wrt/staging_dir/host/include -I/mnt/Data/Sources/openwrt/x-wrt/staging_dir/hostpkg/include -I/mnt/Data/Sources/openwrt/x-wrt/staging_dir/target-mips_24kc_musl/host/include -Wall -Wmissing-prototypes -Wstrict-prototypes" CROSS_COMPILE="mips-openwrt-linux-musl-" ARCH="mips" KBUILD_HAVE_NLS=no KBUILD_BUILD_USER="" KBUILD_BUILD_HOST="" KBUILD_BUILD_TIMESTAMP="Sat Sep  9 00:47:33 2023" KBUILD_BUILD_VERSION="0" KBUILD_HOSTLDFLAGS="-L/mnt/Data/Sources/openwrt/x-wrt/staging_dir/host/lib" CONFIG_SHELL="bash" V=''  cmd_syscalls= KBUILD_EXTRA_SYMBOLS="/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/natflow.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/r8152.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/gpio-button-hotplug.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/mtd-rw.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/natcap.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/rproxy.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/ubootenv-nvram.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/nat46.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/ovpn-dco.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/r8101.symvers /mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/symvers/jool.symvers" KERNELRELEASE=6.1.52 EXTRA_CFLAGS="-I/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/include -fmacro-prefix-map=/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24=backports-6.1.24 " KLIB_BUILD="/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/linux-6.1.52" MODPROBE=true KLIB=/lib/modules/6.1.52 KERNEL_SUBLEVEL=1 KBUILD_LDFLAGS_MODULE_PREREQ= modules
make[3]: Entering directory '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24'
make[4]: 'Kconfig.versions' is up to date.
make[6]: 'Kconfig.versions' is up to date.
make[7]: 'conf' is up to date.
boolean symbol CRYPTO_LIB_ARC4 tested for 'm'? test forced to 'n'
#
# configuration written to .config
#
Building backport-include/backport/autoconf.h ... done.
  CC [M]  /mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k/main.o
In file included from ./include/linux/string.h:253,
                 from /mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/backport-include/linux/string.h:3,
                 from ./include/linux/bitmap.h:11,
                 from ./include/linux/cpumask.h:12,
                 from ./arch/mips/include/asm/processor.h:15,
                 from ./arch/mips/include/asm/thread_info.h:16,
                 from ./include/linux/thread_info.h:60,
                 from ./include/asm-generic/current.h:5,
                 from ./arch/mips/include/generated/asm/current.h:1,
                 from ./include/linux/sched.h:12,
                 from /mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/backport-include/linux/sched.h:4,
                 from ./include/linux/delay.h:23,
                 from /mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/backport-include/linux/delay.h:3,
                 from /mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k/main.c:18:
In function 'fortify_memset_chk',
    inlined from 'ath9k_ps_wakeup' at /mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k/main.c:140:3:
./include/linux/fortify-string.h:314:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
  314 |                         __write_overflow_field(p_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
scripts/Makefile.build:250: recipe for target '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k/main.o' failed
make[10]: *** [/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k/main.o] Error 1
scripts/Makefile.build:500: recipe for target '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k' failed
make[9]: *** [/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath/ath9k] Error 2
scripts/Makefile.build:500: recipe for target '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath' failed
make[8]: *** [/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless/ath] Error 2
scripts/Makefile.build:500: recipe for target '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless' failed
make[7]: *** [/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/drivers/net/wireless] Error 2
Makefile:2012: recipe for target '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24' failed
make[6]: *** [/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24] Error 2
Makefile.build:13: recipe for target 'modules' failed
make[5]: *** [modules] Error 2
Makefile.real:93: recipe for target 'modules' failed
make[4]: *** [modules] Error 2
Makefile:120: recipe for target 'modules' failed
make[3]: *** [modules] Error 2
make[3]: Leaving directory '/mnt/Data/Sources/openwrt/x-wrt/tmpfs/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24'
Makefile:395: recipe for target '/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/.built' failed
make[2]: *** [/mnt/Data/Sources/openwrt/x-wrt/build_dir/target-mips_24kc_musl/linux-ath79_generic/backports-6.1.24/.built] Error 2
make[2]: Leaving directory '/mnt/Data/Sources/openwrt/x-wrt/package/kernel/mac80211'
time: package/kernel/mac80211/regular/compile#1.39#0.49#1.77
    ERROR: package/kernel/mac80211 failed to build (build variant: regular).
package/Makefile:118: recipe for target 'package/kernel/mac80211/compile' failed
make[1]: *** [package/kernel/mac80211/compile] Error 1
make[1]: Leaving directory '/mnt/Data/Sources/openwrt/x-wrt'
/mnt/Data/Sources/openwrt/x-wrt/include/toplevel.mk:230: recipe for target 'package/kernel/mac80211/compile' failed
make: *** [package/kernel/mac80211/compile] Error 2

@DragonBluep
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DragonBluep @blocktrron
package/kernel/mac80211 build failed

@ptpt52 This patch can workaround it. 6fe01c2

There are some discussions about this warning #12764. Things are still not clear how it happened. It seems to only occur in specific system versions/ targets. After upgrading to Debian12, I can no longer reproduce this issue. And Github CI has not complained about it recently. Maybe upgrading your host packages can solve this issue.

@blocktrron @hauke I've sent the MikroTik devices fix to the mailing list https://patchwork.ozlabs.org/project/openwrt/patch/TYAP286MB0315312AA0050C29E864A395BCECA@TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM/. I have no idea why CI failed on tiny target since all sub-targets compile the same code, and I can sure kill variable is not defined but unused. My local build test does not catch this issue.
ref: https://elixir.bootlin.com/linux/v6.1.52/source/net/ipv4/inet_timewait_sock.c#L274

@schuettecarsten
Copy link

@schuettecarsten schuettecarsten commented on c94383d Sep 11, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ptpt52 @DragonBluep @blocktrron
Switch to gcc-13 in toolchain config to workaround the compiler issue. Here with my setup, I run into some strage wifi roaming issues with the new kernel-6.1.

Please sign in to comment.