nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only enable initscripts of non-base packages when they are explicitly installed

Browse Source
This commit is contained in:
Matthias Schiffer 2013-02-19 01:38:49 +01:00
parent c31afa7b58
commit 97d637b11f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builder/Makefile
View File

@ -79,22 +79,37 @@ assemble_image: FORCE
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(TARGET_DIR)/tmp mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(TARGET_DIR)/tmp
$(OPKG) update $(OPKG) update
$(MAKE) package_install $(MAKE) package_install
$(MAKE) package_postinst
$(MAKE) build_image $(MAKE) build_image
define EnableInitscript define EnableInitscript
cd $(TARGET_DIR) && ( \ ( \
grep '#!/bin/sh /etc/rc.common' $(1) >/dev/null && \ grep '#!/bin/sh /etc/rc.common' $(1) >/dev/null && \
IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable || \ IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $(1) enable || \
true \ true \
) )
endef endef
define FileOrigin
$(firstword $(shell $(OPKG) search $(1)))
endef
enable_initscripts: FORCE
cd $(TARGET_DIR) && ( \
$(foreach script,$(wildcard $(TARGET_DIR)/etc/init.d/*), \
$(if $(filter $(ENABLE_INITSCRIPTS_FROM),$(call FileOrigin,$(script))),$(call EnableInitscript,$(script));) \
) : \
)
package_install: FORCE package_install: FORCE
$(OPKG) install $(PACKAGE_DIR)/libc_*.ipk $(OPKG) install $(PACKAGE_DIR)/libc_*.ipk
$(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk $(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk
$(OPKG) install $(DEFAULT_PACKAGES) $($(PROFILE)_PACKAGES) $(OPKG) install $(DEFAULT_PACKAGES) $($(PROFILE)_PACKAGES)
$(NO_TRACE_MAKE) enable_initscripts ENABLE_INITSCRIPTS_FROM=%
$(OPKG) install $(GLUON_PACKAGES) $(OPKG) install $(GLUON_PACKAGES)
$(NO_TRACE_MAKE) enable_initscripts ENABLE_INITSCRIPTS_FROM="$(GLUON_PACKAGES)"
rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* $(TARGET_DIR)/tmp/opkg.lock rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* $(TARGET_DIR)/tmp/opkg.lock
copy_files: FORCE copy_files: FORCE
@ -109,11 +124,6 @@ copy_files: FORCE
done; ) done; )
$(CP) $(USER_FILES)/* $(TARGET_DIR)/ $(CP) $(USER_FILES)/* $(TARGET_DIR)/
package_postinst: FORCE
for script in $(TARGET_DIR)/etc/init.d/*; do \
$(call EnableInitscript,$$script); \
done || true
include $(INCLUDE_DIR)/image.mk include $(INCLUDE_DIR)/image.mk
build_image: FORCE build_image: FORCE