X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2FMakefile;h=ebce5fe9582ad62567063ca1eab108fb2e170c7d;hb=ecb7a97e94e2828b0769819a5a55a4c30ad95138;hp=7c9c14de9c8dd00f700a78cb66026c5e987378d3;hpb=a9e848f1b73ec05528ca7c01603a80ff87faad97;p=openwrt.git diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7c9c14de9c..ebce5fe958 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:=125 +PKG_RELEASE:=139 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