From 120fa5a3bfee8bdbdf2441cdd1b5aff0e4513db4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 27 Jun 2014 18:17:51 +0200
Subject: rework service startup, do not hardcode into postinst scripts

---
 mk/build.mk   | 2 +-
 mk/image.mk   | 1 +
 mk/package.mk | 3 ---
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index ee17ee14f..2ec8e3b1d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -455,7 +455,7 @@ $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_T
 $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
 	@$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
 
-menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild
+menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard target/*/collections)
 	@echo "Generating menu structure ..."
 	@$(BASH) $(ADK_TOPDIR)/scripts/create-menu
 	@$(ADK_TOPDIR)/adk/tools/pkgmaker
diff --git a/mk/image.mk b/mk/image.mk
index cfd50f475..c9108ef14 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -41,6 +41,7 @@ extra-install:
 	@if [ ! -z $(extra) ];then $(CP) $(extra)/* ${TARGET_DIR};fi
 
 image-prepare-post:
+	$(BASH) $(ADK_TOPDIR)/scripts/update-rcconf
 	rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \
 	    dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \
 	    chmod 600 ${TARGET_DIR}/etc/.rnd
diff --git a/mk/package.mk b/mk/package.mk
index 5ee7f7e54..d2952a859 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -176,9 +176,6 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE}
 	@for file in conffiles preinst postinst prerm postrm; do \
 		[ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \
 	done
-ifeq ($(ADK_RUNTIME_START_$(1)),y)
-	$(SED) "s#NO#YES#" $$(IDIR_$(1))/CONTROL/postinst
-endif
 ifneq ($(ADK_DEBUG),y)
 	@echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control
 	@echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control
-- 
cgit v1.2.3