[meta-arago][scarthgap][PATCH] websocketd: Update to latest go build methodology
Ryan Eatmon <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arago |
|---|---|
| Message-ID | <[email protected]> |
Move the recipe to use the most up to date go methodology for building websocketd. This removes the need for the network access during compile. Also, remove the INSANE_SKIP and instead list out the correct package dependencies. Finally, apply a small patch for the python examples to use /usr/bin/python3 instead of /usr/bin/python so that everything lines up with the python3-core recipe. Signed-off-by: Ryan Eatmon <[email protected]> --- .../files/0001-examples-Move-to-python3.patch | 50 +++++++++++++++++++ .../websocketd/websocketd_0.4.1.bb | 28 ++++++----- 2 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 meta-arago-extras/recipes-devtools/websocketd/files/0001-examples-Move-to-python3.patch diff --git a/meta-arago-extras/recipes-devtools/websocketd/files/0001-examples-Move-to-python3.patch b/meta-arago-extras/recipes-devtools/websocketd/files/0001-examples-Move-to-python3.patch new file mode 100644 index 00000000..c3c12f19 --- /dev/null +++ b/meta-arago-extras/recipes-devtools/websocketd/files/0001-examples-Move-to-python3.patch @@ -0,0 +1,50 @@ +From a3b4b0a7d996dc6bade0454ecf0e56d80fce399a Mon Sep 17 00:00:00 2001 +From: Ryan Eatmon <[email protected]> +Date: Tue, 4 Nov 2025 16:33:03 -0600 +Subject: [PATCH] examples: Move to python3 + +The examples are hard coded to look for /usr/bin/python, but we only +have /usr/bin/python3. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Ryan Eatmon <[email protected]> +--- + examples/python/count.py | 2 +- + examples/python/dump-env.py | 2 +- + examples/python/greeter.py | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/github.com/joewalnes/websocketd/examples/python/count.py b/src/github.com/joewalnes/websocketd/examples/python/count.py +index 8023750..3bd43a9 100755 +--- a/src/github.com/joewalnes/websocketd/examples/python/count.py ++++ b/src/github.com/joewalnes/websocketd/examples/python/count.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # Copyright 2013 Joe Walnes and the websocketd team. + # All rights reserved. +diff --git a/src/github.com/joewalnes/websocketd/examples/python/dump-env.py b/src/github.com/joewalnes/websocketd/examples/python/dump-env.py +index 2962468..b88b25d 100755 +--- a/src/github.com/joewalnes/websocketd/examples/python/dump-env.py ++++ b/src/github.com/joewalnes/websocketd/examples/python/dump-env.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # Copyright 2013 Joe Walnes and the websocketd team. + # All rights reserved. +diff --git a/src/github.com/joewalnes/websocketd/examples/python/greeter.py b/src/github.com/joewalnes/websocketd/examples/python/greeter.py +index dddf24e..464c021 100755 +--- a/src/github.com/joewalnes/websocketd/examples/python/greeter.py ++++ b/src/github.com/joewalnes/websocketd/examples/python/greeter.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # Copyright 2013 Joe Walnes and the websocketd team. + # All rights reserved. +-- +2.17.1 + diff --git a/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb b/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb index 207cd38a..4e1cef0f 100644 --- a/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb +++ b/meta-arago-extras/recipes-devtools/websocketd/websocketd_0.4.1.bb @@ -3,21 +3,23 @@ HOMEPAGE = "http://websocketd.com/" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=a14d7befdbee1290ac5c472cd85d66f2" -inherit go-mod +S = "${WORKDIR}" -GO_IMPORT = "github.com/joewalnes/websocketd" - -export GOPROXY = "https://proxy.golang.org,direct" +SRC_URI = "\ + git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=src/${GO_IMPORT} \ + git://${GO_IMPORT_websocket}.git;protocol=https;branch=main;name=websocket;destsuffix=src/${GO_IMPORT_websocket} \ + file://0001-examples-Move-to-python3.patch \ +" -SRC_URI = "git://${GO_IMPORT};protocol=https;branch=master" SRCREV = "035c18cc3e6962dabd5ea2ad8845260726a4a99e" +SRCREV_websocket = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d" + +SRCREV_FORMAT .= "_websocket" + +GO_IMPORT = "github.com/joewalnes/websocketd" +GO_IMPORT_websocket = "github.com/gorilla/websocket" -# bitbake only exports proxy variables during fetching, but go handles -# module fetching on its own during compile and needs proxy settings -# along with network access for the task -export http_proxy -export https_proxy -do_compile[network] = "1" +export GO111MODULE = "off" +inherit go -# Development package contains all the examples in different languages -INSANE_SKIP:${PN}-dev = "file-rdeps" +RDEPENDS:${PN}-dev = "bash perl php-cli python3-core ruby" -- 2.17.1