From 223c124db84e25dc83afc918807b1f9970ecd104 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 5 Aug 2016 13:06:13 +0200 Subject: [PATCH] ubox: move logd into ubox package Preparation for further build rework Signed-off-by: Felix Fietkau --- include/target.mk | 2 +- package/system/ubox/Makefile | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/target.mk b/include/target.mk index 4b01237a4d..c9c02fa036 100644 --- a/include/target.mk +++ b/include/target.mk @@ -13,7 +13,7 @@ __target_inc=1 DEVICE_TYPE?=router # Default packages - the really basic set -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch # For nas targets DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm # For router targets diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 28ca515bf4..9f0c4dc102 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -28,15 +28,8 @@ define Package/ubox TITLE:=OpenWrt system helper toolbox endef -define Package/logd - SECTION:=base - CATEGORY:=Base system - DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt - TITLE:=OpenWrt system log implementation -endef - define Package/ubox/install - $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/ $(1)/usr/bin + $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin $(1)/etc/init.d $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/ @@ -47,14 +40,9 @@ define Package/ubox/install $(LN) ../../sbin/kmodloader $(1)/usr/sbin/lsmod $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modinfo $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe -endef - -define Package/logd/install - $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/ $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log endef $(eval $(call BuildPackage,ubox)) -$(eval $(call BuildPackage,logd)) -- 2.30.2