From 753180f77911ac4b65e5957d7af91db89fc66146 Mon Sep 17 00:00:00 2001
From: vbenoit <vincent.benoit@benserv.fr>
Date: Thu, 13 Jul 2023 06:49:00 +0000
Subject: [PATCH] correction de bugs

---
 conf/distro/rpi-distro.conf                   |  8 +++--
 ...-test-image.bb => rpi-test-cyber-image.bb} |  5 +--
 recipes-core/images/rpi-test-cyber-image.inc  | 31 +++++++++++++++++++
 recipes-core/images/rpi-test-image.inc        | 28 -----------------
 .../wazuh/files/wazuh-agent.service           |  1 +
 scripts/envsetup.sh                           |  2 +-
 6 files changed, 42 insertions(+), 33 deletions(-)
 rename recipes-core/images/{rpi-test-image.bb => rpi-test-cyber-image.bb} (60%)
 create mode 100644 recipes-core/images/rpi-test-cyber-image.inc
 delete mode 100644 recipes-core/images/rpi-test-image.inc

diff --git a/conf/distro/rpi-distro.conf b/conf/distro/rpi-distro.conf
index 9f7966b..71136e6 100644
--- a/conf/distro/rpi-distro.conf
+++ b/conf/distro/rpi-distro.conf
@@ -8,8 +8,9 @@ SDK_VERSION = "${DISTRO_VERSION}"
 MAINTENER = "vincent.benoit@benserv.fr"
 
 # Image Rootfs type and size
-IMAGE_FSTYPES = "tar.bz2 ext4 ext4.xz rpi-sdimg"
+IMAGE_FSTYPES = "tar.bz2 ext4 ext4.xz rpi-sdimg wic"
 SDIMG_ROOTFS_TYPE = "ext4.xz"
+WKS_FILE ?= "sdimage-raspberrypi.wks"
 # define a multiplier that the build system apllies to
 # the initial image size (4Go freespace)
 #IMAGE_OVERHEAD_FACTOR = "2"
@@ -53,6 +54,9 @@ INHERIT += "rm_work"
 
 # Use extrausers
 INHERIT += "extrausers"
-EXTRA_USERS_PARAMS += "usermod -p '\$6\$kineintercom\$CRdIWTleZDC7c/0pNVlDZy7K56fyf5PVsAGlx27GAY8UX/EjObgmxhMi3YOOs0uLj.da3jMdv.sKFngNFUqFz1' root;"
+# # mkpasswd -m sha-512 root -s sclecyber
+EXTRA_USERS_PARAMS += "usermod -p '\$6\$sclecyber\$n9LKVtEnhPIDEbFdRFVPWbuRoYabzprcF0W2XuR4Tg/au6xrII8/4qBDc8vPn0z7qthIL.UMp4TlZWi9uOsFQ.' root;"
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-module-rtl8188eus"
 
 RM_WORK_EXCLUDE += "wazuh-agent"
diff --git a/recipes-core/images/rpi-test-image.bb b/recipes-core/images/rpi-test-cyber-image.bb
similarity index 60%
rename from recipes-core/images/rpi-test-image.bb
rename to recipes-core/images/rpi-test-cyber-image.bb
index ba6d20b..e2e8d9b 100644
--- a/recipes-core/images/rpi-test-image.bb
+++ b/recipes-core/images/rpi-test-cyber-image.bb
@@ -1,4 +1,5 @@
 # Copyright (C) 2022 Vincent BENOIT <vincent.benoit@benserv.fr>
 # Release under the MIT license (see COPYING.MIT for the terms)
-SUMMARY = "RPI Test Image"
-include rpi-test-image.inc
+SUMMARY = "RPI Test Cyber Image"
+LICENSE = "CLOSED"
+include rpi-test-cyber-image.inc
diff --git a/recipes-core/images/rpi-test-cyber-image.inc b/recipes-core/images/rpi-test-cyber-image.inc
new file mode 100644
index 0000000..cd800ab
--- /dev/null
+++ b/recipes-core/images/rpi-test-cyber-image.inc
@@ -0,0 +1,31 @@
+SUMMARY = "Cyber Scle Image"
+PV = "1.0.0"
+
+inherit core-image
+
+EXTRA_IMAGE_FEATURES = ""
+GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8"
+IMAGE_LINGUAS = "fr-fr"
+
+PROCESS_INSTALL = " \
+                    lynis \
+                    wazuh-agent \
+                  "
+
+PYTHON_INSTALL = " \
+                 "
+
+IMAGE_INSTALL += " \
+                   sudo \
+                   logrotate \
+                   rsyslog \
+                   iptables \
+                   procps \
+                   kbd-keymaps \
+                   vim \
+                   usbutils \
+                   wpa-supplicant \
+                   ${PROCESS_INSTALL} \
+"
+
+#COMPATIBLE_MACHINE = "^raspberrypi$"
diff --git a/recipes-core/images/rpi-test-image.inc b/recipes-core/images/rpi-test-image.inc
deleted file mode 100644
index 5172ce9..0000000
--- a/recipes-core/images/rpi-test-image.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Cyber Scle Image"
-PV = "1.0.0"
-
-inherit core-image
-
-EXTRA_IMAGE_FEATURES = ""
-GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8"
-IMAGE_LINGUAS = "fr-fr"
-
-PROCESS_INSTALL = " \
-                    lynis \
-                    wazuh-agent \
-                  "
-
-PYTHON_INSTALL = " \
-                 "
-
-IMAGE_INSTALL += " \
-          sudo \
-		  logrotate \
-		  rsyslog \
-		  iptables \
-		  procps \
-		  kbd-keymaps \
-		  vim \
-		  usbutils \
-		  ${PROCESS_INSTALL} \
-		 "
diff --git a/recipes-scanners/wazuh/files/wazuh-agent.service b/recipes-scanners/wazuh/files/wazuh-agent.service
index 9a10922..2b6529c 100644
--- a/recipes-scanners/wazuh/files/wazuh-agent.service
+++ b/recipes-scanners/wazuh/files/wazuh-agent.service
@@ -6,6 +6,7 @@ After=network.target network-online.target
 [Service]
 Type=forking
 
+Environment="LD_LIBRARY_PATH=/var/ossec/lib"
 ExecStart=/usr/bin/env /var/ossec/bin/wazuh-control start
 ExecStop=/usr/bin/env /var/ossec/bin/wazuh-control stop
 ExecReload=/usr/bin/env /var/ossec/bin/wazuh-control reload
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 5d8ab30..4e03359 100644
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -35,7 +35,7 @@ if [ "a${DISTRO}" = "a" ]; then
 fi
 
 if [ "a${MACHINE}" = "a" ]; then
-	MACHINE="raspberrypi4"
+	MACHINE="raspberrypi"
 fi
 
 if [ "a${VERS}" = "a" ]; then