diff --git a/0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch b/0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch new file mode 100644 index 0000000..b24da06 --- /dev/null +++ b/0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch @@ -0,0 +1,22 @@ +From a8517eab022f355186354858721b54a4747b3a8a Mon Sep 17 00:00:00 2001 +From: Guillaume Gardet +Date: Wed, 18 Nov 2020 13:42:04 +0000 +Subject: [PATCH] Disable CONFIG_CMD_BTRFS in xilinx_zynqmp_virt_defconfig to + fix compilation - bsc#1178884 + +--- + configs/xilinx_zynqmp_virt_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig +index a0984c8045..ab1889ab13 100644 +--- a/configs/xilinx_zynqmp_virt_defconfig ++++ b/configs/xilinx_zynqmp_virt_defconfig +@@ -52,6 +52,7 @@ CONFIG_CMD_TFTPPUT=y + CONFIG_CMD_TIME=y + CONFIG_CMD_TIMER=y + CONFIG_CMD_EXT4_WRITE=y ++# CONFIG_CMD_BTRFS is not set + CONFIG_CMD_MTDPARTS=y + CONFIG_CMD_MTDPARTS_SPREAD=y + CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y diff --git a/u-boot.changes b/u-boot.changes index 0720480..26d7df1 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 18 13:50:35 UTC 2020 - Guillaume GARDET + +Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2020.10 +* Patches added: + 0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch - bsc#1178884 + ------------------------------------------------------------------- Wed Oct 14 09:48:25 UTC 2020 - Andreas Schwab diff --git a/u-boot.spec b/u-boot.spec index 4c35219..049747a 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -226,6 +226,7 @@ Patch0010: 0010-configs-am335x_evm-disable-BTRFS.patch Patch0011: 0011-sunxi-dts-OrangePi-Zero-Add-SPI-ali.patch Patch0012: 0012-sunxi-dts-OrangePi-Zero-Enable-SPI-.patch Patch0013: 0013-sunxi-Enable-SPI-support-on-Orange-.patch +Patch0014: 0014-Disable-CONFIG_CMD_BTRFS-in-xilinx_.patch # Patches: end BuildRequires: bc BuildRequires: bison