[LEDE-DEV] [PATCH] ubox: turn logd into a separate package

[Jo-Philipp Wich]

On 01/15/2017 08:27 PM, Luka Perkov wrote:
> From: Andrej Vlasic <andrej.vlasic at sartura.hr>
> 
> Currently system log is always included as a part of ubox. Add logd as a
> seperate package and add it to default packages list.
> 
> Signed-off-by: Andrej Vlasic <andrej.vlasic at sartura.hr>
> Signed-off-by: Luka Perkov <luka.perkov at sartura.hr>

Acked-by: Jo-Philipp Wich <jo at mein.io>

> ---
>  include/target.mk            |  2 +-
>  package/system/ubox/Makefile | 16 ++++++++++++++--
>  2 files changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/include/target.mk b/include/target.mk
> index a8d3b2b249..bca4af4b1b 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
> +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd
>  # 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 8900c67803..e833cac487 100644
> --- a/package/system/ubox/Makefile
> +++ b/package/system/ubox/Makefile
> @@ -5,7 +5,7 @@ PKG_RELEASE:=1
>  
>  PKG_SOURCE_PROTO:=git
>  PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git
> -PKG_SOURCE_DATE:=2016-09-26
> +PKG_SOURCE_DATE:=2017-01-15
>  PKG_SOURCE_VERSION:=5649c028c426060616e2bd4e7ea83271cd333d21
>  PKG_MIRROR_HASH:=ae77504a4397f92173a7646fa3555e5b51abd7ff1dd1c419770223359e41937a
>  CMAKE_INSTALL:=1
> @@ -27,8 +27,15 @@ 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 $(1)/etc/init.d
> +	$(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin
>  
>  	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
>  	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
> @@ -39,9 +46,14 @@ 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))
>