Merge pull request #440 from bazsi/revert-dbld-noble-devshell

Revert "dbld: change devshell to use ubuntu-noble as base"

dbld/images/devshell.dockerfile

@@ -1,5 +1,5 @@
 ARG CONTAINER_REGISTRY
-FROM $CONTAINER_REGISTRY/axosyslog-dbld-ubuntu-noble:latest
+FROM $CONTAINER_REGISTRY/axosyslog-dbld-tarball:latest
 
 ARG ARG_IMAGE_PLATFORM
 ARG COMMIT

dbld/packages.manifest

@@ -42,19 +42,16 @@ which				[fedora]
 #############################################################################
 # eBPF related tools
 #############################################################################
-clang				[tarball, devshell]
-libbpf-dev			[tarball, devshell]
+clang				[tarball]
+libbpf-dev			[tarball]
 bpftool				[tarball]
-# as long as devshell is based on ubuntu and not tarball
-linux-tools-common		[devshell]
-linux-tools-generic		[devshell]
 
 #############################################################################
 # Tarball related tools
 #############################################################################
 
 # docbook to generate man pages
-docbook-xsl                     [tarball, devshell]
+docbook-xsl                     [tarball]
 docbook-style-xsl               [fedora]
 
 #############################################################################
@@ -131,8 +128,7 @@ libglib2.0-0t64-dbgsym          [devshell]
 libjemalloc-dev                 [devshell]
 libjemalloc2-dbgsym             [devshell]
 libssl3t64-dbgsym               [devshell]
-libjson-c5-dbgsym		[devshell]
-libpcre2-8-0-dbgsym		[devshell]
+linux-perf                      [devshell]
 locales                         [devshell]
 lsof                            [devshell]
 netcat-openbsd                  [devshell]

dbld/rules

@@ -213,7 +213,7 @@ shell-%: setup
 
 images: $(foreach image,$(IMAGES), image-$(image))
 image: image-$(DEFAULT_IMAGE)
-image-devshell: image-ubuntu-noble
+image-devshell: image-tarball
 image-tarball: image-debian-testing
 image-%:
 	$(DBLD_DIR)/prepare-image-build $* && \