Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

utils/lxc: lxc-create templates depend on flock

Browse source 
Signed-off-by: Daniel Dickinson <openwrt@daniel.thecshore.com>
This commit is contained in:
Daniel Dickinson 2016-03-12 18:59:36 -05:00
parent e854a5541a
commit 403079aff8
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
utils/lxc/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lxc PKG_NAME:=lxc
PKG_VERSION:=1.1.5 PKG_VERSION:=1.1.5
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0 PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org> PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
@ -39,7 +39,8 @@ LXC_SCRIPTS += \
DEPENDS_APPLETS = +libpthread +libcap +liblxc DEPENDS_APPLETS = +libpthread +libcap +liblxc
DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates DEPENDS_create = +lxc-configs +lxc-hooks +lxc-templates +flock
DEPENDS_ls = +lxc-config DEPENDS_ls = +lxc-config
DEPENDS_top = +lxc-lua +luafilesystem @BROKEN DEPENDS_top = +lxc-lua +luafilesystem @BROKEN
@ -56,6 +57,23 @@ define Package/lxc
MENU:=1 MENU:=1
endef endef
define Package/lxc-auto
$(call Package/lxc/Default)
TITLE:= (initscript)
DEPENDS:=+lxc-start +lxc-stop
endef
define Package/lxc-auto/description
LXC is the userspace control package for Linux Containers, a lightweight
virtual system mechanism sometimes described as "chroot on steroids".
This package adds and initscript for starting and stopping the containers
on boot and shutdown.
endef
define Package/lxc-auto/conffiles
/etc/config/lxc-auto
endef
define Package/lxc/config define Package/lxc/config
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endef endef
@ -149,6 +167,12 @@ define Package/lxc/install
true true
endef endef
define Package/lxc-auto/install
$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
$(INSTALL_CONF) ./files/lxc-auto.config $(1)/etc/config/lxc-auto
$(INSTALL_BIN) ./files/lxc-auto.init $(1)/etc/init.d/lxc-auto
endef
define Package/lxc-common/conffiles define Package/lxc-common/conffiles
/etc/lxc/default.conf /etc/lxc/default.conf
/etc/lxc/lxc.conf /etc/lxc/lxc.conf
@ -250,6 +274,7 @@ $(eval $(call BuildPackage,lxc-templates))
$(eval $(call BuildPackage,liblxc)) $(eval $(call BuildPackage,liblxc))
$(eval $(call BuildPackage,lxc-lua)) $(eval $(call BuildPackage,lxc-lua))
$(eval $(call BuildPackage,lxc-init)) $(eval $(call BuildPackage,lxc-init))
$(eval $(call BuildPackage,lxc-auto))
$(foreach u,$(LXC_APPLETS_BIN),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/bin"))) $(foreach u,$(LXC_APPLETS_BIN),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/bin")))
$(foreach u,$(LXC_APPLETS_LIB),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/lib/lxc"))) $(foreach u,$(LXC_APPLETS_LIB),$(eval $(call GenPlugin,$(u),$(DEPENDS_APPLETS),"/usr/lib/lxc")))
$(foreach u,$(LXC_SCRIPTS),$(eval $(call GenPlugin,$(u),,"/usr/bin"))) $(foreach u,$(LXC_SCRIPTS),$(eval $(call GenPlugin,$(u),,"/usr/bin")))