Denys Dmytriyenko
2018-11-06 21:26:44 UTC
Signed-off-by: Denys Dmytriyenko <***@ti.com>
---
v2 - remove unneeded patch
...0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch | 26 ----------------------
.../recipes-devtools/uvc-gadget/uvc-gadget_git.bb | 11 +++++----
2 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch
diff --git a/meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch b/meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch
deleted file mode 100644
index d688422..0000000
--- a/meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ae986b12f20b88de5f949062516fff4d8f887645 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <***@ti.com>
-Date: Mon, 1 May 2017 16:33:33 -0400
-Subject: [PATCH] uvc-gadget: don't hardcode uvc.h path
-
-Signed-off-by: Denys Dmytriyenko <***@ti.com>
----
- uvc-gadget.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/uvc-gadget.c b/uvc-gadget.c
-index 4d59ab8..cd9e916 100644
---- a/uvc-gadget.c
-+++ b/uvc-gadget.c
-@@ -36,7 +36,7 @@
- #include <linux/usb/video.h>
- #include <linux/videodev2.h>
-
--#include "../drivers/usb/gadget/uvc.h"
-+#include "uvc.h"
-
- #define clamp(val, min, max) ({ \
- typeof(val) __val = (val); \
---
-2.7.4
-
diff --git a/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb b/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
index 1f75f15..39f8cb3 100644
--- a/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
+++ b/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
@@ -2,18 +2,17 @@ SUMMARY = "UVC gadget userspace sample application"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://uvc-gadget.c;beginline=1;endline=18;md5=414860c3c534dc95d81da9564cfb8d2a"
-DEPENDS = "virtual/kernel"
-
SRC_URI = "git://git.ideasonboard.org/uvc-gadget.git"
-SRC_URI += "file://0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch"
-PV = "1.0+git${SRCPV}"
-SRCREV = "3c5a666f9d2eea0e0f7e9a8a0eb8bbfd7687ca13"
+PV = "1.1+git${SRCPV}"
+SRCREV = "aa82df887ab995473cd83c89777cdf4bc4685dd0"
S = "${WORKDIR}/git"
+EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" KERNEL_INCLUDE=""'
+
do_compile () {
- ${CC} ${CFLAGS} -I${STAGING_KERNEL_DIR}/drivers/usb/gadget/function ${LDFLAGS} -o uvc-gadget uvc-gadget.c
+ oe_runmake
}
do_install () {
---
v2 - remove unneeded patch
...0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch | 26 ----------------------
.../recipes-devtools/uvc-gadget/uvc-gadget_git.bb | 11 +++++----
2 files changed, 5 insertions(+), 32 deletions(-)
delete mode 100644 meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch
diff --git a/meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch b/meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch
deleted file mode 100644
index d688422..0000000
--- a/meta-arago-extras/recipes-devtools/uvc-gadget/files/0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ae986b12f20b88de5f949062516fff4d8f887645 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <***@ti.com>
-Date: Mon, 1 May 2017 16:33:33 -0400
-Subject: [PATCH] uvc-gadget: don't hardcode uvc.h path
-
-Signed-off-by: Denys Dmytriyenko <***@ti.com>
----
- uvc-gadget.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/uvc-gadget.c b/uvc-gadget.c
-index 4d59ab8..cd9e916 100644
---- a/uvc-gadget.c
-+++ b/uvc-gadget.c
-@@ -36,7 +36,7 @@
- #include <linux/usb/video.h>
- #include <linux/videodev2.h>
-
--#include "../drivers/usb/gadget/uvc.h"
-+#include "uvc.h"
-
- #define clamp(val, min, max) ({ \
- typeof(val) __val = (val); \
---
-2.7.4
-
diff --git a/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb b/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
index 1f75f15..39f8cb3 100644
--- a/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
+++ b/meta-arago-extras/recipes-devtools/uvc-gadget/uvc-gadget_git.bb
@@ -2,18 +2,17 @@ SUMMARY = "UVC gadget userspace sample application"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://uvc-gadget.c;beginline=1;endline=18;md5=414860c3c534dc95d81da9564cfb8d2a"
-DEPENDS = "virtual/kernel"
-
SRC_URI = "git://git.ideasonboard.org/uvc-gadget.git"
-SRC_URI += "file://0001-uvc-gadget-don-t-hardcode-uvc.h-path.patch"
-PV = "1.0+git${SRCPV}"
-SRCREV = "3c5a666f9d2eea0e0f7e9a8a0eb8bbfd7687ca13"
+PV = "1.1+git${SRCPV}"
+SRCREV = "aa82df887ab995473cd83c89777cdf4bc4685dd0"
S = "${WORKDIR}/git"
+EXTRA_OEMAKE = 'CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" KERNEL_INCLUDE=""'
+
do_compile () {
- ${CC} ${CFLAGS} -I${STAGING_KERNEL_DIR}/drivers/usb/gadget/function ${LDFLAGS} -o uvc-gadget uvc-gadget.c
+ oe_runmake
}
do_install () {
--
2.7.4
2.7.4