Browse Source

esp8266: Convert to use FROZEN_MANIFEST to specify frozen code.

Removes symlinks in modules directory, all frozen code is now specified by
manifest.py.
pull/5084/head
Damien George 5 years ago
parent
commit
2fd3f2520d
  1. 11
      ports/esp8266/Makefile
  2. 4
      ports/esp8266/boards/manifest.py
  3. 1
      ports/esp8266/modules/dht.py
  4. 1
      ports/esp8266/modules/ds18x20.py
  5. 1
      ports/esp8266/modules/onewire.py
  6. 1
      ports/esp8266/modules/upip.py
  7. 1
      ports/esp8266/modules/upip_utarfile.py

11
ports/esp8266/Makefile

@ -26,8 +26,9 @@ MICROPY_FATFS ?= 1
MICROPY_PY_BTREE ?= 1
BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3
FROZEN_DIR ?= scripts
FROZEN_MPY_DIR ?= modules
FROZEN_MANIFEST ?= boards/manifest.py
FROZEN_DIR ?=
FROZEN_MPY_DIR ?=
# include py core make definitions
include $(TOP)/py/py.mk
@ -179,9 +180,9 @@ CONFVARS_FILE = $(BUILD)/confvars
ifeq ($(wildcard $(CONFVARS_FILE)),)
$(shell $(MKDIR) -p $(BUILD))
$(shell echo $(FROZEN_DIR) $(UART_OS) > $(CONFVARS_FILE))
else ifneq ($(shell cat $(CONFVARS_FILE)), $(FROZEN_DIR) $(UART_OS))
$(shell echo $(FROZEN_DIR) $(UART_OS) > $(CONFVARS_FILE))
$(shell echo $(FROZEN_MANIFEST) $(UART_OS) > $(CONFVARS_FILE))
else ifneq ($(shell cat $(CONFVARS_FILE)), $(FROZEN_MANIFEST) $(UART_OS))
$(shell echo $(FROZEN_MANIFEST) $(UART_OS) > $(CONFVARS_FILE))
endif
$(BUILD)/uart.o: $(CONFVARS_FILE)

4
ports/esp8266/boards/manifest.py

@ -0,0 +1,4 @@
freeze('modules')
freeze('$(MPY)/tools', ('upip.py', 'upip_utarfile.py'))
freeze('$(MPY)/drivers/dht', 'dht.py')
freeze('$(MPY)/drivers/onewire')

1
ports/esp8266/modules/dht.py

@ -1 +0,0 @@
../../../drivers/dht/dht.py

1
ports/esp8266/modules/ds18x20.py

@ -1 +0,0 @@
../../../drivers/onewire/ds18x20.py

1
ports/esp8266/modules/onewire.py

@ -1 +0,0 @@
../../../drivers/onewire/onewire.py

1
ports/esp8266/modules/upip.py

@ -1 +0,0 @@
../../../tools/upip.py

1
ports/esp8266/modules/upip_utarfile.py

@ -1 +0,0 @@
../../../tools/upip_utarfile.py
Loading…
Cancel
Save