Skip to content
Snippets Groups Projects
Commit 38b3a9f0 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

Simplify service activation

parent 94dd4dde
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 12 deletions
builder/Makefile
+ 3
− 12
View file @ 38b3a9f0
...@@ -74,20 +74,11 @@ $(eval $(call merge-lists,GLUON_PACKAGES,GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKA ...@@ -74,20 +74,11 @@ $(eval $(call merge-lists,GLUON_PACKAGES,GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKA
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
define EnableInitscript EnableInitscript = ! grep -q '\#!/bin/sh /etc/rc.common' $(1) || bash ./etc/rc.common $(1) enable
( \ FileOrigin = $(firstword $(shell $(OPKG) search $(1)))
grep '#!/bin/sh /etc/rc.common' $(1) >/dev/null && \
IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $(1) enable || \
true \
)
endef
define FileOrigin
$(firstword $(shell $(OPKG) search $(1)))
endef
enable_initscripts: FORCE enable_initscripts: FORCE
cd $(TARGET_DIR) && ( \ cd $(TARGET_DIR) && ( export IPKG_INSTROOT=$(TARGET_DIR); \
$(foreach script,$(wildcard $(TARGET_DIR)/etc/init.d/*), \ $(foreach script,$(wildcard $(TARGET_DIR)/etc/init.d/*), \
$(if $(filter $(ENABLE_INITSCRIPTS_FROM),$(call FileOrigin,$(script))),$(call EnableInitscript,$(script));) \ $(if $(filter $(ENABLE_INITSCRIPTS_FROM),$(call FileOrigin,$(script))),$(call EnableInitscript,$(script));) \
) : \ ) : \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz