mirror of
https://gitee.com/xiaohuolufeihua/bizhang_-obav.git
synced 2026-05-22 01:12:31 +00:00
a5fa4e9c02
* Order patch application Per discussion with @demarchi this PR adds ordering to the patch application. This alos add some encoding 00000 series - is for px4 non up streamable changes 60000 (bp) series - is for back ports 90000 series - is for wip that shold make it upstream * Restore 00010-workarround-for-flash-data-cache-corruption Extract this from the 90000-wip-inflight-to-upstream.patch and orders it. * Moved upstreamed 0dbf44e flash fix to bp patch * Moved upstreamed 5481087 cdcacm fix to bp patch * Moved upstreamed ec85425 STM32F7 copy paste errors to bp patch * Moved upstreamed 20e7237 HSI should not be turned off to bp patch * Moved upstreamed ca895b9 Adding missing CONFIG_ prefix to bp patch * Moved upstreamed 169b398 STM32: Fixes the bkp reference counter issue to bp patch * Moved upstreamed 550d259 STM32F7: Fixes the bkp reference counter issue to bp patch * Moved upstreamed 02825f3 STM32F3X: Add missing STM32_BKP_BASE to bp patch * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Renamed for ordering and classification * Order Patches by Name
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
diff --git NuttX/apps/Makefile NuttX/apps/Makefile
|
|
index 4093b0e..3bdc36a 100644
|
|
--- NuttX/apps/Makefile
|
|
+++ NuttX/apps/Makefile
|
|
@@ -79,13 +79,13 @@ all: $(BIN)
|
|
.PHONY: import install dirlinks context context_serialize context_rest .depdirs preconfig depend clean distclean
|
|
|
|
define MAKE_template
|
|
- $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
|
|
+ +$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
|
|
|
|
endef
|
|
|
|
define SDIR_template
|
|
$(1)_$(2):
|
|
- $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
|
|
+ +$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
|
|
|
|
endef
|
|
|
|
@@ -108,7 +108,7 @@ install: $(BIN_DIR) .install
|
|
.import: $(BIN) install
|
|
|
|
import:
|
|
- $(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
|
|
+ +$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"
|
|
|
|
dirlinks:
|
|
$(Q) $(MAKE) -C platform dirlinks TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
|
|
@@ -116,8 +116,8 @@ dirlinks:
|
|
context_rest: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_context)
|
|
|
|
context_serialize:
|
|
- $(Q) $(MAKE) -C builtin context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
|
|
- $(Q) $(MAKE) context_rest
|
|
+ +$(Q) $(MAKE) -C builtin context TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
|
|
+ +$(Q) $(MAKE) context_rest
|
|
|
|
context: context_serialize
|
|
|