X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=acd5e2e198347de730522e58fcfbf5a4126e3099;hp=8943c469d83fb6c3fb604dae9f77be87d8d9ebbe;hb=30c3e72a1e4893019786eff1d4cd9dfa9dad72e5;hpb=8ddd158504f4a05bfe91645b347681ad56c8d471 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 8943c469d8..acd5e2e198 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,10 +11,11 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=130 +PKG_RELEASE:=137 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host +PKG_CONFIG_DEPENDS:=CONFIG_PROCD_INIT include $(INCLUDE_DIR)/package.mk @@ -55,6 +56,18 @@ define Package/base-files/description This package contains a base filesystem and system scripts for OpenWrt. endef +define Package/base-files/config +config PROCD_INIT + bool "Use procd as the init process" + default n +endef + +ifeq ($(CONFIG_PROCD_INIT),) +define InstallOldFiles + $(CP) ./files.old/* $(1)/ +endef +endif + ifneq ($(CONFIG_PREINITOPT),) define ImageConfigOptions mkdir -p $(1)/lib/preinit @@ -87,6 +100,7 @@ define Package/base-files/install if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \ fi + $(call InstallOldFiles,$(1)) if [ -d $(PLATFORM_DIR)/base-files/. ]; then \ $(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \ fi