janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 23:43:54 +01:00
Code Activity

defs-dev.mk, defs-dist.mk: Add support for IMG file attributes

Browse source
This commit is contained in:
Jan Lindemann 2007-08-30 10:18:38 +00:00 • committed by Jan Lindemann
commit acf029b700
2 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
make/defs-dev.mk
View file

@ -12,6 +12,7 @@ EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX) INIT_PREFIX ?= $(EXE_PREFIX)
SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
IMG_PREFIX ?= $(PREFIX)
IMAGEDIR ?= $(MODDIR)/../../images IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
@ -23,25 +24,25 @@ WORKING_DIR ?= $(ENV_PREFIX)/$(HOME)
WORKING_DIR ?= $(VAR_PREFIX)/lock WORKING_DIR ?= $(VAR_PREFIX)/lock
# -- misc # -- misc
LOGNAME ?= $(shell whoami)-$(PROJECT) LOGNAME ?= $(shell id -un)-$(PROJECT)
DAEMON_RUN_USER ?= $(shell whoami) DAEMON_RUN_USER ?= $(shell id -un)
DAEMON_RUN_GROUP ?= $(shell id -gn) DAEMON_RUN_GROUP ?= $(shell id -gn)
CATCH_ONLY_YERROR?= true CATCH_ONLY_YERROR?= true
# -- file attributes # -- file attributes
EXEOWNER ?= $(shell whoami) EXEOWNER ?= $(shell id -un)
EXEGROUP ?= $(shell id -gn) EXEGROUP ?= $(shell id -gn)
EXEMODE ?= 770 EXEMODE ?= 770
EXEDIROWNER ?= $(shell whoami) EXEDIROWNER ?= $(shell id -un)
EXEDIRGROUP ?= $(shell id -gn) EXEDIRGROUP ?= $(shell id -gn)
EXEDIRMODE ?= 755 EXEDIRMODE ?= 755
CFGOWNER ?= $(shell whoami) CFGOWNER ?= $(shell id -un)
CFGGROUP ?= $(shell id -gn) CFGGROUP ?= $(shell id -gn)
CFGMODE ?= 660 CFGMODE ?= 660
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
HDROWNER ?= $(shell whoami) HDROWNER ?= $(shell id -un)
HDRGROUP ?= $(shell id -gn) HDRGROUP ?= $(shell id -gn)
HDRMODE ?= 644 HDRMODE ?= 644
HDRDIROWNER ?= $(EXEDIROWNER) HDRDIROWNER ?= $(EXEDIROWNER)
@ -86,7 +87,7 @@ MAKEDIRMODE ?= $(HDRDIRMODE)
PROFILEOWNER ?= $(EXEOWNER) PROFILEOWNER ?= $(EXEOWNER)
PROFILEGROUP ?= $(EXEGROUP) PROFILEGROUP ?= $(EXEGROUP)
PROFILEMODE ?= $(EXEMODE) PROFILEMODE ?= $(EXEMODE)
PROFILEDIROWNER ?= $(shell whoami) PROFILEDIROWNER ?= $(shell id -un)
PROFILEDIRGROUP ?= $(shell id -gn) PROFILEDIRGROUP ?= $(shell id -gn)
PROFILEDIRMODE ?= 770 PROFILEDIRMODE ?= 770
ROOTOWNER ?= $(shell id -un) ROOTOWNER ?= $(shell id -un)
@ -104,8 +105,8 @@ DOCDIRMODE ?= $(HDRDIRMODE)
VAROWNER ?= $(shell id -un) VAROWNER ?= $(shell id -un)
VARGROUP ?= $(shell id -gn) VARGROUP ?= $(shell id -gn)
VARMODE ?= 666 VARMODE ?= 666
VARDIROWNER ?= $(shell id -gn) VARDIROWNER ?= $(shell id -un)
VARDIRGROUP ?= $(shell whoami) VARDIRGROUP ?= $(shell id -gn)
VARDIRMODE ?= 770 VARDIRMODE ?= 770
PREFIXOWNER ?= $(EXEOWNER) PREFIXOWNER ?= $(EXEOWNER)
PREFIXGROUP ?= $(EXEGROUP) PREFIXGROUP ?= $(EXEGROUP)
@ -113,6 +114,12 @@ PREFIXMODE ?= 770
PREFIXDIROWNER ?= $(EXEDIROWNER) PREFIXDIROWNER ?= $(EXEDIROWNER)
PREFIXDIRGROUP ?= $(EXEDIRGROUP) PREFIXDIRGROUP ?= $(EXEDIRGROUP)
PREFIXDIRMODE ?= 770 PREFIXDIRMODE ?= 770
IMGOWNER ?= $(shell id -un)
IMGGROUP ?= $(shell id -gn)
IMGMODE ?= 666
IMGDIROWNER ?= $(shell id -un)
IMGDIRGROUP ?= $(shell id -gn)
IMGDIRMODE ?= 770
# -- options # -- options

7
make/defs-dist.mk
View file

@ -12,6 +12,7 @@ EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX) INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
IMG_PREFIX ?= $(PREFIX)
IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
@ -114,6 +115,12 @@ PREFIXMODE ?= 644
PREFIXDIROWNER ?= $(EXEOWNER) PREFIXDIROWNER ?= $(EXEOWNER)
PREFIXDIRGROUP ?= $(EXEGROUP) PREFIXDIRGROUP ?= $(EXEGROUP)
PREFIXDIRMODE ?= 755 PREFIXDIRMODE ?= 755
IMGOWNER ?= $(DOCOWNER)
IMGGROUP ?= $(DOCGROUP)
IMGMODE ?= $(DOCMODE)
IMGDIROWNER ?= $(DOCDIROWNER)
IMGDIRGROUP ?= $(DOCDIROWNER)
IMGDIRMODE ?= $(DOCDIRMODE)
# -- options # -- options