janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-24 09:13:37 +02:00
Code Activity Actions

topdir.mk / projects-dir.mk: Remove BASE_PKGS

Browse source 
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>
This commit is contained in:
Jan Lindemann 2026-03-15 11:36:35 +01:00
commit 84f1ad66f6
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/project.conf
View file

@ -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

5
make/projects-dir.mk
View file

@ -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)

4
make/topdir.mk
View file

@ -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