summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools
diff options
context:
space:
mode:
authorLeon Anavi <leon.anavi@konsulko.com>2024-01-08 12:18:07 +0200
committerKhem Raj <raj.khem@gmail.com>2024-01-08 19:54:41 -0800
commit6aab924b38f2e2fba4d5ea6903995e4634941e95 (patch)
treed3ee6f7b9088cfae79982bc609ca74abd735b7a3 /meta-oe/recipes-devtools
parent1e848281ef6ff53bb89e323a978ebd00f02cb1f2 (diff)
downloadmeta-openembedded-6aab924b38f2e2fba4d5ea6903995e4634941e95.tar.gz
ssd1306: Update and remove patch
Update ssd1306_linux, OLED SSD1306 Linux user space driver, to the latest version and remove a patch that has been merged in upstream of the project in GitHub. Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r--meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch49
-rw-r--r--meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb3
2 files changed, 1 insertions, 51 deletions
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch b/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
deleted file mode 100644
index dfe48175a..000000000
--- a/meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From cb32ebbb1efb3202808809861ec3cbd811c55bd2 Mon Sep 17 00:00:00 2001
2From: Leon Anavi <leon.anavi@konsulko.com>
3Date: Sat, 30 Dec 2023 13:23:31 +0000
4Subject: [PATCH] Use include "filename"
5
6Use include "filename" to include programmer-defined header files
7from the same directory as the file containing the directive.
8
9Upstream-Status: Submitted [https://github.com/armlabs/ssd1306_linux/pull/4]
10
11Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
12---
13 main.c | 2 +-
14 ssd1306.c | 6 +++---
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/main.c b/main.c
18index c1ffc2f..18e2b84 100644
19--- a/main.c
20+++ b/main.c
21@@ -6,7 +6,7 @@
22 #include <string.h>
23 #include <fcntl.h>
24 #include <sys/ioctl.h>
25-#include <ssd1306.h>
26+#include "ssd1306.h"
27
28 void print_help()
29 {
30diff --git a/ssd1306.c b/ssd1306.c
31index a03674a..2e6ba97 100644
32--- a/ssd1306.c
33+++ b/ssd1306.c
34@@ -8,9 +8,9 @@
35 #include <string.h>
36 #include <fcntl.h>
37 #include <sys/ioctl.h>
38-#include <linux_i2c.h>
39-#include <ssd1306.h>
40-#include <font.h>
41+#include "linux_i2c.h"
42+#include "ssd1306.h"
43+#include "font.h"
44
45 const char init_oled_type_file[] = "/tmp/.ssd1306_oled_type";
46
47--
482.39.2
49
diff --git a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
index 5adfd3ed6..f9e367959 100644
--- a/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
+++ b/meta-oe/recipes-devtools/ssd1306/ssd1306_git.bb
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7b694e603a996c3bfdc6093ed1f70c8f"
8 8
9SRC_URI = " \ 9SRC_URI = " \
10 git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \ 10 git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \
11 file://0001-Use-include-filename.patch \
12" 11"
13SRCREV = "7375f1088732d243f7167c9a17725f1a860da587" 12SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15