aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-09-11 12:27:26 +0000
committerJohn Crispin <blogic@openwrt.org>2014-09-11 12:27:26 +0000
commitca5a47c6d5778c5de8e3ed4bd3780bc19fae7fb3 (patch)
treede76e881f3873fdff0f7c7d777c377499fcf5a5e /include
parente548b195e1aa751ac026b27f0dcd465f63c98a9a (diff)
downloadmaster-187ad058-ca5a47c6d5778c5de8e3ed4bd3780bc19fae7fb3.tar.gz
master-187ad058-ca5a47c6d5778c5de8e3ed4bd3780bc19fae7fb3.tar.bz2
master-187ad058-ca5a47c6d5778c5de8e3ed4bd3780bc19fae7fb3.zip
include: add a meta data field for required system user:group
this is in preparation of having services run as !root with ACL'ed access to ubus. Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42469 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/package-defaults.mk1
-rw-r--r--include/package-dumpinfo.mk3
-rw-r--r--include/package-ipkg.mk1
3 files changed, 4 insertions, 1 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 8f35c3293e..61e495f50f 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -53,6 +53,7 @@ define Package/Default
HIDDEN:=
URL:=
VARIANT:=
+ USERID:=
endef
Build/Patch:=$(Build/Patch/Default)
diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 9dc847dc1d..0241580522 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -41,7 +41,8 @@ $(if $(VARIANT),Build-Variant: $(VARIANT)
Category: $(CATEGORY)
Title: $(TITLE)
Maintainer: $(MAINTAINER)
-Source: $(PKG_SOURCE)
+$(if $(USERID),Require-User: $(USERID)
+)Source: $(PKG_SOURCE)
Type: $(if $(Package/$(1)/targets),$(Package/$(1)/targets),$(if $(PKG_TARGETS),$(PKG_TARGETS),ipkg))
$(if $(KCONFIG),Kernel-Config: $(KCONFIG)
)$(if $(BUILDONLY),Build-Only: $(BUILDONLY)
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 5c83b3d58b..1caeaa25b6 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -165,6 +165,7 @@ ifeq ($(DUMP),)
$(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \
$(if $(PKG_LICENSE_FILES), echo "LicenseFiles: $(PKG_LICENSE_FILES)"; ) \
echo "Section: $(SECTION)"; \
+ $(if $(USERID),echo "Require-User: $(USERID)"; ) \
$(if $(filter hold,$(PKG_FLAGS)),echo "Status: unknown hold not-installed"; ) \
$(if $(filter essential,$(PKG_FLAGS)), echo "Essential: yes"; ) \
$(if $(MAINTAINER),echo "Maintainer: $(MAINTAINER)"; ) \