mirror of
https://gitee.com/xiaohuolufeihua/bizhang_-obav.git
synced 2026-05-22 09:28:58 +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
57 lines
1.4 KiB
Diff
57 lines
1.4 KiB
Diff
diff --git NuttX/nuttx/tools/mkexport.sh NuttX/nuttx/tools/mkexport.sh
|
|
index 348a14c..3cc9182 100755
|
|
--- NuttX/nuttx/tools/mkexport.sh
|
|
+++ NuttX/nuttx/tools/mkexport.sh
|
|
@@ -34,19 +34,23 @@
|
|
|
|
# Get the input parameter list
|
|
|
|
-USAGE="USAGE: $0 [-d] [-z] [-u] [-w|wy|wn] -t <top-dir> [-x <lib-ext>] -l \"lib1 [lib2 [lib3 ...]]\""
|
|
+USAGE="USAGE: $0 [-d] [-e] [-z] [-u] [-w|wy|wn] -t <top-dir> [-x <lib-ext>] -l \"lib1 [lib2 [lib3 ...]]\""
|
|
unset TOPDIR
|
|
unset LIBLIST
|
|
unset TGZ
|
|
USRONLY=n
|
|
WINTOOL=n
|
|
LIBEXT=.a
|
|
+INSITU=y
|
|
|
|
while [ ! -z "$1" ]; do
|
|
case $1 in
|
|
-d )
|
|
set -x
|
|
;;
|
|
+ -e )
|
|
+ INSITU=n
|
|
+ ;;
|
|
-l )
|
|
shift
|
|
LIBLIST=$1
|
|
@@ -373,13 +377,17 @@ done
|
|
cd "${TOPDIR}" || \
|
|
{ echo "MK: 'cd ${TOPDIR}' failed"; exit 1; }
|
|
|
|
-if [ "X${TGZ}" = "Xy" ]; then
|
|
- tar cvf "${EXPORTSUBDIR}.tar" "${EXPORTSUBDIR}" 1>/dev/null 2>&1
|
|
- gzip -f "${EXPORTSUBDIR}.tar"
|
|
-else
|
|
- zip -r "${EXPORTSUBDIR}.zip" "${EXPORTSUBDIR}" 1>/dev/null 2>&1
|
|
-fi
|
|
+# Should we leave the export insitu
|
|
+
|
|
+if [ "X${INSITU}" = "Xn" ]; then
|
|
+ if [ "X${TGZ}" = "Xy" ]; then
|
|
+ tar cvf "${EXPORTSUBDIR}.tar" "${EXPORTSUBDIR}" 1>/dev/null 2>&1
|
|
+ gzip -f "${EXPORTSUBDIR}.tar"
|
|
+ else
|
|
+ zip -r "${EXPORTSUBDIR}.zip" "${EXPORTSUBDIR}" 1>/dev/null 2>&1
|
|
+ fi
|
|
|
|
-# Clean up after ourselves
|
|
+ # Clean up after ourselves
|
|
|
|
-rm -rf "${EXPORTSUBDIR}"
|
|
+ rm -rf "${EXPORTSUBDIR}"
|
|
+fi
|
|
\ No newline at end of file
|