From 47eb06821f29f7bfdbccb4c90641e1fb4a58f58c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 14 Apr 2022 11:00:19 +0800 Subject: [PATCH 01/12] config/Config-images.in: tweak default settings for buildbot Signed-off-by: Tianling Shen (cherry picked from commit 727aabb4473b34ca9ac48a06c5fa9bd031d9d1b0) --- config/Config-images.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/Config-images.in b/config/Config-images.in index 9a05ca11a4..15f976e411 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -244,30 +244,35 @@ menu "Target Images" bool "Build LiveCD image (ISO)" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES + default y if BUILDBOT config QCOW2_IMAGES bool "Build PVE/KVM image files (QCOW2)" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES select PACKAGE_kmod-e1000 + default y if BUILDBOT config VDI_IMAGES bool "Build VirtualBox image files (VDI)" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES select PACKAGE_kmod-e1000 + default y if BUILDBOT config VHDX_IMAGES bool "Build Hyper-V image files (VHDX)" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES select PACKAGE_kmod-tulip + default y if BUILDBOT config VMDK_IMAGES bool "Build VMware image files (VMDK)" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES select PACKAGE_kmod-e1000 + default y if BUILDBOT config TARGET_IMAGES_GZIP bool "GZip images" @@ -288,6 +293,7 @@ menu "Target Images" config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MiB)" depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_mvebu || TARGET_rb532 || TARGET_sunxi || TARGET_uml + default 800 if BUILDBOT default 160 help Select the root filesystem partition size. From 4ecb47fd90d05d8eeaf3f9ab7e5ceddcd04be194 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 14 Apr 2022 11:00:49 +0800 Subject: [PATCH 02/12] ar71xx/image: use short `VERSION_DIST` Workaround for max 14 chars limitation. Signed-off-by: Tianling Shen (cherry picked from commit 5e66ed82a8aa1966ca2232f087d77cdf2456ed7c) --- target/linux/ar71xx/image/generic.mk | 2 +- target/linux/ar71xx/image/legacy.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 7c431a9c9e..6e715b0ce1 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -28,7 +28,7 @@ define Build/mkdapimg2 $(STAGING_DIR_HOST)/bin/mkdapimg2 \ -i $@ -o $@.new \ -s $(DAP_SIGNATURE) \ - -v EMORTAL-$(firstword $(subst +, ,$(firstword $(subst -, ,$(REVISION))))) \ + -v Emortal-$(firstword $(subst +, ,$(firstword $(subst -, ,$(REVISION))))) \ -r Default \ $(if $(1),-k $(1)) mv $@.new $@ diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk index e1ede348dd..5291e2a0c1 100644 --- a/target/linux/ar71xx/image/legacy.mk +++ b/target/linux/ar71xx/image/legacy.mk @@ -486,11 +486,11 @@ define Image/Build/Belkin $(eval rootsize=$(call mtdpartsize,rootfs,$(4))) $(call Sysupgrade/RKuImage,$(1),$(2),$(kernsize),$(rootsize)) if [ -e "$(call sysupname,$(1),$(2))" ]; then \ - edimax_fw_header -m $(5) -v "$(shell echo -n $(VERSION_DIST)$(REVISION) | cut -c -13)" \ + edimax_fw_header -m $(5) -v "$(shell echo -n Emortal$(REVISION) | cut -c -13)" \ -n "uImage" \ -i $(KDIR_TMP)/vmlinux-$(2).uImage \ -o $(KDIR_TMP)/$(2)-uImage; \ - edimax_fw_header -m $(5) -v "$(shell echo -n $(VERSION_DIST)$(REVISION) | cut -c -13)" \ + edimax_fw_header -m $(5) -v "$(shell echo -n Emortal$(REVISION) | cut -c -13)" \ -n "rootfs" \ -i $(KDIR)/root.$(1) \ -o $(KDIR_TMP)/$(2)-rootfs; \ From 3037af80c4e59643c031892e0a272af2574071fb Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 15 Apr 2022 02:28:31 +0800 Subject: [PATCH 03/12] autocore: mark as nonshared This package contains target-specific stuffs. Signed-off-by: Tianling Shen (cherry picked from commit 89106c7fedae113fee6a7f77f9b0691ce712d3ee) --- package/emortal/autocore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/emortal/autocore/Makefile b/package/emortal/autocore/Makefile index 1ec08a91f8..703bd91748 100644 --- a/package/emortal/autocore/Makefile +++ b/package/emortal/autocore/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autocore -PKG_VERSION:=2 +PKG_FLAGS:=nonshared PKG_RELEASE:=$(COMMITCOUNT) PKG_CONFIG_DEPENDS:= \ From c0c201ee95163aabf6cac0034f4cc0dd16cef694 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Wed, 6 Apr 2022 23:21:08 +0800 Subject: [PATCH 04/12] mac80211: fixes build after kernel 4.9.297 Fixes: #666 Also refresh all patches. --- .../patches/ath/553-ath9k_of_gpio_mask.patch | 2 +- .../ath/983-ath10k-allow-vht-on-2g.patch | 2 +- .../patches/build/005-fix_build_bug.patch | 18 ++++++++++++++++++ .../subsys/600-mac80211-allow-vht-on-2g.patch | 6 +++--- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 package/kernel/mac80211/patches/build/005-fix_build_bug.patch diff --git a/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch b/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch index 72b99050c4..082667c873 100644 --- a/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch +++ b/package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch @@ -13,7 +13,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, const struct ath_bus_ops *bus_ops) { -@@ -758,6 +764,9 @@ static int ath9k_init_softc(u16 devid, s +@@ -760,6 +766,9 @@ static int ath9k_init_softc(u16 devid, s if (ret) goto err_hw; diff --git a/package/kernel/mac80211/patches/ath/983-ath10k-allow-vht-on-2g.patch b/package/kernel/mac80211/patches/ath/983-ath10k-allow-vht-on-2g.patch index eeca88a613..441e2415ce 100644 --- a/package/kernel/mac80211/patches/ath/983-ath10k-allow-vht-on-2g.patch +++ b/package/kernel/mac80211/patches/ath/983-ath10k-allow-vht-on-2g.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c -@@ -4718,6 +4718,7 @@ static void ath10k_mac_setup_ht_vht_cap( +@@ -4636,6 +4636,7 @@ static void ath10k_mac_setup_ht_vht_cap( if (ar->phy_capability & WHAL_WLAN_11G_CAPABILITY) { band = &ar->mac.sbands[NL80211_BAND_2GHZ]; band->ht_cap = ht_cap; diff --git a/package/kernel/mac80211/patches/build/005-fix_build_bug.patch b/package/kernel/mac80211/patches/build/005-fix_build_bug.patch new file mode 100644 index 0000000000..f7f54f0c4e --- /dev/null +++ b/package/kernel/mac80211/patches/build/005-fix_build_bug.patch @@ -0,0 +1,18 @@ +--- a/backport-include/linux/build_bug.h ++++ b/backport-include/linux/build_bug.h +@@ -1,10 +1,12 @@ + #ifndef __BP_BUILD_BUG_H + #define __BP_BUILD_BUG_H ++#include + +-#if LINUX_VERSION_IS_GEQ(4,13,0) ++#if LINUX_VERSION_IS_GEQ(4,13,0) || \ ++ LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0) + #include_next +-#else /* LINUX_VERSION_IS_GEQ(4,13,0) */ ++#else + #include +-#endif /* LINUX_VERSION_IS_GEQ(4,13,0) */ ++#endif /* >= 4.13 */ + + #endif /* __BP_BUILD_BUG_H */ diff --git a/package/kernel/mac80211/patches/subsys/600-mac80211-allow-vht-on-2g.patch b/package/kernel/mac80211/patches/subsys/600-mac80211-allow-vht-on-2g.patch index da9fcd2185..e1192550a2 100644 --- a/package/kernel/mac80211/patches/subsys/600-mac80211-allow-vht-on-2g.patch +++ b/package/kernel/mac80211/patches/subsys/600-mac80211-allow-vht-on-2g.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c -@@ -135,7 +135,8 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru +@@ -137,7 +137,8 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru have_80mhz = false; for (i = 0; i < sband->n_channels; i++) { if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED | @@ -12,7 +12,7 @@ have_80mhz = true; --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -1769,7 +1769,8 @@ static int ieee80211_build_preq_ies_band +@@ -1618,7 +1618,8 @@ static int ieee80211_build_preq_ies_band /* Check if any channel in this sband supports at least 80 MHz */ for (i = 0; i < sband->n_channels; i++) { if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED | @@ -24,7 +24,7 @@ have_80mhz = true; --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -4824,7 +4824,8 @@ static int ieee80211_prep_channel(struct +@@ -4694,7 +4694,8 @@ static int ieee80211_prep_channel(struct have_80mhz = false; for (i = 0; i < sband->n_channels; i++) { if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED | From efe69269efb0f4df5f402d178b93c6bf2ca58c86 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 9 Apr 2022 23:21:28 +0800 Subject: [PATCH 05/12] fast-classifier: fixes header linking failure issue --- package/kernel/fast-classifier/Makefile | 1 + package/kernel/shortcut-fe/Makefile | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/kernel/fast-classifier/Makefile b/package/kernel/fast-classifier/Makefile index 5fe73bc7bf..e04601696c 100644 --- a/package/kernel/fast-classifier/Makefile +++ b/package/kernel/fast-classifier/Makefile @@ -36,6 +36,7 @@ define Package/fast-classifier-example/description endef SFE_MAKE_OPTS:=SFE_SUPPORT_IPV6=y +EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/shortcut-fe define Build/Compile +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" $(strip $(SFE_MAKE_OPTS)) \ diff --git a/package/kernel/shortcut-fe/Makefile b/package/kernel/shortcut-fe/Makefile index 2c2976c08b..d9b9c72197 100644 --- a/package/kernel/shortcut-fe/Makefile +++ b/package/kernel/shortcut-fe/Makefile @@ -68,15 +68,13 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/shortcut-fe - $(CP) -rf $(PKG_BUILD_DIR)/sfe.h $(1)/usr/include/shortcut-fe + $(CP) -rf $(PKG_BUILD_DIR)/*.h $(1)/usr/include/shortcut-fe endef -#define KernelPackage/shortcut-fe/install -# $(INSTALL_DIR) $(1)/etc/init.d -# $(INSTALL_BIN) ./files/etc/init.d/shortcut-fe $(1)/etc/init.d -# $(INSTALL_DIR) $(1)/usr/bin -# $(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin -#endef +define KernelPackage/shortcut-fe/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) ./files/usr/bin/sfe_dump $(1)/usr/bin +endef $(eval $(call KernelPackage,shortcut-fe)) $(eval $(call KernelPackage,shortcut-fe-cm)) From c05852c764b6f5e500fb3eb3dfb053e0ba3af0f8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 24 Aug 2021 13:16:58 +0200 Subject: [PATCH 06/12] libubox: update to the latest version d716ac4bc423 list.h: add a few missing iterator macros Signed-off-by: Felix Fietkau --- package/libs/libubox/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 20badb8eab..dfc7f78b1d 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git -PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca -PKG_SOURCE_DATE:=2021-05-16 -PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e +PKG_MIRROR_HASH:=1cdb91ac0ee925f133ee9f70eac131a99def312fe7cf0aed44df84eb1762e30b +PKG_SOURCE_DATE:=2021-08-19 +PKG_SOURCE_VERSION:=d716ac4bc4236031d4c3cc1ed362b502e20e3787 CMAKE_INSTALL:=1 PKG_LICENSE:=ISC From 36db11effd04e5a4a0c91b7678ce5457c105951e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Mar 2022 21:44:06 +0100 Subject: [PATCH 07/12] linux-firmware: Update to version 20220209 This switches the iwlwifi-firmware-ax200 file to API version 66, this is the most recent version supported by our driver. The following files used in OpenWrt changed: amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_dmcub.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_010a.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_010b.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_0303.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_gf.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_gf_010a.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_gf_010b.bin ar3k-firmware/lib/firmware/qca/nvm_usb_00130201_gf_0303.bin ar3k-firmware/lib/firmware/qca/rampatch_usb_00130200.bin ar3k-firmware/lib/firmware/qca/rampatch_usb_00130201.bin iwlwifi-firmware-ax200/lib/firmware/iwlwifi-cc-a0-66.ucode iwlwifi-firmware-ax210/lib/firmware/iwlwifi-ty-a0-gf-a0-66.ucode iwlwifi-firmware-ax210/lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm iwlwifi-firmware-iwl9000/lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode iwlwifi-firmware-iwl9260/lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode rtl8822ce-firmware/lib/firmware/rtw88/rtw8822c_fw.bin Signed-off-by: Hauke Mehrtens --- package/firmware/linux-firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 4ef67ba747..99bd4aa6fc 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20211216 +PKG_VERSION:=20220209 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d +PKG_HASH:=e2e46fa618414952bbf2f6920cd3abcddbef45bfb7d1352994b4bfc35394d177 PKG_MAINTAINER:=Felix Fietkau From be75caf14c675df5e2f2deff69fec51e7d5e9fff Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 12 Apr 2022 00:12:57 +0200 Subject: [PATCH 08/12] linux-firmware: Update to version 20220411 The following files used in OpenWrt changed: amd64-microcode/lib/firmware/amd-ucode/microcode_amd_fam17h.bin amd64-microcode/lib/firmware/amd-ucode/microcode_amd_fam19h.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_mec.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_smc.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_sos.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_ta.bin amdgpu-firmware/lib/firmware/amdgpu/aldebaran_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/arcturus_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_ce.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_me.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_mec.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_smc.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_sos.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_ta.bin amdgpu-firmware/lib/firmware/amdgpu/beige_goby_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/cyan_skillfish2_ce.bin amdgpu-firmware/lib/firmware/amdgpu/cyan_skillfish2_me.bin amdgpu-firmware/lib/firmware/amdgpu/cyan_skillfish2_mec.bin amdgpu-firmware/lib/firmware/amdgpu/cyan_skillfish2_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/cyan_skillfish2_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/dcn_3_1_6_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_ce.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_me.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_mec.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_smc.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_sos.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_ta.bin amdgpu-firmware/lib/firmware/amdgpu/dimgrey_cavefish_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/gc_10_3_7_ce.bin amdgpu-firmware/lib/firmware/amdgpu/gc_10_3_7_me.bin amdgpu-firmware/lib/firmware/amdgpu/gc_10_3_7_mec.bin amdgpu-firmware/lib/firmware/amdgpu/gc_10_3_7_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/gc_10_3_7_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/gc_10_3_7_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_asd.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_ce.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_me.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_mec.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_ta.bin amdgpu-firmware/lib/firmware/amdgpu/green_sardine_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_asd.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_ce.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_me.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_mec.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_sos.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_ta.bin amdgpu-firmware/lib/firmware/amdgpu/navi10_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/navi12_asd.bin amdgpu-firmware/lib/firmware/amdgpu/navi12_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/navi12_sdma1.bin amdgpu-firmware/lib/firmware/amdgpu/navi12_sos.bin amdgpu-firmware/lib/firmware/amdgpu/navi12_ta.bin amdgpu-firmware/lib/firmware/amdgpu/navi12_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/navi14_asd.bin amdgpu-firmware/lib/firmware/amdgpu/navi14_smc.bin amdgpu-firmware/lib/firmware/amdgpu/navi14_sos.bin amdgpu-firmware/lib/firmware/amdgpu/navi14_ta.bin amdgpu-firmware/lib/firmware/amdgpu/navi14_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_ce.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_me.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_mec.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_smc.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_sos.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_ta.bin amdgpu-firmware/lib/firmware/amdgpu/navy_flounder_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_asd.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_ce.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_me.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_mec.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_ta.bin amdgpu-firmware/lib/firmware/amdgpu/picasso_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/psp_13_0_8_asd.bin amdgpu-firmware/lib/firmware/amdgpu/psp_13_0_8_ta.bin amdgpu-firmware/lib/firmware/amdgpu/psp_13_0_8_toc.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_asd.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_ce.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_me.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_mec.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_ta.bin amdgpu-firmware/lib/firmware/amdgpu/raven2_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/raven_asd.bin amdgpu-firmware/lib/firmware/amdgpu/raven_ce.bin amdgpu-firmware/lib/firmware/amdgpu/raven_me.bin amdgpu-firmware/lib/firmware/amdgpu/raven_mec.bin amdgpu-firmware/lib/firmware/amdgpu/raven_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/raven_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/raven_ta.bin amdgpu-firmware/lib/firmware/amdgpu/raven_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_asd.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_ce.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_me.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_mec.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_ta.bin amdgpu-firmware/lib/firmware/amdgpu/renoir_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/sdma_5_2_7.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_ce.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_dmcub.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_me.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_mec.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_sdma.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_smc.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_sos.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_ta.bin amdgpu-firmware/lib/firmware/amdgpu/sienna_cichlid_vcn.bin amdgpu-firmware/lib/firmware/amdgpu/vangogh_asd.bin amdgpu-firmware/lib/firmware/amdgpu/vangogh_ce.bin amdgpu-firmware/lib/firmware/amdgpu/vangogh_me.bin amdgpu-firmware/lib/firmware/amdgpu/vangogh_mec.bin amdgpu-firmware/lib/firmware/amdgpu/vangogh_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/vangogh_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/vega10_asd.bin amdgpu-firmware/lib/firmware/amdgpu/vega10_ce.bin amdgpu-firmware/lib/firmware/amdgpu/vega10_me.bin amdgpu-firmware/lib/firmware/amdgpu/vega10_mec.bin amdgpu-firmware/lib/firmware/amdgpu/vega10_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/vega10_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/vega12_asd.bin amdgpu-firmware/lib/firmware/amdgpu/vega12_ce.bin amdgpu-firmware/lib/firmware/amdgpu/vega12_me.bin amdgpu-firmware/lib/firmware/amdgpu/vega12_mec.bin amdgpu-firmware/lib/firmware/amdgpu/vega12_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/vega12_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/vega20_asd.bin amdgpu-firmware/lib/firmware/amdgpu/vega20_ce.bin amdgpu-firmware/lib/firmware/amdgpu/vega20_me.bin amdgpu-firmware/lib/firmware/amdgpu/vega20_mec.bin amdgpu-firmware/lib/firmware/amdgpu/vega20_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/vega20_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_asd.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_ce.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_me.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_mec.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_mec2.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_pfp.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_rlc.bin amdgpu-firmware/lib/firmware/amdgpu/yellow_carp_ta.bin ibt-firmware/lib/firmware/intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq iwlwifi-firmware-ax210/lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm iwlwifi-firmware-iwl9260/lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode iwlwifi-firmware-iwl9000/lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode Signed-off-by: Hauke Mehrtens --- package/firmware/linux-firmware/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 99bd4aa6fc..382807d112 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20220209 +PKG_VERSION:=20220411 PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=e2e46fa618414952bbf2f6920cd3abcddbef45bfb7d1352994b4bfc35394d177 +PKG_HASH:=020b11f6412f4956f5a6f98de7d41867d2b30ea0ce81b1e2d206ec9840363849 PKG_MAINTAINER:=Felix Fietkau From d0a853244ac9b6a2005156c019a2b4db48e07904 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 13 Apr 2022 10:30:15 -0300 Subject: [PATCH 09/12] wolfssl: fix compilation with /dev/crypto This is trivial fix of a duplicate definition of 'int ret'. Signed-off-by: Eneas U de Queiroz (cherry picked from commit df622768da10f36ceeb20346b4c4ee4eb9a8a9ad) --- ...rt-devcrypto-devcrypto_aes.c-remove-.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch diff --git a/package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch b/package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch new file mode 100644 index 0000000000..3c0c0a07af --- /dev/null +++ b/package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch @@ -0,0 +1,19 @@ +From 096889927d9528d4fbeb3aab56d1fe8225d2e7ec Mon Sep 17 00:00:00 2001 +From: Daniel Pouzzner +Date: Thu, 14 Apr 2022 20:23:31 -0500 +Subject: [PATCH] wolfcrypt/src/port/devcrypto/devcrypto_aes.c: remove + redundant "int ret" in wc_AesCtrEncrypt() (supersedes #5052). + + +diff --git a/wolfcrypt/src/port/devcrypto/devcrypto_aes.c b/wolfcrypt/src/port/devcrypto/devcrypto_aes.c +index 3bc1d5bb1..28e145e27 100644 +--- a/wolfcrypt/src/port/devcrypto/devcrypto_aes.c ++++ b/wolfcrypt/src/port/devcrypto/devcrypto_aes.c +@@ -208,7 +208,6 @@ int wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz) + int ret; + struct crypt_op crt; + byte* tmp; +- int ret; + + if (aes == NULL || out == NULL || in == NULL) { + return BAD_FUNC_ARG; From 60c0af53ac2be091ccfaa55b33f7dd0a70940d27 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sun, 28 Nov 2021 02:31:54 +0100 Subject: [PATCH 10/12] ca-certicficates: Update to version 20211016 Update the ca-certificates and ca-bundle package from version 20210119 to version 20211016. Debian change-log entry [1]: |[...] |[ Julien Cristau ] |* mozilla/{certdata.txt,nssckbi.h}: Update Mozilla certificate authority | bundle to version 2.50 | The following certificate authorities were added (+): | + "AC RAIZ FNMT-RCM SERVIDORES SEGUROS" | + "GlobalSign Root R46" | + "GlobalSign Root E46" | + "GLOBALTRUST 2020" | + "ANF Secure Server Root CA" | + "Certum EC-384 CA" | + "Certum Trusted Root CA" | The following certificate authorities were removed (-): | - "QuoVadis Root CA" | - "Sonera Class 2 Root CA" | - "GeoTrust Primary Certification Authority - G2" | - "VeriSign Universal Root Certification Authority" | - "Chambers of Commerce Root - 2008" | - "Global Chambersign Root - 2008" | - "Trustis FPS Root CA" | - "Staat der Nederlanden Root CA - G3" | * Blacklist expired root certificate "DST Root CA X3" (closes: #995432) |[...] [1] Signed-off-by: Christian Lamparter (cherry picked from commit 7c99085bd69742f66207d61e9f2da5ec4f8f9d2f) --- package/system/ca-certificates/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile index 46bd871ccb..9fac32e7e3 100644 --- a/package/system/ca-certificates/Makefile +++ b/package/system/ca-certificates/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ca-certificates -PKG_VERSION:=20210119 +PKG_VERSION:=20211016 PKG_RELEASE:=1 PKG_MAINTAINER:= PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@DEBIAN/pool/main/c/ca-certificates -PKG_HASH:=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665 +PKG_HASH:=2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk From b3ffacb11bb7f7a0cd6924f7cd5146c988e88742 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 1 Dec 2021 15:01:23 +0100 Subject: [PATCH 11/12] ca-certificates: fix python3-cryptography woes in certdata2pem.py This patch is a revert of the upstream patch to Debian's ca-certificate commit 033d52259172 ("mozilla/certdata2pem.py: print a warning for expired certificates.") The reason is, that this change broke builds with the popular Ubuntu 20.04 LTS (focal) releases which are shipping with an older version of the python3-cryptography package that is not compatible. |Traceback (most recent call last): | File "certdata2pem.py", line 125, in | cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) |TypeError: load_der_x509_certificate() missing 1 required positional argument: 'backend' |make[5]: *** [Makefile:6: all] Error 1 ...or if the python3-cryptography was missing all together: |Traceback (most recent call last): | File "/certdata2pem.py", line 31, in | from cryptography import x509 |ModuleNotFoundError: No module named 'cryptography' More concerns were raised by Jo-Philipp Wich: "We don't want the build to depend on the local system time anyway. Right now it seems to be just a warning but I could imagine that eventually certs are simply omitted of found to be expired at build time which would break reproducibility." Link: Reported-by: Chen Minqiang Reported-by: Shane Synan Signed-off-by: Christian Lamparter (cherry picked from commit 25bc66eb40ea2c062940778fba601032b2579734) --- ...fix-python3-cryptography-woes-in-cer.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/system/ca-certificates/patches/0001-ca-certificates-fix-python3-cryptography-woes-in-cer.patch diff --git a/package/system/ca-certificates/patches/0001-ca-certificates-fix-python3-cryptography-woes-in-cer.patch b/package/system/ca-certificates/patches/0001-ca-certificates-fix-python3-cryptography-woes-in-cer.patch new file mode 100644 index 0000000000..add01f42c0 --- /dev/null +++ b/package/system/ca-certificates/patches/0001-ca-certificates-fix-python3-cryptography-woes-in-cer.patch @@ -0,0 +1,53 @@ +From 3c51cb5ff1d0db41fb3288fb555c7e7055cf3e86 Mon Sep 17 00:00:00 2001 +From: Christian Lamparter +Date: Wed, 1 Dec 2021 14:41:31 +0100 +Subject: [PATCH] ca-certificates: fix python3-cryptography woes in + certdata2pem.py + +reverts the code portion of the Debian's ca-certificate +commit 033d52259172 ("mozilla/certdata2pem.py: print a warning for expired certificates.") + +It broke builds with the popular Ubuntu 20.04 (focal) releases. +This was due to them shipping with an older python3-cryptography +version which is not compatible. + +More concerns were raised by jow- as well: +"We don't want the build to depend on the local system time anyway." + +Reported-by: Chen Minqiang +Reported-by: Shane Synan +Signed-off-by: Christian Lamparter +--- +--- a/work/mozilla/certdata2pem.py ++++ b/work/mozilla/certdata2pem.py +@@ -21,16 +21,12 @@ + # USA. + + import base64 +-import datetime + import os.path + import re + import sys + import textwrap + import io + +-from cryptography import x509 +- +- + objects = [] + + # Dirty file parser. +@@ -121,13 +117,6 @@ for obj in objects: + if obj['CKA_CLASS'] == 'CKO_CERTIFICATE': + if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: + continue +- +- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) +- if cert.not_valid_after < datetime.datetime.now(): +- print('!'*74) +- print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) +- print('!'*74) +- + bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ + .replace(' ', '_')\ + .replace('(', '=')\ From 972b674f15a737ea54549d3c6132f1693149470a Mon Sep 17 00:00:00 2001 From: lean Date: Sun, 3 Apr 2022 13:24:18 +0800 Subject: [PATCH 12/12] automount: skip some partition Signed-off-by: Tianling Shen (cherry picked from commit cb7067660611bf85d207e2a91b95d0fc9d806dac) --- package/emortal/automount/files/15-automount | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/emortal/automount/files/15-automount b/package/emortal/automount/files/15-automount index dc052bdd38..bb222e81e1 100755 --- a/package/emortal/automount/files/15-automount +++ b/package/emortal/automount/files/15-automount @@ -6,7 +6,7 @@ blkdev=`dirname $DEVPATH` basename=`basename $blkdev` device=`basename $DEVPATH` -skip=`block info | sed 's/\(.*\): .*/\1/' | grep -q $device ; echo $?` +skip=`block info | grep -vE '(f2fs|kernel|squashfs)' | sed 's/\(.*\): .*/\1/' | grep -q $device ; echo $?` path=$DEVPATH if [ $basename != "block" ] && [ -z "${device##sd*}" ] && [ $skip -eq 1 ]; then