From: Peter Seiderer Date: Tue, 13 Jan 2015 19:40:02 +0000 (+0100) Subject: dtc: rename patches to new convention X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=304755acf59bf2fedd2b226314a089d54b65c729;p=buildroot.git dtc: rename patches to new convention Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- diff --git a/package/dtc/0001-separate-lib-install.patch b/package/dtc/0001-separate-lib-install.patch new file mode 100644 index 0000000000..c86d587a1b --- /dev/null +++ b/package/dtc/0001-separate-lib-install.patch @@ -0,0 +1,28 @@ +Makefile: add a rule to only install libfdt + +Signed-off-by: "Yann E. MORIN" + +--- +Patch not sent upstream. + +It's really specific to buildroot, and is probably not +good (aka generic) enough to be pushed upstream. + +diff --git a/Makefile b/Makefile +index 1169e6c..39e7190 100644 +--- a/Makefile ++++ b/Makefile +@@ -160,10 +160,12 @@ endif + # intermediate target and building them again "for real" + .SECONDARY: $(DTC_GEN_SRCS) $(CONVERT_GEN_SRCS) + +-install: all $(SCRIPTS) ++install: all $(SCRIPTS) libfdt_install + @$(VECHO) INSTALL + $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) ++ ++libfdt_install: libfdt + $(INSTALL) -d $(DESTDIR)$(LIBDIR) + $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) + ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) diff --git a/package/dtc/0002-extra-cflags.patch b/package/dtc/0002-extra-cflags.patch new file mode 100644 index 0000000000..51b79572e8 --- /dev/null +++ b/package/dtc/0002-extra-cflags.patch @@ -0,0 +1,32 @@ +Makefile: append the CFLAGS to existing ones + +Allow the user to pass custom CFLAGS (eg. optimisation flags). + +Do not use EXTRA_CFLAGS, append to existing CFLAGS with += (Arnout) + +Signed-off-by: "Yann E. MORIN" +Cc: Arnout Vandecappelle + +--- +Patch not sent upstream. + +Although not specific to buildroot, I am not sure this is the best +way to handle user-supplied CFLAGS. + +diff --git a/Makefile b/Makefile +index 962f94eba661..bf6b317158cf 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,9 +16,10 @@ LOCAL_VERSION = + CONFIG_LOCALVERSION = + + CPPFLAGS = -I libfdt -I . +-WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ ++WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls +-CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) ++CFLAGS ?= -g -Os ++CFLAGS += -fPIC $(WARNINGS) + + BISON = bison + LEX = flex diff --git a/package/dtc/dtc-extra_cflags.patch b/package/dtc/dtc-extra_cflags.patch deleted file mode 100644 index 51b79572e8..0000000000 --- a/package/dtc/dtc-extra_cflags.patch +++ /dev/null @@ -1,32 +0,0 @@ -Makefile: append the CFLAGS to existing ones - -Allow the user to pass custom CFLAGS (eg. optimisation flags). - -Do not use EXTRA_CFLAGS, append to existing CFLAGS with += (Arnout) - -Signed-off-by: "Yann E. MORIN" -Cc: Arnout Vandecappelle - ---- -Patch not sent upstream. - -Although not specific to buildroot, I am not sure this is the best -way to handle user-supplied CFLAGS. - -diff --git a/Makefile b/Makefile -index 962f94eba661..bf6b317158cf 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,9 +16,10 @@ LOCAL_VERSION = - CONFIG_LOCALVERSION = - - CPPFLAGS = -I libfdt -I . --WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ -+WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ - -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls --CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) -+CFLAGS ?= -g -Os -+CFLAGS += -fPIC $(WARNINGS) - - BISON = bison - LEX = flex diff --git a/package/dtc/dtc-separate-lib-install.patch b/package/dtc/dtc-separate-lib-install.patch deleted file mode 100644 index c86d587a1b..0000000000 --- a/package/dtc/dtc-separate-lib-install.patch +++ /dev/null @@ -1,28 +0,0 @@ -Makefile: add a rule to only install libfdt - -Signed-off-by: "Yann E. MORIN" - ---- -Patch not sent upstream. - -It's really specific to buildroot, and is probably not -good (aka generic) enough to be pushed upstream. - -diff --git a/Makefile b/Makefile -index 1169e6c..39e7190 100644 ---- a/Makefile -+++ b/Makefile -@@ -160,10 +160,12 @@ endif - # intermediate target and building them again "for real" - .SECONDARY: $(DTC_GEN_SRCS) $(CONVERT_GEN_SRCS) - --install: all $(SCRIPTS) -+install: all $(SCRIPTS) libfdt_install - @$(VECHO) INSTALL - $(INSTALL) -d $(DESTDIR)$(BINDIR) - $(INSTALL) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR) -+ -+libfdt_install: libfdt - $(INSTALL) -d $(DESTDIR)$(LIBDIR) - $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) - ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname)