feat: use emissary v2023.6.23-4a58847

feat: use emissary v2023.6.23-4255940
feat: use emissary v2023.6.22-a5fbe3e
2023-06-23 12:46:15 +00:00 · 2023-06-23 12:30:35 +00:00 · 2023-06-22 15:09:27 +00:00 · 2023-06-22 15:05:47 +00:00 · 2023-05-26 13:56:56 +00:00 · 2023-05-25 19:27:45 +00:00
8 changed files with 101 additions and 5 deletions
--- a/emissary_release.txt
+++ b/emissary_release.txt
@ -1 +1 @@
-v2023.4.13-41b1619
+v2023.6.23-4a58847
--- a/install/raspberrypi.mk
+++ b/install/raspberrypi.mk
@ -0,0 +1,7 @@
 install-rpi-network-config:
 	mkdir -p files/etc/config
 	cp misc/rpi/uci/network files/etc/config/network
 install-rpi-uci-defaults:
 	mkdir -p files/etc/uci-defaults
 	cp misc/rpi/uci-defaults/* files/etc/uci-defaults/
--- a/misc/rpi/uci-defaults/99-x86-uci-custom.sh
+++ b/misc/rpi/uci-defaults/99-x86-uci-custom.sh
@ -0,0 +1,37 @@
 #/bin/sh
 set -e
 main() {
    # Update default firewall ruleset
    uci add firewall rule
    uci set firewall.@rule[-1].name='Allow SSH on WAN'
    uci set firewall.@rule[-1].src='wan'
    uci set firewall.@rule[-1].proto='tcp'
    uci set firewall.@rule[-1].dest_port='22'
    uci set firewall.@rule[-1].target='ACCEPT'
    uci add firewall rule
    uci set firewall.@rule[-1].name='Allow HTTP on WAN'
    uci set firewall.@rule[-1].src='wan'
    uci set firewall.@rule[-1].proto='tcp'
    uci set firewall.@rule[-1].dest_port='80'
    uci set firewall.@rule[-1].target='ACCEPT'
    uci add firewall rule
    uci set firewall.@rule[-1].name='Allow HTTPS on WAN'
    uci set firewall.@rule[-1].src='wan'
    uci set firewall.@rule[-1].proto='tcp'
    uci set firewall.@rule[-1].dest_port='443'
    uci set firewall.@rule[-1].target='ACCEPT'
    uci commit firewall
    # Disable DNS-rebind protection
    uci set dhcp.@dnsmasq[0].rebind_protection='0'
    uci commit dhcp
    reload_config
 }
 main
--- a/misc/rpi/uci/network
+++ b/misc/rpi/uci/network
@ -0,0 +1,9 @@
 config interface 'loopback'
 	option ifname 'lo'
 	option proto 'static'
 	option ipaddr '127.0.0.1'
 	option netmask '255.0.0.0'
 config interface 'wan'
 	option ifname 'eth0'
 	option proto 'dhcp'
--- a/misc/turris/omnia/uci-defaults/98-turris-omnia-uci-custom.sh
+++ b/misc/turris/omnia/uci-defaults/98-turris-omnia-uci-custom.sh
@ -0,0 +1,37 @@
 #/bin/sh
 set -e
 main() {
    # Update default firewall ruleset
    uci add firewall rule
    uci set firewall.@rule[-1].name='Allow SSH on WAN'
    uci set firewall.@rule[-1].src='wan'
    uci set firewall.@rule[-1].proto='tcp'
    uci set firewall.@rule[-1].dest_port='22'
    uci set firewall.@rule[-1].target='ACCEPT'
    uci add firewall rule
    uci set firewall.@rule[-1].name='Allow HTTP on WAN'
    uci set firewall.@rule[-1].src='wan'
    uci set firewall.@rule[-1].proto='tcp'
    uci set firewall.@rule[-1].dest_port='80'
    uci set firewall.@rule[-1].target='ACCEPT'
    uci add firewall rule
    uci set firewall.@rule[-1].name='Allow HTTPS on WAN'
    uci set firewall.@rule[-1].src='wan'
    uci set firewall.@rule[-1].proto='tcp'
    uci set firewall.@rule[-1].dest_port='443'
    uci set firewall.@rule[-1].target='ACCEPT'
    uci commit firewall
    # Disable DNS-rebind protection
    uci set dhcp.@dnsmasq[0].rebind_protection='0'
    uci commit dhcp
    reload_config
 }
 main
--- a/misc/turris/omnia/uci-defaults/99-resize-disk.sh
+++ b/misc/turris/omnia/uci-defaults/99-resize-disk.sh
@ -2,6 +2,8 @@
 set -eo pipefail
 block info
 DISK=/dev/mmcblk0
 PARTITION="${DISK}p2"
@ -11,5 +13,9 @@ FS_SIZE="$(unsquashfs -s "$PARTITION" | grep -o 'Filesystem size [0-9]* bytes' |
 FS_OFFSET="$(expr '(' "$FS_SIZE" + 65535 ')' / 65536 '*' 65536)"
 LOOP_DEVICE="$(losetup -f --show -o "$FS_OFFSET" "$PARTITION")"
-e2fsck -fy "$LOOP_DEVICE"
+e2fsck -y -f "$LOOP_DEVICE"
 resize2fs "$LOOP_DEVICE"
 rm -f /etc/uci-defaults/99-resize-disk.sh
 reboot
--- a/targets/raspberry-pi.mk
+++ b/targets/raspberry-pi.mk
@ -2,7 +2,7 @@ all: rpi-4 rpi-3
 rpi-4:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="" \
+		ADDITIONAL_INSTALL="install-rpi-network-config install-rpi-uci-defaults" \
 		OPENWRT_TARGET="bcm27xx/bcm2711" \
 		EMISSARY_ARCH="arm64" \
 		OPENWRT_PROFILE="rpi-4" \
@ -10,7 +10,7 @@ rpi-4:
 rpi-3:
 	$(MAKE) \
-		ADDITIONAL_INSTALL="" \
+		ADDITIONAL_INSTALL="install-rpi-network-config install-rpi-uci-defaults" \
 		OPENWRT_TARGET="bcm27xx/bcm2710" \
 		EMISSARY_ARCH="arm64" \
 		OPENWRT_PROFILE="rpi-3" \
--- a/targets/turris.mk
+++ b/targets/turris.mk
@ -5,7 +5,7 @@ turris: omnia
 omnia:
 	$(MAKE) \
 		ADDITIONAL_INSTALL="install-turris-omnia-uci-defaults" \
-		ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted" \
+		ADDITIONAL_OPENWRT_PACKAGES="losetup squashfs-tools-unsquashfs resize2fs e2fsprogs parted block-mount" \
 		OPENWRT_TARGET="mvebu/cortexa9" \
 		EMISSARY_ARCH="armv7" \
 		OPENWRT_PROFILE="cznic_turris-omnia" \
Author	SHA1	Message	Date
Jenkins	c7465dba27	feat: use emissary v2023.6.23-4a58847 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-23 12:46:15 +00:00
Jenkins	4a4232e358	feat: use emissary v2023.6.23-4255940 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-23 12:30:35 +00:00
Jenkins	250bf06367	feat: use emissary v2023.6.22-a5fbe3e Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-22 15:09:27 +00:00
Jenkins	3ca90a54a9	feat: use emissary v2023.6.22-8b5a97d Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-06-22 15:05:47 +00:00
Jenkins	58d1ffc9a2	feat: use emissary v2023.5.26-d73e027 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-26 13:56:56 +00:00
Jenkins	a7f3f2faea	feat: use emissary v2023.5.25-054744e Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-25 19:27:45 +00:00
Jenkins	6d0e693fc4	feat: use emissary v2023.5.24-58ef3b0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-24 08:19:36 +00:00
Jenkins	68a1de079e	feat: use emissary v2023.5.24-e568092 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-24 08:01:26 +00:00
Jenkins	7f1472f21b	feat: use emissary v2023.5.23-ece97ef Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-23 18:48:19 +00:00
Jenkins	291ad94b15	feat: use emissary v2023.5.23-4311cf6 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-05-23 12:53:02 +00:00
Jenkins	4b181ec9e1	feat: use emissary v2023.4.26-6a976c0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-26 14:00:14 +00:00
William Petit	81360c3fda	feat(turris,omnia): re-enable disk resizing Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-26 15:55:13 +02:00
William Petit	2cf46ed9a5	feat(turris,omnia): customize uci config All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-25 14:04:38 +02:00
William Petit	df763ef49a	feat(turris,omnia): add uci-defaults scripts	2023-04-25 14:04:38 +02:00
Jenkins	9e153e38cb	feat: use emissary v2023.4.25-d188af8 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-25 11:57:47 +00:00
Jenkins	9214c097b3	feat: use emissary v2023.4.24-e975381 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-24 11:55:12 +00:00
Jenkins	2339bc3aa6	feat: use emissary v2023.4.24-0d03a70 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-24 10:27:28 +00:00
Jenkins	908a36896e	feat: use emissary v2023.4.21-64ea0e0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-21 18:09:10 +00:00
William Petit	23452a06ff	feat(rpi): default firmware ok Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-21 18:42:06 +02:00
Jenkins	83f97abcbd	feat: use emissary v2023.4.21-541d30d All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-21 11:13:54 +00:00
Jenkins	d0f6e63007	feat: use emissary v2023.4.21-87a4509 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-21 10:51:10 +00:00
Jenkins	087f8a27a8	feat: use emissary v2023.4.20-fcd159c Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-20 17:32:21 +00:00
Jenkins	42c157a1e5	feat: use emissary v2023.4.20-ef3048b Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-20 10:26:56 +00:00
Jenkins	7b722293b7	feat: use emissary v2023.4.20-3d01cf0 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-20 09:04:43 +00:00
William Petit	d37c10afae	fix(turris,omnia): disable reboot after resize temporarily Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-17 11:57:46 +02:00
William Petit	40d6d2df03	fix(turris,omnia): reboot after disk resize All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-14 17:37:19 +02:00
Jenkins	f70763aed7	feat: use emissary v2023.4.14-813f837 All checks were successful arcad/emissary-firmware/pipeline/head This commit looks good Details	2023-04-14 14:32:47 +00:00
Jenkins	475a807302	feat: use emissary v2023.4.13-ed35ee5 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 11:52:10 +00:00
Jenkins	4e075cbd8e	feat: use emissary v2023.4.13-4b5bc0b Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 10:11:55 +00:00
Jenkins	ed52367837	feat: use emissary v2023.4.13-dee6218 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 09:39:49 +00:00
Jenkins	a6c32c5315	feat: use emissary v2023.4.13-76656e8 Some checks reported errors arcad/emissary-firmware/pipeline/head Something is wrong with the build of this commit Details	2023-04-13 09:32:01 +00:00