From e1aff45e1bd52213476a5dc59d7aa9abaa6db116 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Mon, 19 Oct 2020 16:53:57 +0300 Subject: waltham_%.bbappend: Added bbappend recipe for waltham Waltham no longer compiles and it is required for waltham-transmitter-plugin to function. A follow-up task has been added at SPEC-3647 to further determine what we should do about it. For now, this adds a bbappend recipe and with it 2 patches that fixes trivial compilation errors. The third patch is for 'enhancing' the waltham protocol to pass from the transmitter plug-in to the receiver side the app_id. Bug-AGL: SPEC-3601, SPEC-3647 Signed-off-by: Marius Vlad Change-Id: Ie01e4ad1db0a64d9d911308250ea63a79f78c6fa Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25452 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../waltham/0001-Use-python3-instead-of-2.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 meta-agl-profile-graphical/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch') diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch new file mode 100644 index 000000000..32c2df3c4 --- /dev/null +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/waltham/0001-Use-python3-instead-of-2.patch @@ -0,0 +1,51 @@ +From 6ecdf10a10929164f3cbdb754ae91d27576e5036 Mon Sep 17 00:00:00 2001 +From: Marius Vlad +Date: Fri, 16 Oct 2020 18:57:38 +0300 +Subject: [PATCH] Use python3 instead of 2 + +Signed-off-by: Marius Vlad +--- + configure.ac | 2 +- + tools/gen.py | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5f65a6b..94b8644 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,7 @@ AC_SUBST(VERSION_INFO) + # Check for programs + AC_PROG_CC + AC_PROG_CC_STDC +-AC_CHECK_PROGS([PYTHON2], [python2 python]) ++AC_CHECK_PROGS([PYTHON3], [python3 python]) + PKG_PROG_PKG_CONFIG() + + AC_ARG_ENABLE(gprof, +diff --git a/tools/gen.py b/tools/gen.py +index 19e8baa..64c5870 100755 +--- a/tools/gen.py ++++ b/tools/gen.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + # Copyright © 2013-2014 Collabora, Ltd. +@@ -562,11 +562,11 @@ try: + opts, args = getopt.getopt(sys.argv[1:], "hp:i:o:t:m:", + ["preamble=", "input=", "output=", "type=", "mode="]) + except getopt.GetoptError: +- print 'gen.py -p -i -o -t -m ' ++ print('gen.py -p -i -o -t -m ') + sys.exit(2) + for opt, arg in opts: + if opt == '-h': +- print 'gen.py -p -i -o -t -m ' ++ print('gen.py -p -i -o -t -m ') + sys.exit() + elif opt in ("-p", "--preamble"): + preamble_files.append(arg) +-- +2.28.0 + -- cgit 1.2.3-korg