diff options
author | Joshua Watt <JPEWhacker@gmail.com> | 2024-03-22 07:50:35 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-23 10:19:00 +0000 |
commit | 978206fed48983dd650aeb2302e0b3730c7bb14d (patch) | |
tree | 238e25f2bc0830f6e6963fa06db127407c55f8fb | |
parent | d616929413af7779c60355e331ccfa68d7f38b5f (diff) | |
download | poky-978206fed48983dd650aeb2302e0b3730c7bb14d.tar.gz |
bitbake: siggen: Add support for hashserve credentials
Adds support for hashserver credentials to be specified in the
SignatureGenerator
(Bitbake rev: 741bef3755fde7bae1386aad575ea704d9fe0969)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/siggen.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 3ab8431a08..2a0ecf57e1 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -535,23 +535,34 @@ class SignatureGeneratorUniHashMixIn(object): | |||
535 | # hashes to appear over time, but much less likely for them to | 535 | # hashes to appear over time, but much less likely for them to |
536 | # disappear | 536 | # disappear |
537 | self.unihash_exists_cache = set() | 537 | self.unihash_exists_cache = set() |
538 | self.username = None | ||
539 | self.password = None | ||
538 | super().__init__(data) | 540 | super().__init__(data) |
539 | 541 | ||
540 | def get_taskdata(self): | 542 | def get_taskdata(self): |
541 | return (self.server, self.method, self.extramethod, self.max_parallel) + super().get_taskdata() | 543 | return (self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password) + super().get_taskdata() |
542 | 544 | ||
543 | def set_taskdata(self, data): | 545 | def set_taskdata(self, data): |
544 | self.server, self.method, self.extramethod, self.max_parallel = data[:4] | 546 | self.server, self.method, self.extramethod, self.max_parallel, self.username, self.password = data[:6] |
545 | super().set_taskdata(data[4:]) | 547 | super().set_taskdata(data[6:]) |
548 | |||
549 | def get_hashserv_creds(self): | ||
550 | if self.username and self.password: | ||
551 | return { | ||
552 | "username": self.username, | ||
553 | "password": self.password, | ||
554 | } | ||
555 | |||
556 | return {} | ||
546 | 557 | ||
547 | def client(self): | 558 | def client(self): |
548 | if getattr(self, '_client', None) is None: | 559 | if getattr(self, '_client', None) is None: |
549 | self._client = hashserv.create_client(self.server) | 560 | self._client = hashserv.create_client(self.server, **self.get_hashserv_creds()) |
550 | return self._client | 561 | return self._client |
551 | 562 | ||
552 | def client_pool(self): | 563 | def client_pool(self): |
553 | if getattr(self, '_client_pool', None) is None: | 564 | if getattr(self, '_client_pool', None) is None: |
554 | self._client_pool = hashserv.client.ClientPool(self.server, self.max_parallel) | 565 | self._client_pool = hashserv.client.ClientPool(self.server, self.max_parallel, **self.get_hashserv_creds()) |
555 | return self._client_pool | 566 | return self._client_pool |
556 | 567 | ||
557 | def reset(self, data): | 568 | def reset(self, data): |