From 261ff07333b18543a57a8a2563c2e836cf14f7c4 Mon Sep 17 00:00:00 2001
From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com>
Date: Tue, 16 Jul 2024 17:41:07 +0200
Subject: [PATCH] recipes-support/openvpn: deleted

Related to https://github.com/3mdeb/meta-rte/issues/72
Also deleted the `/data` partition that was used for
storing config
---
 conf/distro/rte.conf                          |  1 -
 .../packagegroups/packagegroup-rte.bb         |  1 -
 .../openvpn/openvpn/openvpn@.service          | 13 -------------
 recipes-support/openvpn/openvpn_%.bbappend    | 19 -------------------
 wic/sunxi-mmc-spl.wks                         |  5 ++---
 5 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 recipes-support/openvpn/openvpn/openvpn@.service
 delete mode 100644 recipes-support/openvpn/openvpn_%.bbappend

diff --git a/conf/distro/rte.conf b/conf/distro/rte.conf
index 91445ad..81bb2c2 100644
--- a/conf/distro/rte.conf
+++ b/conf/distro/rte.conf
@@ -54,7 +54,6 @@ TCLIBCAPPEND = ""
 
 WIC_CREATE_EXTRA_ARGS = "\
     --rootfs-dir rootfs-main=${IMAGE_ROOTFS} \
-    --rootfs-dir rootfs-data=${IMAGE_ROOTFS}/data \
     "
 
 QEMU_TARGETS ?= "arm"
diff --git a/recipes-extended/packagegroups/packagegroup-rte.bb b/recipes-extended/packagegroups/packagegroup-rte.bb
index 363b1ee..127012f 100644
--- a/recipes-extended/packagegroups/packagegroup-rte.bb
+++ b/recipes-extended/packagegroups/packagegroup-rte.bb
@@ -32,7 +32,6 @@ RDEPENDS:packagegroup-rte-core = " \
     swupdate \
     u-boot \
     openvpn \
-    openvpn-rte \
     xradio-firmware \
     xradio \
     "
diff --git a/recipes-support/openvpn/openvpn/openvpn@.service b/recipes-support/openvpn/openvpn/openvpn@.service
deleted file mode 100644
index 6fca7bf..0000000
--- a/recipes-support/openvpn/openvpn/openvpn@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Our version of openvpn service
-After=syslog.target network.target
-ConditionPathExists=/storage/openvpn/rte.conf
-
-[Service]
-PrivateTmp=true
-Type=forking
-PIDFile=/var/run/openvpn/%i.pid
-ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /storage/openvpn/ --config %i.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/recipes-support/openvpn/openvpn_%.bbappend b/recipes-support/openvpn/openvpn_%.bbappend
deleted file mode 100644
index 02bb5b4..0000000
--- a/recipes-support/openvpn/openvpn_%.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-PACKAGES =+ "${PN}-rte"
-
-RTE_VPN_CONFIG_DIR = "/data/openvpn"
-
-FILES:${PN}-rte = "${RTE_VPN_CONFIG_DIR}"
-
-do_install:prepend() {
-    sed -i 's/CONFIG_DIR=\/etc/CONFIG_DIR=\/storage/' ${WORKDIR}/openvpn
-}
-
-do_install:append() {
-    install -d ${D}/${RTE_VPN_CONFIG_DIR}
-}
-
-SYSTEMD_SERVICE:${PN}-rte = "openvpn@rte.service"
-SYSTEMD_PACKAGES += "${PN}-rte"
-SYSTEMD_AUTO_ENABLE:${PN}-rte = "disable"
diff --git a/wic/sunxi-mmc-spl.wks b/wic/sunxi-mmc-spl.wks
index 0b6bb18..efc15b9 100644
--- a/wic/sunxi-mmc-spl.wks
+++ b/wic/sunxi-mmc-spl.wks
@@ -1,5 +1,4 @@
 part u-boot --source rawcopy --sourceparams="file=u-boot-sunxi-with-spl.bin" --ondisk mmcblk0 --no-table --align 8
 part /boot/bootpart --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --fixed-size 16
-part /              --source rootfs --rootfs-dir=rootfs-main --ondisk mmcblk0 --fstype=ext4 --label rootfs1 --align 1024 --fixed-size 256 --exclude-path data/
-part                --source rootfs --rootfs-dir=rootfs-main --ondisk mmcblk0 --fstype=ext4 --label rootfs2 --align 1024 --fixed-size 256 --exclude-path data/
-part /data       --source rootfs --rootfs-dir=rootfs-data --ondisk mmcblk0 --fstype=ext4 --label data --align 1024 --fixed-size 512
+part /              --source rootfs --rootfs-dir=rootfs-main --ondisk mmcblk0 --fstype=ext4 --label rootfs1 --align 1024 --fixed-size 256
+part                --source rootfs --rootfs-dir=rootfs-main --ondisk mmcblk0 --fstype=ext4 --label rootfs2 --align 1024 --fixed-size 256