diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index b5cf5e8cb0..0089eaa7b1 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -1148,7 +1148,7 @@ $(eval $(call KernelPackage,nft-bridge)) define KernelPackage/nft-dup-inet SUBMENU:=$(NF_MENU) - TITLE:=Netfilter nf_tables dup in ip/ip6/inet familly support + TITLE:=Netfilter nf_tables dup in ip/ip6/inet family support DEPENDS:=+kmod-nft-core +kmod-nf-conntrack +IPV6:kmod-nf-conntrack6 KCONFIG:= \ CONFIG_NF_DUP_IPV4 \ diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 8d179beb30..cac3ddc6cb 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -7,7 +7,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git PKG_SOURCE_DATE:=2023-05-31 PKG_SOURCE_VERSION:=38cbdc1c8cbbe2e30d62227d74565bd3fa21a36b -PKG_MIRROR_HASH:=c275ef1f550726b045b3dd7bcee1d660bba9d56c4d53bf32f1eeb6f68bc4116c +PKG_MIRROR_HASH:=5fbf325516a1bf1cc945019c061af280f5217267b20ae46fcfc71739616b3389 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/target/linux/armvirt/image/Makefile b/target/linux/armvirt/image/Makefile index 8642c88a49..3879c95df9 100644 --- a/target/linux/armvirt/image/Makefile +++ b/target/linux/armvirt/image/Makefile @@ -79,6 +79,7 @@ define Device/efi-default IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip IMAGE/combined.img := grub-config efi | combined efi | grub-install efi | append-metadata IMAGE/combined.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata + IMAGE/combined.qcow2 := grub-config efi | combined efi | grub-install efi | qemu-image qcow2 IMAGE/combined.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) IMAGES-y := rootfs.img.gz @@ -87,6 +88,9 @@ define Device/efi-default IMAGES-y := rootfs.img IMAGES-y += combined.img endif + ifeq ($(CONFIG_QCOW2_IMAGES),y) + IMAGES-y += combined.qcow2 + endif ifeq ($(CONFIG_VMDK_IMAGES),y) IMAGES-y += combined.vmdk endif