Don't include timestamps in patches. (#49)

toitlang · May 13, 2024 · 9751d7c · 9751d7c
1 parent 4be944f
commit 9751d7c
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,9 @@ else
 	EXE_SUFFIX :=
 endif
 
+# Set to '--update-patches' to update all patches.
+UPDATE_PATCHES :=
+
 TOIT_EXEC := toit.run$(EXE_SUFFIX)
 
 TOIT_DIRECTORY := toit
@@ -63,8 +66,13 @@ synthesize-all: | create-build-directory create-synthesized-directory
 			--output-root="$(SYNTHESIZED_DIRECTORY)" \
 			--sdk-path="$(TOIT_SDK_DIRECTORY)" \
 			--variants-root="$(VARIANTS_DIRECTORY)" \
+			$(UPDATE_PATCHES) \
 			$(shell $(TOOL_RUN) list variants)
 
+.PHONY: update-patches
+update-patches:
+	$(MAKE) UPDATE_PATCHES=--update-patches synthesize-all
+
 .PHONY: create-build-directory
 create-build-directory:
 	mkdir -p "$(BUILD_DIRECTORY)"

diff --git a/tools/main.toit b/tools/main.toit
@@ -245,7 +245,8 @@ apply-file-patch_ --patch-path/string --file-path/string:
 update-patch_ --from/string --to/string --output/string --ui/cli.Ui:
   ui.print "Updating $output."
   file.delete output
-  args := ["diff", "-aur", from, to]
+  // Use labels to avoid the timestamp.
+  args := ["diff", "-aur", "--label", from, "--label", to, from, to]
   stream := pipe-from args
   out-stream := file.Stream.for-write output
   writer := out-stream.out

diff --git a/variants/esp32-consibio/sdkconfig.defaults.patch b/variants/esp32-consibio/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- toolchains/esp32/sdkconfig.defaults	2023-11-08 17:26:23.596513658 +0100
-+++ toolchains/esp32-consibio/sdkconfig.defaults	2023-11-20 17:43:10.470183258 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-consibio/sdkconfig.defaults
 @@ -5,27 +5,10 @@
  CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
  CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y

diff --git a/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0-spiram/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32/sdkconfig.defaults	2023-11-07 13:46:26.856085190 +0100
-+++ synthesized/esp32-eth-clk-out0-spiram/sdkconfig.defaults	2023-11-07 13:48:07.897724651 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-eth-clk-out0-spiram/sdkconfig.defaults
 @@ -31,12 +31,17 @@
  # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
  CONFIG_UART_ISR_IN_IRAM=y

diff --git a/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out0/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32/sdkconfig.defaults	2023-11-07 13:46:26.856085190 +0100
-+++ synthesized/esp32-eth-clk-out0/sdkconfig.defaults	2023-11-07 13:48:07.871058431 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-eth-clk-out0/sdkconfig.defaults
 @@ -31,6 +31,8 @@
  # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
  CONFIG_UART_ISR_IN_IRAM=y

diff --git a/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17-spiram/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32/sdkconfig.defaults	2023-11-07 13:46:26.856085190 +0100
-+++ synthesized/esp32-eth-clk-out17-spiram/sdkconfig.defaults	2023-11-07 13:48:07.821059269 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-eth-clk-out17-spiram/sdkconfig.defaults
 @@ -31,12 +31,16 @@
  # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
  CONFIG_UART_ISR_IN_IRAM=y

diff --git a/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch b/variants/esp32-eth-clk-out17/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32/sdkconfig.defaults	2023-11-07 13:46:26.856085190 +0100
-+++ synthesized/esp32-eth-clk-out17/sdkconfig.defaults	2023-11-07 13:48:07.807726160 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-eth-clk-out17/sdkconfig.defaults
 @@ -31,6 +31,7 @@
  # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
  CONFIG_UART_ISR_IN_IRAM=y

diff --git a/variants/esp32-no-ble/sdkconfig.defaults.patch b/variants/esp32-no-ble/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32/sdkconfig.defaults	2023-11-07 13:46:26.856085190 +0100
-+++ synthesized/esp32-no-ble/sdkconfig.defaults	2023-11-07 13:48:07.911057760 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-no-ble/sdkconfig.defaults
 @@ -9,23 +9,6 @@
  CONFIG_PARTITION_TABLE_CUSTOM=y
  CONFIG_COMPILER_OPTIMIZATION_SIZE=y

diff --git a/variants/esp32-qemu/sdkconfig.defaults.patch b/variants/esp32-qemu/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32/sdkconfig.defaults	2023-11-07 13:46:26.856085190 +0100
-+++ synthesized/esp32-qemu/sdkconfig.defaults	2023-11-07 13:48:07.847725489 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-qemu/sdkconfig.defaults
 @@ -33,6 +33,7 @@
  # CONFIG_ESP_ERR_TO_NAME_LOOKUP is not set
  CONFIG_ETH_SPI_ETHERNET_DM9051=y

diff --git a/variants/esp32-sedisto/sdkconfig.defaults.patch b/variants/esp32-sedisto/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
-+--- toolchains/esp32/sdkconfig.defaults        2024-02-14 13:01:21.464253095 +0100
-++++ toolchains/esp32-sedisto/sdkconfig.defaults        2024-02-14 13:02:23.710920353 +0100
+--- toit/toolchains/esp32/sdkconfig.defaults
++++ synthesized/esp32-sedisto/sdkconfig.defaults
 @@ -31,12 +31,17 @@
  # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set
  CONFIG_UART_ISR_IN_IRAM=y

diff --git a/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch b/variants/esp32s3-spiram-octo/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32s3/sdkconfig.defaults	2023-11-07 13:46:26.859418469 +0100
-+++ synthesized/esp32s3-spiram-octo/sdkconfig.defaults	2023-11-07 13:48:07.791059774 +0100
+--- toit/toolchains/esp32s3/sdkconfig.defaults
++++ synthesized/esp32s3-spiram-octo/sdkconfig.defaults
 @@ -32,6 +32,7 @@
  # CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE is not set
  CONFIG_ESP_PHY_REDUCE_TX_POWER=y

diff --git a/variants/esp32s3-synap/sdkconfig.defaults.patch b/variants/esp32s3-synap/sdkconfig.defaults.patch
@@ -1,5 +1,5 @@
---- /home/flo/code/envelopes/../opentoit/toolchains/esp32s3/sdkconfig.defaults	2023-11-07 13:46:26.859418469 +0100
-+++ synthesized/esp32s3-synap/sdkconfig.defaults	2023-11-07 13:48:07.777726664 +0100
+--- toit/toolchains/esp32s3/sdkconfig.defaults
++++ synthesized/esp32s3-synap/sdkconfig.defaults
 @@ -6,23 +6,10 @@
  CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
  CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y