From patchwork Mon Apr 1 21:55:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 13613052 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A19F955E6A for ; Mon, 1 Apr 2024 21:56:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008574; cv=none; b=UWfgrArecxR2ky3/fJ9M5p0jcvucHU3ZS3gQYHK/T1V5QqkerpWSNjcPkygXXxBb7XJybEdUlKP2ASOyQq7zmH6yzQaiEDS6paZRu1vR25PaB287xcmBAq+1NysDIYof7SwRnPIneZJdmOkJ1tfAfowin6zVLTDylhCbFsbbcoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008574; c=relaxed/simple; bh=fqw+SwBCUmAk0nPprvYuKMvLth0HSTzkgf4TIlXi+nI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=li1vsUBEyUX7X9Iv4wnYxOTsOH5V0HTMQ0fi7e687yLKz6nUI0oAzIFfX8MJQxNmm16WyMrBggs+7CicMnhnUfNW9m8n4i9lABDDcn6Y5ASk+iPNsG3pcdr361119lQEFArdtbobsnFUGjtsZbzpBrdNUyX/lI7oOCoaS1Z/eRY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de; spf=pass smtp.mailfrom=hauke-m.de; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b=lQ9WL3C6; arc=none smtp.client-ip=80.241.56.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b="lQ9WL3C6" Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4V7lFb5dDBz9sTJ; Mon, 1 Apr 2024 23:56:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1712008563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=cbqZ5SmQt+J/6ZMcg4lWCI82FFXVuTZiKEF2WPPTG3A=; b=lQ9WL3C6EqmVfc/sOrD1DgT7ax28lBPbt8rufGCKx5Ux9kJ+MgIvUljL9AV4T4neJnqpyG 21D2oWMy1If+TtqvbhpHJiKbvxxnWGBPYd97EMwu9q6sVYQ+iQkysT3a6x1aIYxLPfxNIq nnzSWhiahdcb6RiIDfwnAIO3ZQQwA3ViL6Oin2Qj+ASxEITRD04llvkloKelOz5KuDFT1G wU9HSRJuU+yM1cxXIXDS1S0qtWQ8bZc+4nM/07vHhApTFFqRrYVJTGV5r8N5Uuh7EzHFAQ q9PMsVgDbpwvW+3HmnDAQAAu0jGMfnipNkQI4zpHGVjXTSSEuUPH3lM1rZjXwg== From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 1/4] CI: Add libelf-dev to dev container Date: Mon, 1 Apr 2024 23:55:32 +0200 Message-ID: <20240401215535.2432969-1-hauke@hauke-m.de> Precedence: bulk X-Mailing-List: backports@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4V7lFb5dDBz9sTJ Some older kernel versions like 4.16 need libelf-dev, otherwise they show this warning message: Makefile:982: "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel" Signed-off-by: Hauke Mehrtens --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5c387891..3894196e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 RUN apt update && \ - apt install -y git coccinelle build-essential python3 python3-pip python-is-python3 flex bison libelf1 && \ + apt install -y git coccinelle build-essential python3 python3-pip python-is-python3 flex bison libelf1 libelf-dev && \ rm -rf /var/lib/apt/lists/* RUN pip install pyzstd From patchwork Mon Apr 1 21:55:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 13613053 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B105454FA3 for ; Mon, 1 Apr 2024 21:56:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008575; cv=none; b=tJWlQ8cxJTKL8iIY7mbVe5AeOsObRvVOhAgbiGDQWW1Rx5uZIl+fyOloM7ryK7BUUb9kRtn7U1VzI61AlOO99xD/k/MSd0B7YGdEyNkMGMADJrhUYz8HtwGxT7bDT8nsTBjzE6VVjwqoufLfLM52pIH1DlXbCwwUdSBzO7DM/8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008575; c=relaxed/simple; bh=Yis5nfSDV/54SfiwbP3vrfyIX3dwfmKOjdZoWoBFniA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jjRqpSNOQsx4ZwpL9rF0S5wVuPA4kkT6PFXvh8L2RjKabd4PHgWosOjVwV0TlxXU+6VHq43XAEIkDFZDAPyROq5DuuTP8dWaAKg8ux/6lL4esfxSR7VwyxHIhcHP3RZ/fyowN3y2r3fbQPyGpLcjjsv+eVkl3ykEpOzaHva0mKs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de; spf=pass smtp.mailfrom=hauke-m.de; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b=AKHNmGpf; arc=none smtp.client-ip=80.241.56.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b="AKHNmGpf" Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4V7lFc1yqXz9slj; Mon, 1 Apr 2024 23:56:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1712008564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XUr9p/F49VOWqeQsiItOWInuw71A+QhuFTo766T1mpI=; b=AKHNmGpf6kcZxu5oWbP+WAMtSci+rDQHhasUj5jDIY4Gxl5DhB9vet5XwKxh9YwfXHcXfP 5wDhAml63Vk/3zRwMfxiBL6V5TPzUM37mQq3vgMYHJWD0RXOybTSNUXK/Jrc6smLJkrubh 8s53ZOx/SaLa148f3p9VjdBc8R05Isj11/eRdS5pFkqHl9is6M0hKtYvexr2cbWGHRk/MG WTrHM6s47cDh/0NTNIfmj4kDtoPJn61KPlIOuiZr67AM8xxliUqAqov9EFw9RaZgKiMTX+ Dbegz76Vd473JHBX35AB/eSiOrXCWz8xYze+k+NEqNg6iRZOkB1KbClk+rRjBQ== From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 2/4] backports-update-manager: Install only kernel 4.0 and higher Date: Mon, 1 Apr 2024 23:55:33 +0200 Message-ID: <20240401215535.2432969-2-hauke@hauke-m.de> In-Reply-To: <20240401215535.2432969-1-hauke@hauke-m.de> References: <20240401215535.2432969-1-hauke@hauke-m.de> Precedence: bulk X-Mailing-List: backports@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Kernel 3.x are not supported any more, install only more recent kernel versions. Signed-off-by: Hauke Mehrtens --- devel/backports-update-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/backports-update-manager b/devel/backports-update-manager index 815a0421..c2900b64 100755 --- a/devel/backports-update-manager +++ b/devel/backports-update-manager @@ -79,7 +79,7 @@ class backport_kernel_updater: builds = re.findall(b'href="([-v.0-9a-z]*)/"', html) builds = [b.decode('ascii') for b in builds] # remove some special kernels - builds = [b for b in builds if re.match('v[3-9]', b)] + builds = [b for b in builds if re.match('v[4-9]', b)] builds = [b for b in builds if not '-rc' in b and not '-unstable' in b and not '-ckt' in b] last = {} for b in builds: From patchwork Mon Apr 1 21:55:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 13613054 Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [80.241.56.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81E8C55C1A for ; Mon, 1 Apr 2024 21:56:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.151 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008576; cv=none; b=cGPwhgtCntaIXQ9xgEMU0gqabNbGxK7vB71px1Mp4MW5a+GF1EmeMvwTBsoYKaPrAJLgkH3MdJ2hzD+LqfmKPMLkrWUbHKPJ56SSnWTxUcF0WiqugJb2kwud/rcJQnuaCwCXSPwbczKMwpjwtEMW7a24PtOQVKBBWrP7fZwrkvM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008576; c=relaxed/simple; bh=HTzyymMUYHxGBHd6EfHE/0sPHlAFSVkXMoJIjyHrxck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uqULIFVE9QKBNVv9fYcMIW3StL93+ql5bt7ROBctIqZnXH1bskCS6xqSvMd1yy1JzAs+vw+MEDneaqplzSVr1d0NGwkE2Q/0GbKEGajlOIUMiWQFxDFu/IfiGgnzbCKvYfBIe9acysJfq5R0FyEbYgutF5GHBKv9NeeMtGbtV4I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de; spf=pass smtp.mailfrom=hauke-m.de; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b=WjMKUfMA; arc=none smtp.client-ip=80.241.56.151 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b="WjMKUfMA" Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4V7lFc6Fvkz9sn2; Mon, 1 Apr 2024 23:56:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1712008564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=04v0k4JexZp8X6C3XWFjGHG6FsEeqgOR9itfwkKRjSU=; b=WjMKUfMA8oQQSZVDeHEh6XM7SgvpfMg416oGKVVZAfsdBrxEveM9M4OpKCIUBGCvJ/sAto XotxmgXAIk+W7auvUBSG81Hrdo5pEVDeMIrxArnDnhpw44vZDBuc+//JwZQzVUOqyvkXd2 ULPo8qjyEpAIp8l/aYIfAzaQU3SqWd2CPWhKo63+vPTxv4NbNTLTJ8iR7jXQWfTXDxbRCm frQAoIaij7Rj4D4bEI/0fdrIuVodwq1E3G635G/i5o17NMYZwuW/4ZljNzojL9mbeG+BcA 904H2e9OblbH6BiauvYtJBWzP854j5e5xpeFdLZBtTZoOQsnQwP8mTEPD0VyHw== From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 3/4] backports-update-manager: Use zstandard from pip Date: Mon, 1 Apr 2024 23:55:34 +0200 Message-ID: <20240401215535.2432969-3-hauke@hauke-m.de> In-Reply-To: <20240401215535.2432969-1-hauke@hauke-m.de> References: <20240401215535.2432969-1-hauke@hauke-m.de> Precedence: bulk X-Mailing-List: backports@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use the zstandard package from python pip instead of pystd. zstandard is more common and also integrated in later Ubuntu versions. Signed-off-by: Hauke Mehrtens --- .devcontainer/Dockerfile | 2 +- devel/backports-update-manager | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 3894196e..f758c9cb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ RUN apt update && \ apt install -y git coccinelle build-essential python3 python3-pip python-is-python3 flex bison libelf1 libelf-dev && \ rm -rf /var/lib/apt/lists/* -RUN pip install pyzstd +RUN pip install pyzstd zstandard RUN git clone https://github.com/hauke/backports.git diff --git a/devel/backports-update-manager b/devel/backports-update-manager index c2900b64..79f0ae23 100755 --- a/devel/backports-update-manager +++ b/devel/backports-update-manager @@ -1,11 +1,11 @@ #!/usr/bin/env python3 import argparse, os, sys, errno, getopt, re import shutil +import zstandard from urllib.request import urlopen from urllib.parse import urljoin import tarfile, tempfile import fileinput, subprocess -from pyzstd import ZstdFile source_dir = os.path.abspath(os.path.dirname(__file__)) sys.path.append(source_dir + '/../') from lib import bpar as ar @@ -543,13 +543,14 @@ class backport_kernel_updater: data, dpath = tempfile.mkstemp(prefix=tmp_prefix) ar.print_data(target, data) try: - tar = tarfile.open(name=dpath, mode='r') - tar.extractall(path=tmpdir_path, members=bk_tar_members(tar)) + with tarfile.open(name=dpath, mode='r') as tar: + tar.extractall(path=tmpdir_path, members=bk_tar_members(tar)) except (tarfile.ReadError): - zstd_file = ZstdFile(dpath) - tar = tarfile.open(fileobj=zstd_file, mode='r') - tar.extractall(path=tmpdir_path, members=bk_tar_members(tar)) - zstd_file.close() + with open(dpath, 'rb') as file: + unzstd = zstandard.ZstdDecompressor() + with unzstd.stream_reader(file) as stream: + with tarfile.open(fileobj=stream, mode='r|') as tar: + tar.extractall(path=tmpdir_path, members=bk_tar_members(tar)) os.unlink(dpath) self.sanitize_and_install_kernel_dirs(tmpdir_path) From patchwork Mon Apr 1 21:55:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 13613055 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CEFB56450 for ; Mon, 1 Apr 2024 21:56:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=80.241.56.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008576; cv=none; b=Y7gftB1YScfaUmGhvxk8uweVhOxllrUCBih3d8pWvy7ehQuzpX/Kg66Y9lgSqcLfbH89jeL3agTWCpvb1FREW2fwInM2A1A1MKLEkNJm+vXUa/OSu7lBQXslZzMKwl1TvaKt/rVlFjAURLaxZpO7kr3aN0fvxa+FJ1g1tPs80jk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712008576; c=relaxed/simple; bh=yIHYz9LdNF/aEAN2LlHZmLdo6E0pDkeVZhVC6Xojas4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PGboVZ7s04OG1Dg/pzW3UXsx5kD9cwZTFAoMv6vrjwRGJbM03cN5e6pluz07sMq2OnYbxsFa2G7ZGq5dzP2zbuIMiJIyKGXXptsyxeWK034QJNDCXN80iYQuJi/x9gZ9/dRFmdcqvJO0kTmiEA7k5aiDRDUZWTU+tZ1TD05ppUc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de; spf=pass smtp.mailfrom=hauke-m.de; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b=p1gB3PfB; arc=none smtp.client-ip=80.241.56.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hauke-m.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hauke-m.de header.i=@hauke-m.de header.b="p1gB3PfB" Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4V7lFd3Sp0z9sm6; Mon, 1 Apr 2024 23:56:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hauke-m.de; s=MBO0001; t=1712008565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I9r9SO0RnWN25+Dj4rWnqUmZszmZlWuaUlbI2qAsKzo=; b=p1gB3PfBIBqnP0Qgpr8EA4pxwG8eY0gAnM8pkfOiXLcyU4Zy5dLQM7G+ZnrI4pxWC4RyUR ntsMjolhlDmu+U8M8lmwl90YP684/tsr7IL12VcIfpriIejY/Uw8Hte8fnsTJ1fXNHSFuy j/sTNifAV4YyjkUU7ajATUMA1dKjELxqZ7Hafu0X07SwAWqigXhPhfQZUgrfkKvFNrStvb DVqwWNxoDHQgktm62NeVf/sQrOO48EnC9viIw5uQyumDWKUYgbPkZhn7g4pY0nJYwRRUY0 djCnqqqS29fjjBD0DDO2bIEATUWyR8cRk3IYBDveAVv6rqCcmyTvPxuJPNi45Q== From: Hauke Mehrtens To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 4/4] CI: Use Ubuntu 24.04 as dev container base Date: Mon, 1 Apr 2024 23:55:35 +0200 Message-ID: <20240401215535.2432969-4-hauke@hauke-m.de> In-Reply-To: <20240401215535.2432969-1-hauke@hauke-m.de> References: <20240401215535.2432969-1-hauke@hauke-m.de> Precedence: bulk X-Mailing-List: backports@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4V7lFd3Sp0z9sm6 Use Ubuntu 24.04 as the base for the dev container. The Ubuntu PPA kernel in version 5.19 or higher are not compiling with Ubuntu 22.04 any more. They need GCC version 12 or higher. This removes the pip installation and uses zstandard from the Ubuntu package repository instead. Signed-off-by: Hauke Mehrtens --- .devcontainer/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f758c9cb..cdf5d124 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,11 +1,9 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt update && \ - apt install -y git coccinelle build-essential python3 python3-pip python-is-python3 flex bison libelf1 libelf-dev && \ + apt install -y git coccinelle build-essential python3 python3-zstandard python-is-python3 flex bison libelf1 libelf-dev && \ rm -rf /var/lib/apt/lists/* -RUN pip install pyzstd zstandard - RUN git clone https://github.com/hauke/backports.git RUN /backports/devel/backports-update-manager --yes --no-git-update && \