From 757d9bc8d24eca1dea84a126289166c23e65a68e Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Wed, 7 Apr 2021 08:47:06 +0200 Subject: [PATCH] bugfix: u-boot could break when libfdt-devel is installed system-wide --- patch/u-boot/u-boot-clearfog/libfdt_fix.patch | 31 +++++++++++++++++++ patch/u-boot/u-boot-helios4/libfdt_fix.patch | 31 +++++++++++++++++++ patch/u-boot/u-boot-imx6/libfdt_fix.patch | 31 +++++++++++++++++++ patch/u-boot/u-boot-imx7d/libfdt_fix.patch | 31 +++++++++++++++++++ patch/u-boot/u-boot-rockchip/libfdt_fix.patch | 31 +++++++++++++++++++ 5 files changed, 155 insertions(+) create mode 100644 patch/u-boot/u-boot-clearfog/libfdt_fix.patch create mode 100644 patch/u-boot/u-boot-helios4/libfdt_fix.patch create mode 100644 patch/u-boot/u-boot-imx6/libfdt_fix.patch create mode 100644 patch/u-boot/u-boot-imx7d/libfdt_fix.patch create mode 100644 patch/u-boot/u-boot-rockchip/libfdt_fix.patch diff --git a/patch/u-boot/u-boot-clearfog/libfdt_fix.patch b/patch/u-boot/u-boot-clearfog/libfdt_fix.patch new file mode 100644 index 000000000..762f4f0a1 --- /dev/null +++ b/patch/u-boot/u-boot-clearfog/libfdt_fix.patch @@ -0,0 +1,31 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +GitLab + diff --git a/patch/u-boot/u-boot-helios4/libfdt_fix.patch b/patch/u-boot/u-boot-helios4/libfdt_fix.patch new file mode 100644 index 000000000..762f4f0a1 --- /dev/null +++ b/patch/u-boot/u-boot-helios4/libfdt_fix.patch @@ -0,0 +1,31 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +GitLab + diff --git a/patch/u-boot/u-boot-imx6/libfdt_fix.patch b/patch/u-boot/u-boot-imx6/libfdt_fix.patch new file mode 100644 index 000000000..762f4f0a1 --- /dev/null +++ b/patch/u-boot/u-boot-imx6/libfdt_fix.patch @@ -0,0 +1,31 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +GitLab + diff --git a/patch/u-boot/u-boot-imx7d/libfdt_fix.patch b/patch/u-boot/u-boot-imx7d/libfdt_fix.patch new file mode 100644 index 000000000..762f4f0a1 --- /dev/null +++ b/patch/u-boot/u-boot-imx7d/libfdt_fix.patch @@ -0,0 +1,31 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +GitLab + diff --git a/patch/u-boot/u-boot-rockchip/libfdt_fix.patch b/patch/u-boot/u-boot-rockchip/libfdt_fix.patch new file mode 100644 index 000000000..762f4f0a1 --- /dev/null +++ b/patch/u-boot/u-boot-rockchip/libfdt_fix.patch @@ -0,0 +1,31 @@ +From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 +From: Paul Kocialkowski +Date: Fri, 2 Mar 2018 23:13:42 +0100 +Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path + +There are no headers for libfdt in lib/libfdt, as they are instead +located in scripts/dtc/libfdt. Specifying lib/libfdt for headers +inclusion in host tools results in using the system libfdt headers, +which is not what we want. Change this to the proper path. + +Signed-off-by: Paul Kocialkowski +--- + tools/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/Makefile b/tools/Makefile +index d3387fad69..f38f68ee47 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -244,7 +244,7 @@ endif # !LOGO_BMP + # + HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +- -I$(srctree)/lib/libfdt \ ++ -I$(srctree)/scripts/dtc/libfdt \ + -I$(srctree)/tools \ + -DUSE_HOSTCC \ + -D__KERNEL_STRICT_NAMES \ +-- +GitLab +