From: Thomas Petazzoni Date: Sat, 24 Nov 2018 09:04:02 +0000 (+0100) Subject: package/dtc: renumber patches correctly X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2922d9765616652017a0346543656739d81bf0c;p=buildroot.git package/dtc: renumber patches correctly When c7ffd8a75d55e24d793106eabbb80964ab91081f ("package/dtc: fix include guards for older kernel/u-boot") introduced a new patch to the dtc package, it used the 0001 number, which was already used by another patch. Let's fix that. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- diff --git a/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch deleted file mode 100644 index e4e49bf6e4..0000000000 --- a/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001 -From: Lothar Felten -Date: Mon, 8 Oct 2018 13:29:44 +0200 -Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources - -Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt -include guards with leading underscores. - -Those have been removed in dtc-1.4.7. - -This patch handles both include guard types and allows the compilation -of older Linux kernel and u-boot sources. - -Signed-off-by: Lothar Felten ---- - libfdt/libfdt.h | 4 ++++ - libfdt/libfdt_env.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h -index 830b77e..bef4566 100644 ---- a/libfdt/libfdt.h -+++ b/libfdt/libfdt.h -@@ -1,3 +1,7 @@ -+#ifdef _LIBFDT_H -+#warning "Please consider updating your kernel and/or u-boot version" -+#define LIBFDT_H -+#endif - #ifndef LIBFDT_H - #define LIBFDT_H - /* -diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h -index eb20538..6a61e6a 100644 ---- a/libfdt/libfdt_env.h -+++ b/libfdt/libfdt_env.h -@@ -1,3 +1,7 @@ -+#ifdef _LIBFDT_ENV_H -+#warning "Please consider updating your kernel and/or u-boot version" -+#define LIBFDT_ENV_H -+#endif - #ifndef LIBFDT_ENV_H - #define LIBFDT_ENV_H - /* --- -2.11.0 - diff --git a/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch new file mode 100644 index 0000000000..e4e49bf6e4 --- /dev/null +++ b/package/dtc/0002-Fix-include-guards-for-older-kernel-u-boot-sources.patch @@ -0,0 +1,46 @@ +From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001 +From: Lothar Felten +Date: Mon, 8 Oct 2018 13:29:44 +0200 +Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources + +Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt +include guards with leading underscores. + +Those have been removed in dtc-1.4.7. + +This patch handles both include guard types and allows the compilation +of older Linux kernel and u-boot sources. + +Signed-off-by: Lothar Felten +--- + libfdt/libfdt.h | 4 ++++ + libfdt/libfdt_env.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h +index 830b77e..bef4566 100644 +--- a/libfdt/libfdt.h ++++ b/libfdt/libfdt.h +@@ -1,3 +1,7 @@ ++#ifdef _LIBFDT_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define LIBFDT_H ++#endif + #ifndef LIBFDT_H + #define LIBFDT_H + /* +diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h +index eb20538..6a61e6a 100644 +--- a/libfdt/libfdt_env.h ++++ b/libfdt/libfdt_env.h +@@ -1,3 +1,7 @@ ++#ifdef _LIBFDT_ENV_H ++#warning "Please consider updating your kernel and/or u-boot version" ++#define LIBFDT_ENV_H ++#endif + #ifndef LIBFDT_ENV_H + #define LIBFDT_ENV_H + /* +-- +2.11.0 +