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

projects-dir.mk: Replace get-os.sh by jw-pkg.py distro info

Browse source 
To reduce redandancy, replace get-os.sh by jw-pkg.py distro info in
projects-dir.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-03-02 10:50:37 +01:00
commit c241634cf1
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/projects-dir.mk
View file

@ -63,11 +63,11 @@ export JW_PKG_VERBOSE
# ------------ external programs I # ------------ external programs I
CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
GET_OS_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh $(JW_PKG_BINDIR)/get-os.sh) get-os-sh-not-found) JW_PKG_PY = python3 $(JWB_SCRIPT_DIR)/jw-pkg.py --prefix $(shell pwd) $(JW_PKG_PY_EXTRA_OPTS)
SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh
EXCLUDES_FILE ?= exclude.txt EXCLUDES_FILE ?= exclude.txt
EXCLUDES_FILES = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/dev/null).txt exclude-$(shell $(GET_OS_SH) 2>/dev/null).txt $(EXCLUDES_FILE)) EXCLUDES_FILES = $(wildcard $(patsubst %,exclude-%.txt,$(shell $(JW_PKG_PY) distro info --format '%{cascade}')) $(EXCLUDES_FILE))
ifneq ($(EXCLUDES_FILES),) ifneq ($(EXCLUDES_FILES),)
EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES)) EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES))
endif endif
@ -113,10 +113,9 @@ ifeq ($(TIME),)
TIME += -p TIME += -p
endif endif
endif endif
JW_PKG_PY = $(TIME) python3 $(JWB_SCRIPT_DIR)/jw-pkg.py --prefix $(shell pwd) $(JW_PKG_PY_EXTRA_OPTS) JW_PKG_PY_PROJECTS = $(TIME) $(JW_PKG_PY) projects
JW_PKG_PY_PROJECTS = $(JW_PKG_PY) projects
JW_PKG_PY_BUILD = $(JW_PKG_PY_PROJECTS) build $(JW_PKG_PY_EXTRA_BUILD_OPTS) JW_PKG_PY_BUILD = $(JW_PKG_PY_PROJECTS) build $(JW_PKG_PY_EXTRA_BUILD_OPTS)
PKG_MANAGER ?= $(JW_PKG_PY) distro --interactive=$(INTERACTIVE) PKG_MANAGER ?= $(TIME) $(JW_PKG_PY) distro --interactive=$(INTERACTIVE)
ifneq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) ifneq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
PGIT_SH += --remote-base $(PROJECTS_DIR_REMOTE_BASE) PGIT_SH += --remote-base $(PROJECTS_DIR_REMOTE_BASE)
@ -192,7 +191,7 @@ echo-install-deps:
echo-release-deps: echo-release-deps:
$(Q)$(JW_PKG_PY_PROJECTS) required-os-pkg --quote --skip-excluded --flavours "build run release" $(TARGET_PROJECTS) $(Q)$(JW_PKG_PY_PROJECTS) required-os-pkg --quote --skip-excluded --flavours "build run release" $(TARGET_PROJECTS)
echo-os: echo-os:
$(Q)$(GET_OS_SH) $(Q)$(JW_PKG_PY) distro info
echo-projects: echo-projects:
@echo $(PROJECTS) @echo $(PROJECTS)