Include target config + disable console on UART.

This migrates the chirpstack-openwrt-config repository content into this
repository and updates the Makefile for switching configuration
environments.

The reason for this is that ./scripts/env does handle .config + files
per environment, but it does not make it possible to apply patches. To
make sure that we are not sending console output to a GNSS module
connected to the UART interface, we need to patch the cmdline.txt.

The updated Makefile handles the config switching in the same way as the
./scripts/env would do, but also handles the rollback and apply of
patches on switching the configuration environment.

Author: brocaar

.gitignore

@@ -1,3 +1,11 @@
 # OpenWrt
 /openwrt
 /dist
+
+# Hidden files
+/.*
+
+# Symlinks
+/conf/.config
+/conf/files
+/conf/patches

Makefile

@@ -1,20 +1,46 @@
-.PHONY: clean init update devshell
+.PHONY: build clean init update devshell show-envs switch-env
 
-clean:
-	rm -rf openwrt
+# Build the OpenWrt image.
+# Note: execute this within the devshell.
+build:
+	cd openwrt && make
 
+# Initialize the OpenWrt environment.
 init:
 	git clone --branch openwrt-23.05 https://github.com/openwrt/openwrt.git
-	git clone https://github.com/chirpstack/chirpstack-openwrt-config.git openwrt/env
 	cp feeds.conf.default openwrt/feeds.conf.default
-	docker-compose run --rm chirpstack-gateway-os scripts/feeds update -a
-	docker-compose run --rm chirpstack-gateway-os scripts/feeds install -a
-
+	ln -s env/.config openwrt/.config
+	ln -s env/files openwrt/files
+	docker-compose run --rm chirpstack-gateway-os openwrt/scripts/feeds update -a
+	docker-compose run --rm chirpstack-gateway-os openwrt/scripts/feeds install -a
+	docker-compose run --rm chirpstack-gateway-os quilt init
 
+# Update OpenWrt + package feeds.
 update:
-	cd openwrt && git pull
-	docker-compose run --rm chirpstack-gateway-os scripts/feeds update -a
-	docker-compose run --rm chirpstack-gateway-os scripts/feeds install -a
+	cd openwrt && \
+		git pull && \
+		./scripts/feeds update -a && \
+		./scripts/feeds install -a
 
+# Activate the devshell.
 devshell:
 	docker-compose run --rm chirpstack-gateway-os bash
+
+# Switch configuration environment.,
+# Note: execute this within the devshell.
+switch-env:
+	@echo "Rollback previously applied patches"
+	-cd openwrt && quilt pop -a
+
+	@echo "Switching configuration"
+	rm -f conf/files conf/patches conf/.config
+	ln -s ${ENV}/files conf/files
+	ln -s ${ENV}/patches conf/patches
+	ln -s ${ENV}/.config conf/.config
+
+	@echo "Applying patches"
+	cd openwrt && quilt push -a
+
+# Clean the OpenWrt environment.
+clean:
+	rm -rf openwrt

README.md

@@ -36,8 +36,8 @@ make init
 This will:
 
 * Clone the OpenWrt code
-* Clone the [ChirpStack OpenWrt configuration](https://github.com/chirpstack/chirpstack-openwrt-config/)
 * Fetch all the OpenWrt feeds, including the [ChirpStack OpenWrt Feed](https://github.com/chirpstack/chirpstack-openwrt-feed)
+* Symlink configuration and files
 
 ### Update
 
@@ -59,28 +59,44 @@ make devshell
 
 #### Switch configuration
 
-Each target and image has its own configuration. To switch between
-configurations, you can use the `./scripts/env switch` command.
+Each target and image has its own OpenWrt configuration file, files and
+patches. These can be found under the `conf` directory of this repository.
 
-Example to switch to the `base_raspberrypi_bcm27xx_bcm2709` configuration,
-you must run the following command:
+To switch to one of these configuration environments, you must execute:
 
-```bash
-./scripts/env switch base_raspberrypi_bcm27xx_bcm2709
 ```
+make switch-env ENV=name-of-env
+```
+
+Fo example if you would like to switch to `base_raspberrypi_bcm27xx_bcm2709`,
+you execute:
+
+```
+make switch-env ENV=base_raspberrypi_bcm27xx_bcm2709
+```
+
+This will:
 
-Under the hood, this will switch the [chirpstack-openwrt-config](https://github.com/chirpstack/chirpstack-openwrt-config/branches)
-repository which has been cloned in the `env` directory branch and will setup
-all the symlinks.
+* Undo all previously applied patches.
+* Update the symlinks for OpenWrt configuration and files.
+* Apply all patches. 
 
-To make sure there are no uncommitted changes, you can execute:
+#### Building image
+
+Once the configuration has been set, run the following command to build the
+ChirpStack Gateway OS image:
 
 ```bash
-./scripts/env revert
+make
 ```
 
+Note that this can take a couple of hours depending on the selected
+configuration and will require a significant amount of disk-space.
+
+#### Making configuration changes
 
-#### Configuration
+**Note:** The commands listed below must be executed within the `openwrt`
+directory.
 
 To make configuration changes (e.g. add additional packages), you can execute:
 
@@ -97,20 +113,7 @@ make defconfig
 
 Please refer also to the [OpenWrt build system usage documentation](https://openwrt.org/docs/guide-developer/toolchain/use-buildsystem).
 
-#### Building image
-
-Once the configuration has been set, run the following command to build the
-ChirpStack Gateway OS image:
-
-```bash
-make
-```
-
-Note that this can take a couple of hours depending on the selected
-configuration and will require a significant amount of disk-space.
-
 ## Links
 
 * [ChirpStack documentation](https://www.chirpstack.io/)
-* [chirpstack-openwrt-config](https://github.com/chirpstack/chirpstack-openwrt-config/) repository
 * [chirpstack-openwrt-feed](https://github.com/chirpstack/chirpstack-openwrt-feed) repository