summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gomez <daniel@qtec.com>2022-03-14 10:13:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-14 13:33:12 +0000
commiteabf297194b36940d3fe4356db61ec0062aa039d (patch)
tree0dc8a758885d49f55e41559e6fd0f27c6b2237f5
parent1428128c787642dca690a7d51f2be793e001ae37 (diff)
downloadbitbake-eabf297194b36940d3fe4356db61ec0062aa039d.tar.gz
contrib: Fix hash server Dockerfile dependencies
When building the Hash Equivalence server Dockerfile, some dependencies are missing in order to run the hash server properly: Traceback errors: Traceback (most recent call last): File "/opt/bbhashserv/bin/bitbake-hashserv", line 61, in <module> ret = main() File "/opt/bbhashserv/bin/bitbake-hashserv", line 54, in main server = hashserv.create_server(args.bind, args.database, upstream=args.upstream, read_only=args.read_only) File "/opt/bbhashserv/lib/hashserv/__init__.py", line 120, in create_server from . import server File "/opt/bbhashserv/lib/hashserv/server.py", line 14, in <module> import bb.asyncrpc ModuleNotFoundError: No module named 'bb' Traceback (most recent call last): File "/opt/bbhashserv/bin/bitbake-hashserv", line 61, in <module> ret = main() File "/opt/bbhashserv/bin/bitbake-hashserv", line 54, in main server = hashserv.create_server(args.bind, args.database, upstream=args.upstream, read_only=args.read_only) File "/opt/bbhashserv/lib/hashserv/__init__.py", line 120, in create_server from . import server File "/opt/bbhashserv/lib/hashserv/server.py", line 14, in <module> import bb.asyncrpc File "/opt/bbhashserv/lib/bb/__init__.py", line 128, in <module> from bb import fetch2 as fetch File "/opt/bbhashserv/lib/bb/fetch2/__init__.py", line 1930, in <module> from . import git File "/opt/bbhashserv/lib/bb/fetch2/git.py", line 70, in <module> import bb.progress File "/opt/bbhashserv/lib/bb/progress.py", line 14, in <module> import bb.build File "/opt/bbhashserv/lib/bb/build.py", line 27, in <module> from bb import data, event, utils File "/opt/bbhashserv/lib/bb/data.py", line 36, in <module> from bb import data_smart File "/opt/bbhashserv/lib/bb/data_smart.py", line 23, in <module> import bb, bb.codeparser File "/opt/bbhashserv/lib/bb/codeparser.py", line 26, in <module> import codegen ModuleNotFoundError: No module named 'codegen' Traceback (most recent call last): File "/opt/bbhashserv/bin/bitbake-hashserv", line 61, in <module> ret = main() File "/opt/bbhashserv/bin/bitbake-hashserv", line 54, in main server = hashserv.create_server(args.bind, args.database, upstream=args.upstream, read_only=args.read_only) File "/opt/bbhashserv/lib/hashserv/__init__.py", line 120, in create_server from . import server File "/opt/bbhashserv/lib/hashserv/server.py", line 14, in <module> import bb.asyncrpc File "/opt/bbhashserv/lib/bb/__init__.py", line 128, in <module> from bb import fetch2 as fetch File "/opt/bbhashserv/lib/bb/fetch2/__init__.py", line 1930, in <module> from . import git File "/opt/bbhashserv/lib/bb/fetch2/git.py", line 70, in <module> import bb.progress File "/opt/bbhashserv/lib/bb/progress.py", line 14, in <module> import bb.build File "/opt/bbhashserv/lib/bb/build.py", line 27, in <module> from bb import data, event, utils File "/opt/bbhashserv/lib/bb/data.py", line 36, in <module> from bb import data_smart File "/opt/bbhashserv/lib/bb/data_smart.py", line 23, in <module> import bb, bb.codeparser File "/opt/bbhashserv/lib/bb/codeparser.py", line 32, in <module> from bb.pysh import pyshyacc, pyshlex File "/opt/bbhashserv/lib/bb/pysh/pyshyacc.py", line 13, in <module> import bb.pysh.pyshlex as pyshlex File "/opt/bbhashserv/lib/bb/pysh/pyshlex.py", line 17, in <module> from ply import lex ModuleNotFoundError: No module named 'ply' Traceback (most recent call last): File "/opt/bbhashserv/bin/bitbake-hashserv", line 61, in <module> ret = main() File "/opt/bbhashserv/bin/bitbake-hashserv", line 54, in main server = hashserv.create_server(args.bind, args.database, upstream=args.upstream, read_only=args.read_only) File "/opt/bbhashserv/lib/hashserv/__init__.py", line 120, in create_server from . import server File "/opt/bbhashserv/lib/hashserv/server.py", line 14, in <module> import bb.asyncrpc File "/opt/bbhashserv/lib/bb/__init__.py", line 128, in <module> from bb import fetch2 as fetch File "/opt/bbhashserv/lib/bb/fetch2/__init__.py", line 1935, in <module> from . import wget File "/opt/bbhashserv/lib/bb/fetch2/wget.py", line 30, in <module> from bs4 import BeautifulSoup ModuleNotFoundError: No module named 'bs4' Signed-off-by: Daniel Gomez <daniel@qtec.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 0bd637acfcba5a44230c291889d2a5ff571cb8c6) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--contrib/hashserv/Dockerfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/hashserv/Dockerfile b/contrib/hashserv/Dockerfile
index d6fc728f3..74b4a3be1 100644
--- a/contrib/hashserv/Dockerfile
+++ b/contrib/hashserv/Dockerfile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: MIT
#
# Copyright (c) 2021 Joshua Watt <JPEWhacker@gmail.com>
-#
+#
# Dockerfile to build a bitbake hash equivalence server container
#
# From the root of the bitbake repository, run:
@@ -15,5 +15,9 @@ RUN apk add --no-cache python3
COPY bin/bitbake-hashserv /opt/bbhashserv/bin/
COPY lib/hashserv /opt/bbhashserv/lib/hashserv/
+COPY lib/bb /opt/bbhashserv/lib/bb/
+COPY lib/codegen.py /opt/bbhashserv/lib/codegen.py
+COPY lib/ply /opt/bbhashserv/lib/ply/
+COPY lib/bs4 /opt/bbhashserv/lib/bs4/
ENTRYPOINT ["/opt/bbhashserv/bin/bitbake-hashserv"]