diff mbox series

[meta-oe] ssd1306: Update and remove patch

Message ID 20240108101807.2132710-1-leon.anavi@konsulko.com
State Accepted
Headers show
Series [meta-oe] ssd1306: Update and remove patch | expand

Commit Message

Leon Anavi Jan. 8, 2024, 10:18 a.m. UTC 
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>
---
 .../ssd1306/0001-Use-include-filename.patch   | 49 -------------------
 .../recipes-devtools/ssd1306/ssd1306_git.bb   |  3 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/ssd1306/ssd1306/0001-Use-include-filename.patch
diff mbox series

Patch

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 @@ 
-From cb32ebbb1efb3202808809861ec3cbd811c55bd2 Mon Sep 17 00:00:00 2001
-From: Leon Anavi <leon.anavi@konsulko.com>
-Date: Sat, 30 Dec 2023 13:23:31 +0000
-Subject: [PATCH] Use include "filename"
-
-Use include "filename" to include programmer-defined header files
-from the same directory as the file containing the directive.
-
-Upstream-Status: Submitted [https://github.com/armlabs/ssd1306_linux/pull/4]
-
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
----
- main.c    | 2 +-
- ssd1306.c | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/main.c b/main.c
-index c1ffc2f..18e2b84 100644
---- a/main.c
-+++ b/main.c
-@@ -6,7 +6,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include <ssd1306.h>
-+#include "ssd1306.h"
- 
- void print_help()
- {
-diff --git a/ssd1306.c b/ssd1306.c
-index a03674a..2e6ba97 100644
---- a/ssd1306.c
-+++ b/ssd1306.c
-@@ -8,9 +8,9 @@
- #include <string.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#include <linux_i2c.h>
--#include <ssd1306.h>
--#include <font.h>
-+#include "linux_i2c.h"
-+#include "ssd1306.h"
-+#include "font.h"
- 
- const char init_oled_type_file[] = "/tmp/.ssd1306_oled_type";
- 
--- 
-2.39.2
-
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"
 
 SRC_URI = " \
     git://github.com/armlabs/ssd1306_linux.git;protocol=https;branch=master \
-    file://0001-Use-include-filename.patch \
 "
-SRCREV = "7375f1088732d243f7167c9a17725f1a860da587"
+SRCREV = "34b42992a43fda69c6ba2557b718601cafe16251"
 
 S = "${WORKDIR}/git"