diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-02-14 10:56:51 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-02-14 10:57:14 +0100 |
| commit | cad329560f7d1de4d16195eb258e43081d3b08c4 (patch) | |
| tree | e741da19f9233a42a03d1af60080296082fbcf41 /recipes-kernel | |
| parent | a7ed1887b82ee27c9ae6aef39a4a5067195fd129 (diff) | |
| parent | c58cb01cb560da122ea64ba76d6b68a183e2f457 (diff) | |
Merge remote-tracking branch 'agl/sandbox/ronan/rocko' into HEAD
* agl/sandbox/ronan/rocko:
Remove weston virtual screen
Fix most for kernel 4.14
Fix qtwayland patch
Fix build of qtwayland 5.9 without evdev
Remove backport patch from Qt5 to show cover art
ninja,harfbuzz: Remove .bbappend
libdbus-c++:Fix build error in GCC-7
qtbase: Remove -no-use-gold-linker option
unicens-config: Add bash to rdeps
libdbus-c++: Remove bbappend file
opencv: Rename .bbappend to match new version from meta-openembedded
Bug-AGL: SPEC-1181
Change-Id: Icc3062631994e8afbddeb18a52c72619156d219a
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/most/files/0001-src-most-net-add-skb_put_data-function.patch | 33 | ||||
| -rw-r--r-- | recipes-kernel/most/most.bbappend | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/recipes-kernel/most/files/0001-src-most-net-add-skb_put_data-function.patch b/recipes-kernel/most/files/0001-src-most-net-add-skb_put_data-function.patch deleted file mode 100644 index b9ef5951..00000000 --- a/recipes-kernel/most/files/0001-src-most-net-add-skb_put_data-function.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d297f3ec0c45a6cfff6d83d8f0eb1c4a5ed0b95f Mon Sep 17 00:00:00 2001 -From: Christian Gromm <christian.gromm@microchip.com> -Date: Thu, 9 Nov 2017 11:31:27 +0100 -Subject: [PATCH 1/2] src: most: net: add skb_put_data function - -This patch adds the function skb_put_data. It is needed to backport -the sources to kernel versions prior to 4.13. - -Signed-off-by: Christian Gromm <christian.gromm@microchip.com> ---- - driver/aim-network/networking.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/aim-network/networking.c b/aim-network/networking.c -index 936f013..9c3d1eb 100644 ---- a/aim-network/networking.c -+++ b/aim-network/networking.c -@@ -419,6 +419,12 @@ put_nd: - return 0; - } - -+static inline void skb_put_data(struct sk_buff *skb, const void *data, -+ unsigned int len) -+{ -+ memcpy(skb_put(skb, len), data, len); -+} -+ - static int aim_rx_data(struct mbo *mbo) - { - const u32 zero = 0; --- -2.7.4 - diff --git a/recipes-kernel/most/most.bbappend b/recipes-kernel/most/most.bbappend index 092a7606..bca20d59 100644 --- a/recipes-kernel/most/most.bbappend +++ b/recipes-kernel/most/most.bbappend @@ -1,7 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI_append = " \ - file://0001-src-most-net-add-skb_put_data-function.patch \ file://0002-src-most-add-auto-conf-feature.patch \ file://0003-core-remove-kernel-log-for-MBO-status.patch \ file://0004-most-video-set-device_caps.patch \ |