From 84f1ad66f6da62878a6fda996f087fce81ef3c04 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 15 Mar 2026 11:36:35 +0100
Subject: [PATCH] topdir.mk / projects-dir.mk: Remove BASE_PKGS

Move the dependencies listed in BASE_PKGS from projcts-dir.mk and
topdir.mk into project.conf.

Due to various hen-and-egg problems on a minimal system, in some
situations these packages can't be installed from project.conf. The
same is true with BASE_PKGS, however, so remove it, at least that
does away with some redundancy.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/project.conf    | 6 +++---
 make/projects-dir.mk | 5 ++---
 make/topdir.mk       | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/make/project.conf b/make/project.conf
index 84d9b867..739fe89e 100644
--- a/make/project.conf
+++ b/make/project.conf
@@ -18,9 +18,9 @@ libname = none
 devel = jw-pkg-run = VERSION-REVISION
 
 [pkg.requires.os]
-run = bash
-build = make, xdg-utils, coreutils, cpio
-devel = sudo, make, gawk, pkg-config
+run = bash, python3
+build = make, time, xdg-utils, coreutils, cpio, xdg-utils, git-core
+devel = sudo, gawk, pkg-config
 
 [pkg.requires.centos]
 run = hostname, python
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index df9de2b3..944b2997 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -32,7 +32,6 @@ JW_PKG_REMOTE_BINDIR         = /opt/jw-pkg/bin
 SHELL                        = /bin/bash -o pipefail +H
 PROJECTS_TXT                ?= projects.txt
 JW_PKG_VERBOSE              ?= false
-BASE_PKGS                    = git make sudo time xdg-utils python3
 PREREQ_RELEASE              ?= pull
 ifneq ($(JANWARE_USER),)
   export JANWARE_USER
@@ -247,10 +246,10 @@ pkg-manager-dup:
 	$(PKG_MANAGER) dup
 
 pkg-install-build-deps:
-	$(PKG_MANAGER) install $(BASE_PKGS) $(shell $(JW_PKG_PY_PROJECTS) required-os-pkg --quote --skip-excluded --flavours build $(TARGET_PROJECTS))
+	$(PKG_MANAGER) install $(shell $(JW_PKG_PY_PROJECTS) required-os-pkg --quote --skip-excluded --flavours build $(TARGET_PROJECTS))
 
 pkg-install-release-deps:
-	$(PKG_MANAGER) install $(BASE_PKGS) $(shell $(JW_PKG_PY_PROJECTS) required-os-pkg --quote --skip-excluded --flavours 'build run release' $(TARGET_PROJECTS))
+	$(PKG_MANAGER) install $(shell $(JW_PKG_PY_PROJECTS) required-os-pkg --quote --skip-excluded --flavours 'build run release' $(TARGET_PROJECTS))
 
 pkg-release-reinstall: $(PREREQ_RELEASE)
 
diff --git a/make/topdir.mk b/make/topdir.mk
index 123da083..e6c1f8bb 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -215,10 +215,10 @@ pkg-manager-refresh:
 	$(PKG_MANAGER) refresh
 
 pkg-install-build-deps:
-	$(PKG_MANAGER) install $(BASE_PKGS) $(shell $(proj_query_cmd) required-os-pkg --quote --skip-excluded --flavours "build" $(PROJECT))
+	$(PKG_MANAGER) install $(shell $(proj_query_cmd) required-os-pkg --quote --skip-excluded --flavours "build" $(PROJECT))
 
 pkg-install-release-deps:
-	$(PKG_MANAGER) install $(BASE_PKGS) $(shell $(proj_query_cmd) required-os-pkg --quote --skip-excluded --flavours "build run release" $(PROJECT))
+	$(PKG_MANAGER) install $(shell $(proj_query_cmd) required-os-pkg --quote --skip-excluded --flavours "build run release" $(PROJECT))
 
 pkg-install-testbuild-deps: pkg-install-release-deps