diff --git a/config/Config-images.in b/config/Config-images.in index 82235658f8..6779e05980 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -260,30 +260,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" @@ -304,6 +309,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 + default 800 if BUILDBOT default 160 help Select the root filesystem partition size. diff --git a/include/version.mk b/include/version.mk index de1453fd25..dbb360e0d3 100644 --- a/include/version.mk +++ b/include/version.mk @@ -23,7 +23,7 @@ PKG_CONFIG_DEPENDS += \ sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1)))) VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER)) -VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-5.4-SNAPSHOT) +VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06-k5.4-SNAPSHOT) VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) diff --git a/package/emortal/autocore/Makefile b/package/emortal/autocore/Makefile index 1fc0078c55..f37b6c5355 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:= \ 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 diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index c387e6e4b0..f0d3e85cd8 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 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)) 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 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; 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 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('(', '=')\ diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index e2dd73d210..67188b2ec6 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -53,12 +53,12 @@ define Build/edimax-headers $(eval edimax_model=$(word 2,$(1))) $(STAGING_DIR_HOST)/bin/edimax_fw_header -M $(edimax_magic) -m $(edimax_model)\ - -v $(VERSION_DIST)$(firstword $(subst +, , $(firstword $(subst -, ,$(REVISION))))) \ + -v Emortal$(firstword $(subst +, , $(firstword $(subst -, ,$(REVISION))))) \ -n "uImage" \ -i $(KDIR)/loader-$(DEVICE_NAME).uImage \ -o $@.uImage $(STAGING_DIR_HOST)/bin/edimax_fw_header -M $(edimax_magic) -m $(edimax_model)\ - -v $(VERSION_DIST)$(firstword $(subst +, , $(firstword $(subst -, ,$(REVISION))))) \ + -v Emortal$(firstword $(subst +, , $(firstword $(subst -, ,$(REVISION))))) \ -n "rootfs" \ -i $@ \ -o $@.rootfs @@ -70,7 +70,7 @@ define Build/mkdapimg2 $(STAGING_DIR_HOST)/bin/mkdapimg2 \ -i $@ -o $@.new \ -s $(DAP_SIGNATURE) \ - -v $(VERSION_DIST)-$(firstword $(subst +, , \ + -v Emortal-$(firstword $(subst +, , \ $(firstword $(subst -, ,$(REVISION))))) \ -r Default \ $(if $(1),-k $(1))